packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetcher: Clear all data for session in session thread 

Conceptually the session thread owns the session, so let's clear out
everything predictably there, rather than sometimes having it happen
on the main thread.

Also, this moves up clearing the pending/outstanding queues *before*
we unreference the session, since conceptually they need to reference
it as well.

Based on a patch from: Matthew Barnes <mbarnes@redhat.com>

Closes: #383
Approved by: mbarnes
This commit is contained in:
Colin Walters 2016-07-08 10:15:47 -04:00 committed by Atomic Bot
parent b4c15209e8
commit 5d21650ea5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libostree/ostree-fetcher.c
View File

@ -44,7 +44,7 @@ typedef enum {
typedef struct { typedef struct {
volatile int ref_count; volatile int ref_count;
SoupSession *session; SoupSession *session; /* not referenced */
GMainContext *main_context; GMainContext *main_context;
GMainLoop *main_loop; GMainLoop *main_loop;
@ -140,7 +140,8 @@ thread_closure_unref (ThreadClosure *thread_closure)
if (g_atomic_int_dec_and_test (&thread_closure->ref_count)) if (g_atomic_int_dec_and_test (&thread_closure->ref_count))
{ {
g_clear_object (&thread_closure->session); /* The session thread should have cleared this by now. */
g_assert (thread_closure->session == NULL);
g_clear_pointer (&thread_closure->main_context, g_main_context_unref); g_clear_pointer (&thread_closure->main_context, g_main_context_unref);
g_clear_pointer (&thread_closure->main_loop, g_main_loop_unref); g_clear_pointer (&thread_closure->main_loop, g_main_loop_unref);
@ -156,11 +157,6 @@ thread_closure_unref (ThreadClosure *thread_closure)
g_free (thread_closure->tmpdir_name); g_free (thread_closure->tmpdir_name);
glnx_release_lock_file (&thread_closure->tmpdir_lock); glnx_release_lock_file (&thread_closure->tmpdir_lock);
while (!g_queue_is_empty (&thread_closure->pending_queue))
g_object_unref (g_queue_pop_head (&thread_closure->pending_queue));
g_clear_pointer (&thread_closure->outstanding, g_hash_table_unref);
g_clear_pointer (&thread_closure->output_stream_set, g_hash_table_unref); g_clear_pointer (&thread_closure->output_stream_set, g_hash_table_unref);
g_mutex_clear (&thread_closure->output_stream_set_lock); g_mutex_clear (&thread_closure->output_stream_set_lock);
@ -460,6 +456,7 @@ ostree_fetcher_session_thread (gpointer data)
* context for this thread before creating the session. */ * context for this thread before creating the session. */
g_main_context_push_thread_default (mainctx); g_main_context_push_thread_default (mainctx);
/* We retain ownership of the SoupSession reference. */
closure->session = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, "ostree ", closure->session = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, "ostree ",
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
SOUP_SESSION_USE_THREAD_CONTEXT, TRUE, SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
@ -482,6 +479,14 @@ ostree_fetcher_session_thread (gpointer data)
g_main_loop_run (closure->main_loop); g_main_loop_run (closure->main_loop);
/* Since the ThreadClosure may be finalized from any thread we
* unreference all data related to the SoupSession ourself to ensure
* it's freed in the same thread where it was created. */
g_clear_pointer (&closure->outstanding, g_hash_table_unref);
while (!g_queue_is_empty (&closure->pending_queue))
g_object_unref (g_queue_pop_head (&closure->pending_queue));
g_clear_pointer (&closure->session, g_object_unref);
thread_closure_unref (closure); thread_closure_unref (closure);
/* Do this last, since libsoup uses g_main_current_source() which /* Do this last, since libsoup uses g_main_current_source() which