luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 08:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thread-pool-fix-test' into 'main'

Browse Source 
test: Potentially fix a race in thread-pool-slow test

See merge request GNOME/glib!2667
This commit is contained in:
Marco Trevisan 2022-06-30 15:00:28 +00:00
commit f86d8e2291
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glib/tests/thread-pool-slow.c
View File

@ -61,33 +61,42 @@ test_thread_functions (void)
g_assert_cmpint (g_thread_pool_get_max_idle_time (), ==, 0);
}
static void
thread_wait_func (gpointer data,
gpointer user_data)
{
guint timeout_ms = GPOINTER_TO_UINT (data);
guint *n_threads_executed = user_data;
g_usleep (timeout_ms);
g_atomic_int_inc (n_threads_executed);
}
static void
test_thread_stop_unused (void)
{
GThreadPool *pool;
guint i;
guint limit = 100;
guint n_threads_executed = 0;
/* Spawn a few threads. */
g_thread_pool_set_max_unused_threads (-1);
pool = g_thread_pool_new ((GFunc) g_usleep, NULL, -1, FALSE, NULL);
pool = g_thread_pool_new (thread_wait_func, &n_threads_executed, -1, FALSE, NULL);
for (i = 0; i < limit; i++)
g_thread_pool_push (pool, GUINT_TO_POINTER (1000), NULL);
/* Wait for the threads to migrate. */
g_usleep (G_USEC_PER_SEC);
while ((guint) g_atomic_int_get (&n_threads_executed) < limit)
g_usleep (100);
g_thread_pool_stop_unused_threads ();
for (i = 0; i < 5; i++)
{
if (g_thread_pool_get_num_unused_threads () == 0)
break;
/* Some time for threads to die. */
g_usleep (G_USEC_PER_SEC);
}
/* Wait for threads to die. */
while (g_thread_pool_get_num_unused_threads () != 0)
g_usleep (100);
g_assert_cmpint (g_thread_pool_get_num_unused_threads (), ==, 0);