mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

client: drop unused event queue cond and list variables

Browse source 
The wl_event_queue cond variable has been replaced by the wl_display
reader_cond variable (commit 3c7e8bfbb4).
This cond variable is never waited for anymore, just
signaled/broadcasted, and thus can be safely removed.

The wl_display event_queue_list and link from wl_event_queue
can be removed as well, since it was only used to iterate over
the event queue list in order to broadcast the now unused cond.

No regression on queue unit tests.

Signed-off-by: Olivier Blin <olivier.blin@softathome.com>

v2: fixed and rebased after 886b09c9a3
    added signed-off-by

v3: removed link from wl_event_queue

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Olivier Blin 2014-08-21 16:54:21 +02:00 • committed by Pekka Paalanen
parent 71141288f0
commit 0cb9862c93
1 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/wayland-client.c
View file

@ -69,10 +69,8 @@ struct wl_global {
};
struct wl_event_queue {
struct wl_list link;
struct wl_list event_list;
struct wl_display *display;
pthread_cond_t cond;
};
struct wl_display {
@ -100,7 +98,6 @@ struct wl_display {
struct wl_map objects;
struct wl_event_queue display_queue;
struct wl_event_queue default_queue;
struct wl_list event_queue_list;
pthread_mutex_t mutex;
int reader_count;
@ -123,8 +120,6 @@ static int debug_client = 0;
static void
display_fatal_error(struct wl_display *display, int error)
{
struct wl_event_queue *iter;
if (display->last_error)
return;
@ -132,9 +127,6 @@ display_fatal_error(struct wl_display *display, int error)
error = EFAULT;
display->last_error = error;
wl_list_for_each(iter, &display->event_queue_list, link)
pthread_cond_broadcast(&iter->cond);
}
/**
@ -153,7 +145,6 @@ static void
display_protocol_error(struct wl_display *display, uint32_t code,
uint32_t id, const struct wl_interface *intf)
{
struct wl_event_queue *iter;
int err;
if (display->last_error)
@ -184,9 +175,6 @@ display_protocol_error(struct wl_display *display, uint32_t code,
display->protocol_error.id = id;
display->protocol_error.interface = intf;
wl_list_for_each(iter, &display->event_queue_list, link)
pthread_cond_broadcast(&iter->cond);
pthread_mutex_unlock(&display->mutex);
}
@ -194,7 +182,6 @@ static void
wl_event_queue_init(struct wl_event_queue *queue, struct wl_display *display)
{
wl_list_init(&queue->event_list);
pthread_cond_init(&queue->cond, NULL);
queue->display = display;
}
@ -209,7 +196,6 @@ wl_event_queue_release(struct wl_event_queue *queue)
wl_list_remove(&closure->link);
wl_closure_destroy(closure);
}
pthread_cond_destroy(&queue->cond);
}
/** Destroy an event queue
@ -231,7 +217,6 @@ wl_event_queue_destroy(struct wl_event_queue *queue)
struct wl_display *display = queue->display;
pthread_mutex_lock(&display->mutex);
wl_list_remove(&queue->link);
wl_event_queue_release(queue);
free(queue);
pthread_mutex_unlock(&display->mutex);
@ -256,10 +241,6 @@ wl_display_create_queue(struct wl_display *display)
wl_event_queue_init(queue, display);
pthread_mutex_lock(&display->mutex);
wl_list_insert(&display->event_queue_list, &queue->link);
pthread_mutex_unlock(&display->mutex);
return queue;
}
@ -767,7 +748,6 @@ wl_display_connect_to_fd(int fd)
wl_map_init(&display->objects, WL_MAP_CLIENT_SIDE);
wl_event_queue_init(&display->default_queue, display);
wl_event_queue_init(&display->display_queue, display);
wl_list_init(&display->event_queue_list);
pthread_mutex_init(&display->mutex, NULL);
pthread_cond_init(&display->reader_cond, NULL);
display->reader_count = 0;
@ -1046,8 +1026,6 @@ queue_event(struct wl_display *display, int len)
else
queue = proxy->queue;
if (wl_list_empty(&queue->event_list))
pthread_cond_signal(&queue->cond);
wl_list_insert(queue->event_list.prev, &closure->link);
return size;