108 lines
2.8 KiB
Diff
108 lines
2.8 KiB
Diff
From 5780ff48cd5e40c2669f3cd94653ab7f850d7a98 Mon Sep 17 00:00:00 2001
|
|
From: Wujian Sun <wujian.sun_1@nxp.com>
|
|
Date: Wed, 29 Nov 2023 17:06:22 +0800
|
|
Subject: [PATCH 4/4] Revert "client: Track the proxies attached to a queue"
|
|
|
|
This reverts commit 674145dc3f621e5a3673714c7527d0e1c5336ab1.
|
|
Upstream-Status: Inappropriate [i.MX specific]
|
|
---
|
|
src/wayland-client.c | 22 ----------------------
|
|
1 file changed, 22 deletions(-)
|
|
|
|
diff --git a/src/wayland-client.c b/src/wayland-client.c
|
|
index 8c897d4..b57bfe9 100644
|
|
--- a/src/wayland-client.c
|
|
+++ b/src/wayland-client.c
|
|
@@ -70,12 +70,10 @@ struct wl_proxy {
|
|
wl_dispatcher_func_t dispatcher;
|
|
uint32_t version;
|
|
const char * const *tag;
|
|
- struct wl_list queue_link; /**< in struct wl_event_queue::proxy_list */
|
|
};
|
|
|
|
struct wl_event_queue {
|
|
struct wl_list event_list;
|
|
- struct wl_list proxy_list; /**< struct wl_proxy::queue_link */
|
|
struct wl_display *display;
|
|
};
|
|
|
|
@@ -223,7 +221,6 @@ static void
|
|
wl_event_queue_init(struct wl_event_queue *queue, struct wl_display *display)
|
|
{
|
|
wl_list_init(&queue->event_list);
|
|
- wl_list_init(&queue->proxy_list);
|
|
queue->display = display;
|
|
}
|
|
|
|
@@ -438,8 +435,6 @@ proxy_create(struct wl_proxy *factory, const struct wl_interface *interface,
|
|
return NULL;
|
|
}
|
|
|
|
- wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
|
|
-
|
|
return proxy;
|
|
}
|
|
|
|
@@ -499,8 +494,6 @@ wl_proxy_create_for_id(struct wl_proxy *factory,
|
|
return NULL;
|
|
}
|
|
|
|
- wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
|
|
-
|
|
return proxy;
|
|
}
|
|
|
|
@@ -525,9 +518,6 @@ proxy_destroy(struct wl_proxy *proxy)
|
|
|
|
proxy->flags |= WL_PROXY_FLAG_DESTROYED;
|
|
|
|
- wl_list_remove(&proxy->queue_link);
|
|
- wl_list_init(&proxy->queue_link);
|
|
-
|
|
wl_proxy_unref(proxy);
|
|
}
|
|
|
|
@@ -2346,8 +2336,6 @@ wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue)
|
|
{
|
|
pthread_mutex_lock(&proxy->display->mutex);
|
|
|
|
- wl_list_remove(&proxy->queue_link);
|
|
-
|
|
if (queue) {
|
|
assert(proxy->display == queue->display);
|
|
proxy->queue = queue;
|
|
@@ -2355,8 +2343,6 @@ wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue)
|
|
proxy->queue = &proxy->display->default_queue;
|
|
}
|
|
|
|
- wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
|
|
-
|
|
pthread_mutex_unlock(&proxy->display->mutex);
|
|
}
|
|
|
|
@@ -2428,8 +2414,6 @@ wl_proxy_create_wrapper(void *proxy)
|
|
wrapper->flags = WL_PROXY_FLAG_WRAPPER;
|
|
wrapper->refcount = 1;
|
|
|
|
- wl_list_insert(&wrapper->queue->proxy_list, &wrapper->queue_link);
|
|
-
|
|
pthread_mutex_unlock(&wrapped_proxy->display->mutex);
|
|
|
|
return wrapper;
|
|
@@ -2451,12 +2435,6 @@ wl_proxy_wrapper_destroy(void *proxy_wrapper)
|
|
|
|
assert(wrapper->refcount == 1);
|
|
|
|
- pthread_mutex_lock(&wrapper->display->mutex);
|
|
-
|
|
- wl_list_remove(&wrapper->queue_link);
|
|
-
|
|
- pthread_mutex_unlock(&wrapper->display->mutex);
|
|
-
|
|
free(wrapper);
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|