luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-23 17:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gthreadpool: Catch pool_spawner creation failure

Browse Source
This commit is contained in:
Peter Bloomfield
2025-07-17 18:46:50 -04:00
committed by Philip Withnall
parent 16d170cdf6
commit 3bee5d4aaa
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gthreadpool.c
View File

@@ -582,6 +582,7 @@ g_thread_pool_new_full (GFunc func,
{
GRealThreadPool *retval;
G_LOCK_DEFINE_STATIC (init);
GError *local_error = NULL;
g_return_val_if_fail (func, NULL);
g_return_val_if_fail (!exclusive || max_threads != -1, NULL);
@@ -629,22 +630,19 @@ g_thread_pool_new_full (GFunc func,
spawn_thread_queue = g_async_queue_new ();
g_cond_init (&spawn_thread_cond);
pool_spawner = g_thread_new ("pool-spawner", g_thread_pool_spawn_thread, NULL);
pool_spawner = g_thread_try_new ("pool-spawner", g_thread_pool_spawn_thread, NULL, &local_error);
g_ignore_leak (pool_spawner);
}
G_UNLOCK (init);
if (retval->pool.exclusive)
if (retval->pool.exclusive && local_error == NULL)
{
g_async_queue_lock (retval->queue);
while (retval->num_threads < (guint) retval->max_threads)
{
GError *local_error = NULL;
if (!g_thread_pool_start_thread (retval, &local_error))
{
g_propagate_error (error, local_error);
break;
}
}
@@ -652,6 +650,18 @@ g_thread_pool_new_full (GFunc func,
g_async_queue_unlock (retval->queue);
}
if (local_error != NULL)
{
/* Failed to create pool spawner or failed to start a thread,
* so we must return NULL */
g_propagate_error (error, local_error);
g_clear_pointer (&retval->queue, g_async_queue_unref);
g_cond_clear (&retval->cond);
g_clear_pointer (&retval, g_free);
}
return (GThreadPool*) retval;
}