diff options
| -rw-r--r-- | gio/gcontextspecificgroup.c | 77 | ||||
| -rw-r--r-- | gio/gcontextspecificgroup.h | 4 | ||||
| -rw-r--r-- | gio/tests/contexts.c | 4 |
3 files changed, 52 insertions, 33 deletions
diff --git a/gio/gcontextspecificgroup.c b/gio/gcontextspecificgroup.c index 849b0a40a..47a49c404 100644 --- a/gio/gcontextspecificgroup.c +++ b/gio/gcontextspecificgroup.c @@ -90,27 +90,24 @@ g_context_specific_source_new (const gchar *name, return css; } -typedef struct -{ - GCallback callback; - GMutex mutex; - GCond cond; -} Closure; - static gboolean -g_context_specific_group_invoke_closure (gpointer user_data) +g_context_specific_group_change_state (gpointer user_data) { - Closure *closure = user_data; + GContextSpecificGroup *group = user_data; - (* closure->callback) (); + g_mutex_lock (&group->lock); - g_mutex_lock (&closure->mutex); + if (group->requested_state != group->effective_state) + { + (* group->requested_func) (); - closure->callback = NULL; + group->effective_state = group->requested_state; + group->requested_func = NULL; - g_cond_broadcast (&closure->cond); + g_cond_broadcast (&group->cond); + } - g_mutex_unlock (&closure->mutex); + g_mutex_unlock (&group->lock); return FALSE; } @@ -128,25 +125,43 @@ g_context_specific_group_invoke_closure (gpointer user_data) * example) */ static void -g_context_specific_group_wait_for_callback (GCallback callback) +g_context_specific_group_request_state (GContextSpecificGroup *group, + gboolean requested_state, + GCallback requested_func) { - Closure closure; - - g_mutex_init (&closure.mutex); - g_cond_init (&closure.cond); - - closure.callback = callback; + if (requested_state != group->requested_state) + { + if (group->effective_state != group->requested_state) + { + /* abort the currently pending state transition */ + g_assert (group->effective_state == requested_state); - g_main_context_invoke (GLIB_PRIVATE_CALL(g_get_worker_context) (), - g_context_specific_group_invoke_closure, &closure); + group->requested_state = requested_state; + group->requested_func = NULL; + } + else + { + /* start a new state transition */ + group->requested_state = requested_state; + group->requested_func = requested_func; - g_mutex_lock (&closure.mutex); - while (closure.callback) - g_cond_wait (&closure.cond, &closure.mutex); - g_mutex_unlock (&closure.mutex); + g_main_context_invoke (GLIB_PRIVATE_CALL(g_get_worker_context) (), + g_context_specific_group_change_state, group); + } + } - g_mutex_clear (&closure.mutex); - g_cond_clear (&closure.cond); + /* we only block for positive transitions */ + if (requested_state) + { + while (group->requested_state != group->effective_state) + g_cond_wait (&group->cond, &group->lock); + + /* there is no way this could go back to FALSE because the object + * that we just created in this thread would have to have been + * destroyed again (from this thread) before that could happen. + */ + g_assert (group->effective_state); + } } gpointer @@ -169,7 +184,7 @@ g_context_specific_group_get (GContextSpecificGroup *group, /* start only if there are no others */ if (start_func && g_hash_table_size (group->table) == 0) - g_context_specific_group_wait_for_callback (start_func); + g_context_specific_group_request_state (group, TRUE, start_func); css = g_hash_table_lookup (group->table, context); @@ -214,7 +229,7 @@ g_context_specific_group_remove (GContextSpecificGroup *group, /* stop only if we were the last one */ if (stop_func && g_hash_table_size (group->table) == 0) - g_context_specific_group_wait_for_callback (stop_func); + g_context_specific_group_request_state (group, FALSE, stop_func); g_mutex_unlock (&group->lock); diff --git a/gio/gcontextspecificgroup.h b/gio/gcontextspecificgroup.h index b77134b98..9c06aa83b 100644 --- a/gio/gcontextspecificgroup.h +++ b/gio/gcontextspecificgroup.h @@ -26,6 +26,10 @@ typedef struct { GHashTable *table; GMutex lock; + GCond cond; + gboolean requested_state; + GCallback requested_func; + gboolean effective_state; } GContextSpecificGroup; gpointer diff --git a/gio/tests/contexts.c b/gio/tests/contexts.c index 49190d9ad..6d7412a80 100644 --- a/gio/tests/contexts.c +++ b/gio/tests/contexts.c @@ -297,7 +297,7 @@ test_identity_thread (gpointer user_data) g_main_context_unref (my_context); /* at least one thread should see this cleared on exit */ - return GUINT_TO_POINTER (!g_atomic_int_get (&is_running)); + return GUINT_TO_POINTER (!group.requested_state); } static void @@ -352,7 +352,7 @@ test_emit_thread (gpointer user_data) g_main_context_unref (my_context); /* at least one thread should see this cleared on exit */ - return GUINT_TO_POINTER (!g_atomic_int_get (&is_running)); + return GUINT_TO_POINTER (!group.requested_state); } static void |