luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-13 06:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use g_thread_foreach in tests

Browse Source
This commit is contained in:
Matthias Clasen 2011-10-02 22:31:45 -04:00
parent 3d4846d923
commit 151756631d
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/threadpool-test.c
View File

@ -80,24 +80,6 @@ test_thread_functions (void)
g_assert (g_thread_pool_get_max_idle_time () == 0); g_assert (g_thread_pool_get_max_idle_time () == 0);
} }
static void
test_count_threads_foreach (GThread *thread,
guint *count)
{
++*count;
}
static guint
test_count_threads (void)
{
guint count = 0;
g_thread_foreach ((GFunc) test_count_threads_foreach, &count);
/* Exclude main thread */
return count - 1;
}
static void static void
test_thread_stop_unused (void) test_thread_stop_unused (void)
{ {
@ -118,16 +100,12 @@ test_thread_stop_unused (void)
/* Wait for the threads to migrate. */ /* Wait for the threads to migrate. */
g_usleep (G_USEC_PER_SEC); g_usleep (G_USEC_PER_SEC);
DEBUG_MSG (("[unused] current threads %d",
test_count_threads()));
DEBUG_MSG (("[unused] stopping unused threads")); DEBUG_MSG (("[unused] stopping unused threads"));
g_thread_pool_stop_unused_threads (); g_thread_pool_stop_unused_threads ();
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
{ {
if (g_thread_pool_get_num_unused_threads () == 0 && if (g_thread_pool_get_num_unused_threads () == 0)
test_count_threads () == 0)
break; break;
DEBUG_MSG (("[unused] waiting ONE second for threads to die")); DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
@ -136,11 +114,9 @@ test_thread_stop_unused (void)
g_usleep (G_USEC_PER_SEC); g_usleep (G_USEC_PER_SEC);
} }
DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", DEBUG_MSG (("[unused] stopped idle threads, %d remain",
g_thread_pool_get_num_unused_threads (), g_thread_pool_get_num_unused_threads ()));
test_count_threads ()));
g_assert (g_thread_pool_get_num_unused_threads () == test_count_threads ());
g_assert (g_thread_pool_get_num_unused_threads () == 0); g_assert (g_thread_pool_get_num_unused_threads () == 0);
g_thread_pool_set_max_unused_threads (MAX_THREADS); g_thread_pool_set_max_unused_threads (MAX_THREADS);