isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

examples: Clean up the threads usage example

Browse Source 
• Remove the threads_enter/leave calls; they are not needed, given that
  the code between init() and main() is single threaded.

• Ensure that the idle callbacks are inserted with the right priority,
  to avoid updating the UI after the data has been freed.
This commit is contained in:
Emmanuele Bassi 2012-07-05 14:21:55 +01:00
parent d7d701078a
commit 25be8e86f7
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
examples/threads.c
View File

@ -32,12 +32,14 @@ test_thread_data_free (gpointer _data)
if (data == NULL) if (data == NULL)
return; return;
g_object_unref (data->progress); g_print ("Removing thread data [%p]\n", _data);
g_object_unref (data->label);
g_object_unref (data->stage); g_clear_object (&data->progress);
g_object_unref (data->rect); g_clear_object (&data->label);
g_object_unref (data->flip); g_clear_object (&data->stage);
g_object_unref (data->bounce); g_clear_object (&data->rect);
g_clear_object (&data->flip);
g_clear_object (&data->bounce);
g_free (data); g_free (data);
} }
@ -47,20 +49,21 @@ test_thread_done_idle (gpointer user_data)
{ {
TestThreadData *data = user_data; TestThreadData *data = user_data;
g_print ("Last update [%p]\n", data);
clutter_text_set_text (CLUTTER_TEXT (data->label), "Completed"); clutter_text_set_text (CLUTTER_TEXT (data->label), "Completed");
clutter_actor_remove_transition (data->rect, "bounce"); clutter_actor_remove_transition (data->rect, "bounce");
clutter_actor_remove_transition (data->rect, "flip"); clutter_actor_remove_transition (data->rect, "flip");
test_thread_data_free (data);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
static void static void
test_thread_data_done (gpointer _data) test_thread_data_done (gpointer _data)
{ {
TestThreadData *data = _data; if (_data == NULL)
return;
g_print ("Thread completed\n"); g_print ("Thread completed\n");
@ -71,9 +74,10 @@ test_thread_data_done (gpointer _data)
* clutter_threads_add_idle() is guaranteed to run the callback passed to * clutter_threads_add_idle() is guaranteed to run the callback passed to
* to it under the Big Clutter Lock. * to it under the Big Clutter Lock.
*/ */
clutter_threads_add_idle_full (G_PRIORITY_HIGH, clutter_threads_add_idle_full (G_PRIORITY_DEFAULT,
test_thread_done_idle, data, test_thread_done_idle,
NULL); _data,
test_thread_data_free);
} }
/* thread local storage */ /* thread local storage */
@ -91,6 +95,9 @@ update_label_idle (gpointer data)
guint width; guint width;
gchar *text; gchar *text;
if (update->thread_data->label == NULL)
return G_SOURCE_REMOVE;
text = g_strdup_printf ("Count to %d", update->count); text = g_strdup_printf ("Count to %d", update->count);
clutter_text_set_text (CLUTTER_TEXT (update->thread_data->label), text); clutter_text_set_text (CLUTTER_TEXT (update->thread_data->label), text);
@ -136,14 +143,14 @@ do_something_very_slow (void)
/* update the UI from within the main loop, making sure that the /* update the UI from within the main loop, making sure that the
* Big Clutter Lock is held; only one thread at a time can call * Big Clutter Lock is held; only one thread at a time can call
* Clutter API, and it's better to do this from the same thread * Clutter API, and it's mandatory to do this from the same thread
* that called clutter_init()/clutter_main(). * that called clutter_init()/clutter_main().
*/ */
update = g_new (TestUpdate, 1); update = g_new (TestUpdate, 1);
update->count = i; update->count = i;
update->thread_data = data; update->thread_data = data;
clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 30, clutter_threads_add_idle_full (G_PRIORITY_HIGH,
update_label_idle, update_label_idle,
update, NULL); update, NULL);
} }
@ -279,9 +286,7 @@ main (int argc, char *argv[])
clutter_actor_show (stage); clutter_actor_show (stage);
clutter_threads_enter ();
clutter_main (); clutter_main ();
clutter_threads_leave ();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }