luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

GAsyncQueue: internal cleanup

Browse Source 
Turn the 'try' parameter of g_async_queue_pop_intern_unlocked
into a 'wait', for better alignment with the GCond api.
This commit is contained in:
Matthias Clasen 2011-10-01 20:11:38 -04:00
parent 793cf54275
commit 8c5400ff45
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gasyncqueue.c
View File

@ -404,14 +404,14 @@ g_async_queue_push_sorted_unlocked (GAsyncQueue *queue,
static gpointer static gpointer
g_async_queue_pop_intern_unlocked (GAsyncQueue *queue, g_async_queue_pop_intern_unlocked (GAsyncQueue *queue,
gboolean try, gboolean wait,
GTimeVal *end_time) GTimeVal *end_time)
{ {
gpointer retval; gpointer retval;
if (!g_queue_peek_tail_link (&queue->queue)) if (!g_queue_peek_tail_link (&queue->queue))
{ {
if (try) if (!wait)
return NULL; return NULL;
if (!end_time) if (!end_time)
@ -457,7 +457,7 @@ g_async_queue_pop (GAsyncQueue *queue)
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
g_mutex_lock (&queue->mutex); g_mutex_lock (&queue->mutex);
retval = g_async_queue_pop_intern_unlocked (queue, FALSE, NULL); retval = g_async_queue_pop_intern_unlocked (queue, TRUE, NULL);
g_mutex_unlock (&queue->mutex); g_mutex_unlock (&queue->mutex);
return retval; return retval;
@ -479,7 +479,7 @@ g_async_queue_pop_unlocked (GAsyncQueue *queue)
{ {
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
return g_async_queue_pop_intern_unlocked (queue, FALSE, NULL); return g_async_queue_pop_intern_unlocked (queue, TRUE, NULL);
} }
/** /**
@ -500,7 +500,7 @@ g_async_queue_try_pop (GAsyncQueue *queue)
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
g_mutex_lock (&queue->mutex); g_mutex_lock (&queue->mutex);
retval = g_async_queue_pop_intern_unlocked (queue, TRUE, NULL); retval = g_async_queue_pop_intern_unlocked (queue, FALSE, NULL);
g_mutex_unlock (&queue->mutex); g_mutex_unlock (&queue->mutex);
return retval; return retval;
@ -523,7 +523,7 @@ g_async_queue_try_pop_unlocked (GAsyncQueue *queue)
{ {
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
return g_async_queue_pop_intern_unlocked (queue, TRUE, NULL); return g_async_queue_pop_intern_unlocked (queue, FALSE, NULL);
} }
/** /**
@ -551,7 +551,7 @@ g_async_queue_timed_pop (GAsyncQueue *queue,
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
g_mutex_lock (&queue->mutex); g_mutex_lock (&queue->mutex);
retval = g_async_queue_pop_intern_unlocked (queue, FALSE, end_time); retval = g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
g_mutex_unlock (&queue->mutex); g_mutex_unlock (&queue->mutex);
return retval; return retval;
@ -581,7 +581,7 @@ g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
{ {
g_return_val_if_fail (queue, NULL); g_return_val_if_fail (queue, NULL);
return g_async_queue_pop_intern_unlocked (queue, FALSE, end_time); return g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
} }
/** /**