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

client: add display_wakeup_threads function

Browse source 
This helper function wraps the always-repeated pattern:

  display->read_serial++;
  pthread_cond_broadcast(&display->reader_cond);

[Pekka Paalanen: minor whitespace and comment fixes.]

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Marek Chalupa 2014-08-29 11:21:28 +02:00 • committed by Pekka Paalanen
parent 5c7d30b691
commit 1e0f9698d4
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/wayland-client.c
View file

@ -109,6 +109,26 @@ struct wl_display {
static int debug_client = 0; static int debug_client = 0;
/**
* This helper function wakes up all threads that are
* waiting for display->reader_cond (i. e. when reading is done,
* canceled, or an error occured)
*
* NOTE: must be called with display->mutex locked
*/
static void
display_wakeup_threads(struct wl_display *display)
{
/* Thread can get sleeping only in read_events(). If we're
* waking it up, it means that the read completed or was
* canceled, so we must increase the read_serial.
* This prevents from indefinite sleeping in read_events().
*/
++display->read_serial;
pthread_cond_broadcast(&display->reader_cond);
}
/** /**
* This function is called for local errors (no memory, server hung up) * This function is called for local errors (no memory, server hung up)
* *
@ -128,11 +148,7 @@ display_fatal_error(struct wl_display *display, int error)
display->last_error = error; display->last_error = error;
pthread_cond_broadcast(&display->reader_cond); display_wakeup_threads(display);
/* prevent from indefinite looping in read_events()
* (when calling pthread_cond_wait under condition
* display->read_serial == serial) */
++display->read_serial;
} }
/** /**
@ -182,7 +198,7 @@ display_protocol_error(struct wl_display *display, uint32_t code,
display->protocol_error.interface = intf; display->protocol_error.interface = intf;
/* /*
* here it is not necessary to broadcast reader's cond like in * here it is not necessary to wake up threads like in
* display_fatal_error, because this function is called from * display_fatal_error, because this function is called from
* an event handler and that means that read_events() is done * an event handler and that means that read_events() is done
* and woke up all threads. Since wl_display_prepare_read() * and woke up all threads. Since wl_display_prepare_read()
@ -1160,8 +1176,7 @@ read_events(struct wl_display *display)
} }
} }
display->read_serial++; display_wakeup_threads(display);
pthread_cond_broadcast(&display->reader_cond);
} else { } else {
serial = display->read_serial; serial = display->read_serial;
while (display->read_serial == serial) while (display->read_serial == serial)
@ -1346,10 +1361,8 @@ wl_display_cancel_read(struct wl_display *display)
pthread_mutex_lock(&display->mutex); pthread_mutex_lock(&display->mutex);
display->reader_count--; display->reader_count--;
if (display->reader_count == 0) { if (display->reader_count == 0)
display->read_serial++; display_wakeup_threads(display);
pthread_cond_broadcast(&display->reader_cond);
}
pthread_mutex_unlock(&display->mutex); pthread_mutex_unlock(&display->mutex);
} }