diff options
| author | Benjamin Otte <otte@gnome.org> | 2009-06-25 13:01:48 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2009-06-25 13:01:48 +0200 |
| commit | c372064a04f8c24efdb99a3b0811bd17ddfb2176 (patch) | |
| tree | 61906e539114b76be2d7c82c384688f50bada002 /client/gdaemonfileinputstream.c | |
| parent | 133bd0ec75a94b8316b56c252dfc62a3ed23fade (diff) | |
| download | gvfs-c372064a04f8c24efdb99a3b0811bd17ddfb2176.tar.gz | |
try extra hard to make sure operations get cancelled properly
Previously there were some rather big windows that allowed for races
between cancelling and calling g_simple_async_result_complete().
This code makes sure we check for cancellaton right before calling
g_simple_async_result_complete(), which gets rid of that window and
gives you the guarantee that cancelling an operation in the main thread
will indeed return a CANCELLED error.
Diffstat (limited to 'client/gdaemonfileinputstream.c')
| -rw-r--r-- | client/gdaemonfileinputstream.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index 69f70c62..c942c9ea 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -1631,6 +1631,7 @@ typedef void (*AsyncIteratorDone) (GInputStream *stream, gpointer op_data, GAsyncReadyCallback callback, gpointer callback_data, + GCancellable *cancellable, GError *io_error); struct AsyncIterator { @@ -1654,6 +1655,7 @@ async_iterator_done (AsyncIterator *iterator, GError *io_error) iterator->iterator_data, iterator->callback, iterator->callback_data, + iterator->cancellable, io_error); g_free (iterator); @@ -1829,6 +1831,7 @@ async_read_done (GInputStream *stream, gpointer op_data, GAsyncReadyCallback callback, gpointer user_data, + GCancellable *cancellable, GError *io_error) { ReadOperation *op; @@ -1859,7 +1862,7 @@ async_read_done (GInputStream *stream, g_simple_async_result_set_from_error (simple, error); /* Complete immediately, not in idle, since we're already in a mainloop callout */ - g_simple_async_result_complete (simple); + _g_simple_async_result_complete_with_cancellable (simple, cancellable); g_object_unref (simple); if (op->ret_error) @@ -1941,6 +1944,7 @@ async_close_done (GInputStream *stream, gpointer op_data, GAsyncReadyCallback callback, gpointer user_data, + GCancellable *cancellable, GError *io_error) { GDaemonFileInputStream *file; @@ -1948,7 +1952,6 @@ async_close_done (GInputStream *stream, CloseOperation *op; gboolean result; GError *error; - GCancellable *cancellable = NULL; /* TODO: get cancellable */ file = G_DAEMON_FILE_INPUT_STREAM (stream); @@ -1984,7 +1987,7 @@ async_close_done (GInputStream *stream, g_simple_async_result_set_from_error (simple, error); /* Complete immediately, not in idle, since we're already in a mainloop callout */ - g_simple_async_result_complete (simple); + _g_simple_async_result_complete_with_cancellable (simple, cancellable); g_object_unref (simple); if (op->ret_error) @@ -2029,6 +2032,7 @@ async_query_done (GInputStream *stream, gpointer op_data, GAsyncReadyCallback callback, gpointer user_data, + GCancellable *cancellable, GError *io_error) { GDaemonFileInputStream *file; @@ -2063,7 +2067,7 @@ async_query_done (GInputStream *stream, g_object_unref); /* Complete immediately, not in idle, since we're already in a mainloop callout */ - g_simple_async_result_complete (simple); + _g_simple_async_result_complete_with_cancellable (simple, cancellable); g_object_unref (simple); if (op->ret_error) |