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

Remove g_mutex_new()/g_cond_new() in testcases

Browse Source 
These were the last users of the dynamic allocation API.

Keep the uses in glib/tests/mutex.c since this is actually meant to test
the API (which has to continue working, even if it is deprecated).

https://bugzilla.gnome.org/show_bug.cgi?id=660739
This commit is contained in:
Ryan Lortie
2011-10-04 19:04:41 -04:00
parent 9793708931
commit 6f343ca548
10 changed files with 97 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/mainloop-test.c
View File

@@ -27,8 +27,8 @@
* be locked while the context array mutex is locked
*/
GPtrArray *context_array;
GMutex *context_array_mutex;
GCond *context_array_cond;
GMutex context_array_mutex;
GCond context_array_cond;
GMainLoop *main_loop;
@@ -144,14 +144,14 @@ adder_thread (gpointer data)
context = g_main_context_new ();
g_mutex_lock (context_array_mutex);
g_mutex_lock (&context_array_mutex);
g_ptr_array_add (context_array, context);
if (context_array->len == NTHREADS)
g_cond_broadcast (context_array_cond);
g_cond_broadcast (&context_array_cond);
g_mutex_unlock (context_array_mutex);
g_mutex_unlock (&context_array_mutex);
addr_data.dest = channels[1];
addr_data.loop = g_main_loop_new (context, FALSE);
@@ -183,11 +183,11 @@ adder_thread (gpointer data)
g_print ("Timeout run %d times\n", addr_data.count);
#endif
g_mutex_lock (context_array_mutex);
g_mutex_lock (&context_array_mutex);
g_ptr_array_remove (context_array, context);
if (context_array->len == 0)
g_main_loop_quit (main_loop);
g_mutex_unlock (context_array_mutex);
g_mutex_unlock (&context_array_mutex);
cleanup_crawlers (context);
@@ -343,10 +343,10 @@ create_crawler (void)
G_LOCK (crawler_array_lock);
g_ptr_array_add (crawler_array, source);
g_mutex_lock (context_array_mutex);
g_mutex_lock (&context_array_mutex);
g_source_attach (source, context_array->pdata[g_random_int_range (0, context_array->len)]);
g_source_unref (source);
g_mutex_unlock (context_array_mutex);
g_mutex_unlock (&context_array_mutex);
G_UNLOCK (crawler_array_lock);
}
@@ -386,14 +386,14 @@ recurser_start (gpointer data)
GMainContext *context;
GSource *source;
g_mutex_lock (context_array_mutex);
g_mutex_lock (&context_array_mutex);
context = context_array->pdata[g_random_int_range (0, context_array->len)];
source = g_idle_source_new ();
g_source_set_name (source, "Recursing idle source");
g_source_set_callback (source, recurser_idle, context, NULL);
g_source_attach (source, context);
g_source_unref (source);
g_mutex_unlock (context_array_mutex);
g_mutex_unlock (&context_array_mutex);
return TRUE;
}
@@ -407,8 +407,6 @@ main (int argc,
g_thread_init (NULL);
context_array = g_ptr_array_new ();
context_array_mutex = g_mutex_new ();
context_array_cond = g_cond_new ();
crawler_array = g_ptr_array_new ();
@@ -419,12 +417,12 @@ main (int argc,
/* Wait for all threads to start
*/
g_mutex_lock (context_array_mutex);
g_mutex_lock (&context_array_mutex);
if (context_array->len < NTHREADS)
g_cond_wait (context_array_cond, context_array_mutex);
g_cond_wait (&context_array_cond, &context_array_mutex);
g_mutex_unlock (context_array_mutex);
g_mutex_unlock (&context_array_mutex);
for (i = 0; i < NCRAWLERS; i++)
create_crawler ();