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

GFile: remove some unnecessary code

Browse Source 
The "mainloop_barrier" in copy_async_thread() is unnecessary, since
the g_simple_async_result_complete_in_idle() will be queued after all
of the g_io_scheduler_job_send_to_mainloop_async()s, and sources with
the same priority will run in the order in which they were queued.

https://bugzilla.gnome.org/show_bug.cgi?id=661767
This commit is contained in:
Dan Winship 2012-04-17 09:55:33 -04:00
parent 4749878f91
commit a98d26c9bb
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gfile.c
View File

@ -5758,15 +5758,6 @@ copy_async_progress_in_main (gpointer user_data)
return FALSE; return FALSE;
} }
static gboolean
mainloop_barrier (gpointer user_data)
{
/* Does nothing, but ensures all queued idles before
this are run */
return FALSE;
}
static void static void
copy_async_progress_callback (goffset current_num_bytes, copy_async_progress_callback (goffset current_num_bytes,
goffset total_num_bytes, goffset total_num_bytes,
@ -5809,12 +5800,6 @@ copy_async_thread (GIOSchedulerJob *job,
data, data,
&error); &error);
/* Ensure all progress callbacks are done running in main thread */
if (data->progress_cb != NULL)
g_io_scheduler_job_send_to_mainloop (job,
mainloop_barrier,
NULL, NULL);
if (!result) if (!result)
g_simple_async_result_take_error (res, error); g_simple_async_result_take_error (res, error);