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

schedule_write_in_worker_thread: require caller to lock; rename accordingly

Browse Source 
When we use this function to schedule a flush, it'll be called
with the lock held. Releasing and immediately re-taking the lock would
be pointless.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662395
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
This commit is contained in:
Simon McVittie 2011-11-21 17:16:16 +00:00
parent 56eb16ff50
commit 301332168b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gdbusprivate.c
View File

@ -1525,16 +1525,14 @@ continue_writing_in_idle_cb (gpointer user_data)
* *
* Can be called from any thread * Can be called from any thread
* *
* write_lock is not held on entry * write_lock is held on entry
* output_pending may be anything * output_pending may be anything
*/ */
static void static void
schedule_write_in_worker_thread (GDBusWorker *worker, schedule_writing_unlocked (GDBusWorker *worker,
MessageToWriteData *write_data, MessageToWriteData *write_data,
CloseData *close_data) CloseData *close_data)
{ {
g_mutex_lock (&worker->write_lock);
if (write_data != NULL) if (write_data != NULL)
g_queue_push_tail (worker->write_queue, write_data); g_queue_push_tail (worker->write_queue, write_data);
@ -1554,8 +1552,6 @@ schedule_write_in_worker_thread (GDBusWorker *worker,
g_source_attach (idle_source, worker->shared_thread_data->context); g_source_attach (idle_source, worker->shared_thread_data->context);
g_source_unref (idle_source); g_source_unref (idle_source);
} }
g_mutex_unlock (&worker->write_lock);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1583,7 +1579,9 @@ _g_dbus_worker_send_message (GDBusWorker *worker,
data->blob = blob; /* steal! */ data->blob = blob; /* steal! */
data->blob_size = blob_len; data->blob_size = blob_len;
schedule_write_in_worker_thread (worker, data, NULL); g_mutex_lock (&worker->write_lock);
schedule_writing_unlocked (worker, data, NULL);
g_mutex_unlock (&worker->write_lock);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1666,7 +1664,9 @@ _g_dbus_worker_close (GDBusWorker *worker,
* It'll be set before the actual close happens. * It'll be set before the actual close happens.
*/ */
g_cancellable_cancel (worker->cancellable); g_cancellable_cancel (worker->cancellable);
schedule_write_in_worker_thread (worker, NULL, close_data); g_mutex_lock (&worker->write_lock);
schedule_writing_unlocked (worker, NULL, close_data);
g_mutex_unlock (&worker->write_lock);
} }
/* This can be called from any thread - frees worker. Note that /* This can be called from any thread - frees worker. Note that