From d77011caf416141916e71cfabbc038b71d7d517b Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Fri, 27 Feb 2004 17:19:32 +0000 Subject: [PATCH] Reading access to ref_count only with g_atomic_int_get(). 2004-02-27 Sebastian Wilhelmi * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to ref_count only with g_atomic_int_get(). --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/gasyncqueue.c | 32 ++++++++++++++++---------------- 7 files changed, 34 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b2898f82..3eabce152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1b2898f82..3eabce152 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1b2898f82..3eabce152 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1b2898f82..3eabce152 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1b2898f82..3eabce152 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1b2898f82..3eabce152 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -6,6 +6,9 @@ g_async_queue_ref_locked is deprecated, but still there to preserve ABI. + * glib/gasyncqueue.c, glib/gasyncqueue.h: Reading access to + ref_count only with g_atomic_int_get(). + Fri Feb 27 02:00:34 2004 Matthias Clasen * acglib.m4: quote AC_DEFUN macro names so automake diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c index 71dde1259..9e9f9a681 100644 --- a/glib/gasyncqueue.c +++ b/glib/gasyncqueue.c @@ -68,7 +68,7 @@ void g_async_queue_ref (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_atomic_int_inc (&queue->ref_count); } @@ -83,7 +83,7 @@ void g_async_queue_ref_unlocked (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_atomic_int_inc (&queue->ref_count); } @@ -101,7 +101,7 @@ void g_async_queue_unref_and_unlock (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_mutex_unlock (queue->mutex); g_async_queue_unref (queue); @@ -121,7 +121,7 @@ void g_async_queue_unref (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); if (g_atomic_int_dec_and_test (&queue->ref_count)) { @@ -146,7 +146,7 @@ void g_async_queue_lock (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_mutex_lock (queue->mutex); } @@ -161,7 +161,7 @@ void g_async_queue_unlock (GAsyncQueue *queue) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_mutex_unlock (queue->mutex); } @@ -177,7 +177,7 @@ void g_async_queue_push (GAsyncQueue* queue, gpointer data) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_return_if_fail (data); g_mutex_lock (queue->mutex); @@ -197,7 +197,7 @@ void g_async_queue_push_unlocked (GAsyncQueue* queue, gpointer data) { g_return_if_fail (queue); - g_return_if_fail (queue->ref_count > 0); + g_return_if_fail (g_atomic_int_get (&queue->ref_count) > 0); g_return_if_fail (data); g_queue_push_head (queue->queue, data); @@ -260,7 +260,7 @@ g_async_queue_pop (GAsyncQueue* queue) gpointer retval; g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); g_mutex_lock (queue->mutex); retval = g_async_queue_pop_intern_unlocked (queue, FALSE, NULL); @@ -283,7 +283,7 @@ gpointer g_async_queue_pop_unlocked (GAsyncQueue* queue) { g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); return g_async_queue_pop_intern_unlocked (queue, FALSE, NULL); } @@ -304,7 +304,7 @@ g_async_queue_try_pop (GAsyncQueue* queue) gpointer retval; g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); g_mutex_lock (queue->mutex); retval = g_async_queue_pop_intern_unlocked (queue, TRUE, NULL); @@ -328,7 +328,7 @@ gpointer g_async_queue_try_pop_unlocked (GAsyncQueue* queue) { g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); return g_async_queue_pop_intern_unlocked (queue, TRUE, NULL); } @@ -353,7 +353,7 @@ g_async_queue_timed_pop (GAsyncQueue* queue, GTimeVal *end_time) gpointer retval; g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); g_mutex_lock (queue->mutex); retval = g_async_queue_pop_intern_unlocked (queue, FALSE, end_time); @@ -381,7 +381,7 @@ gpointer g_async_queue_timed_pop_unlocked (GAsyncQueue* queue, GTimeVal *end_time) { g_return_val_if_fail (queue, NULL); - g_return_val_if_fail (queue->ref_count > 0, NULL); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, NULL); return g_async_queue_pop_intern_unlocked (queue, FALSE, end_time); } @@ -406,7 +406,7 @@ g_async_queue_length (GAsyncQueue* queue) gint retval; g_return_val_if_fail (queue, 0); - g_return_val_if_fail (queue->ref_count > 0, 0); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, 0); g_mutex_lock (queue->mutex); retval = queue->queue->length - queue->waiting_threads; @@ -434,7 +434,7 @@ gint g_async_queue_length_unlocked (GAsyncQueue* queue) { g_return_val_if_fail (queue, 0); - g_return_val_if_fail (queue->ref_count > 0, 0); + g_return_val_if_fail (g_atomic_int_get (&queue->ref_count) > 0, 0); return queue->queue->length - queue->waiting_threads; }