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

Fix race condition when freeing proxy in g_io_job_send_to_mainloop().

Browse Source 
2007-12-12  Alexander Larsson  <alexl@redhat.com>

        * gioscheduler.c:
	Fix race condition when freeing proxy in
	g_io_job_send_to_mainloop().



svn path=/trunk/; revision=6105
This commit is contained in:
Alexander Larsson
2007-12-12 19:34:19 +00:00
committed by Alexander Larsson
parent 1c57670f19
commit afc16811d8
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-12 Alexander Larsson <alexl@redhat.com>
* gioscheduler.c:
Fix race condition when freeing proxy in
g_io_job_send_to_mainloop().
2007-12-12 Alexander Larsson <alexl@redhat.com>
* gfileattribute.c:

32
gio/gioscheduler.c
View File

@@ -291,6 +291,9 @@ mainloop_proxy_func (gpointer data)
proxy->func (proxy->data);
if (proxy->notify)
proxy->notify (proxy->data);
if (proxy->ack_lock)
{
g_mutex_lock (proxy->ack_lock);
@@ -313,19 +316,6 @@ mainloop_proxy_free (MainLoopProxy *proxy)
g_free (proxy);
}
static void
mainloop_proxy_notify (gpointer data)
{
MainLoopProxy *proxy = data;
if (proxy->notify)
proxy->notify (proxy->data);
/* If nonblocking we free here, otherwise we free in io thread */
if (proxy->ack_lock == NULL)
mainloop_proxy_free (proxy);
}
/**
* g_io_job_send_to_mainloop:
* @job: a #GIOJob.
@@ -355,7 +345,9 @@ g_io_job_send_to_mainloop (GIOJob *job,
/* We just immediately re-enter in the case of idles (non-threads)
* Anything else would just deadlock. If you can't handle this, enable threads.
*/
func (user_data);
func (user_data);
if (notify)
notify (user_data);
return;
}
@@ -368,16 +360,14 @@ g_io_job_send_to_mainloop (GIOJob *job,
{
proxy->ack_lock = g_mutex_new ();
proxy->ack_condition = g_cond_new ();
g_mutex_lock (proxy->ack_lock);
}
source = g_idle_source_new ();
g_source_set_priority (source, G_PRIORITY_DEFAULT);
g_source_set_callback (source, mainloop_proxy_func, proxy,
block ? NULL : (GDestroyNotify)mainloop_proxy_free);
g_source_set_callback (source, mainloop_proxy_func, proxy, mainloop_proxy_notify);
if (block)
g_mutex_lock (proxy->ack_lock);
id = g_source_attach (source, NULL);
g_source_unref (source);
@@ -385,8 +375,8 @@ g_io_job_send_to_mainloop (GIOJob *job,
{
g_cond_wait (proxy->ack_condition, proxy->ack_lock);
g_mutex_unlock (proxy->ack_lock);
/* destroy notify didn't free proxy */
/* In the blocking case we free the proxy here */
mainloop_proxy_free (proxy);
}
}