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

g_thread_new: never fail

Browse Source 
Remove the GError argument from g_thread_new() and abort on failure.
Introduce g_thread_try() for those who want to handle failure.
This commit is contained in:
Ryan Lortie 2011-10-13 01:00:57 -04:00
parent 015f4b4513
commit 430c5635f2
26 changed files with 73 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gdbusprivate.c
View File

@ -287,7 +287,6 @@ static SharedThreadData *
_g_dbus_shared_thread_ref (void)
{
static gsize shared_thread_data = 0;
GError *error = NULL;
SharedThreadData *ret;
if (g_once_init_enter (&shared_thread_data))
@ -304,9 +303,7 @@ _g_dbus_shared_thread_ref (void)
data->loop = g_main_loop_new (data->context, FALSE);
data->thread = g_thread_new ("gdbus",
gdbus_shared_thread_func,
data,
&error);
g_assert_no_error (error);
data);
/* We can cast between gsize and gpointer safely */
g_once_init_leave (&shared_thread_data, (gsize) data);
}

2
gio/tests/contexts.c
View File

@ -75,7 +75,7 @@ idle_start_test1_thread (gpointer loop)
gboolean io_completed;
g_mutex_lock (&test1_mutex);
thread = g_thread_new ("test1", test1_thread, NULL, NULL);
thread = g_thread_new ("test1", test1_thread, NULL);
g_get_current_time (&time);
time.tv_sec += 2;

7
gio/tests/gdbus-export.c
View File

@ -936,16 +936,11 @@ static void
test_dispatch (const gchar *object_path)
{
GThread *thread;
GError *error;
/* run this in a thread to avoid deadlocks */
error = NULL;
thread = g_thread_new ("test_dispatch",
test_dispatch_thread_func,
(gpointer) object_path,
&error);
g_assert_no_error (error);
g_assert (thread != NULL);
(gpointer) object_path);
g_main_loop_run (loop);
g_thread_join (thread);
}

14
gio/tests/gdbus-peer.c
View File

@ -601,11 +601,9 @@ test_peer (void)
g_assert (c == NULL);
/* bring up a server - we run the server in a different thread to avoid deadlocks */
error = NULL;
service_thread = g_thread_new ("test_peer",
service_thread_func,
&data,
&error);
&data);
while (service_loop == NULL)
g_thread_yield ();
g_assert (server != NULL);
@ -1050,11 +1048,9 @@ delayed_message_processing (void)
data = g_new0 (DmpData, 1);
error = NULL;
service_thread = g_thread_new ("dmp",
dmp_thread_func,
data,
&error);
data);
while (data->server == NULL || !g_dbus_server_is_active (data->server))
g_thread_yield ();
@ -1201,8 +1197,7 @@ test_nonce_tcp (void)
service_loop = NULL;
service_thread = g_thread_new ("nonce-tcp-service",
nonce_tcp_service_thread_func,
&data,
&error);
&data);
while (service_loop == NULL)
g_thread_yield ();
g_assert (server != NULL);
@ -1510,8 +1505,7 @@ test_tcp_anonymous (void)
service_loop = NULL;
service_thread = g_thread_new ("tcp-anon-service",
tcp_anonymous_service_thread_func,
&seen_connection, /* user_data */
&error);
&seen_connection);
while (service_loop == NULL)
g_thread_yield ();
g_assert (server != NULL);

4
gio/tests/gdbus-proxy-threads.c
View File

@ -222,9 +222,7 @@ test_proxy (void)
for (i = 0; i < n_threads; i++)
{
proxy_threads[i] = g_thread_new ("run-proxy",
run_proxy_thread, connection,
&error);
g_assert_no_error (error);
run_proxy_thread, connection);
}
g_main_loop_run (loop);

3
gio/tests/gdbus-test-codegen.c
View File

@ -567,8 +567,7 @@ on_name_acquired (GDBusConnection *connection,
g_thread_new ("check-proxies",
check_proxies_in_thread,
loop,
NULL);
loop);
}
static void

24
gio/tests/gdbus-threading.c
View File

@ -229,16 +229,11 @@ test_delivery_in_thread_func (gpointer _data)
static void
test_delivery_in_thread (void)
{
GError *error;
GThread *thread;
error = NULL;
thread = g_thread_new ("deliver",
test_delivery_in_thread_func,
NULL,
&error);
g_assert_no_error (error);
g_assert (thread != NULL);
NULL);
/* run the event loop - it is needed to dispatch D-Bus messages */
g_main_loop_run (loop);
@ -379,12 +374,10 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
SyncThreadData data1;
SyncThreadData data2;
SyncThreadData data3;
GError *error;
GTimeVal start_time;
GTimeVal end_time;
guint elapsed_msec;
error = NULL;
do_async = (n == 0);
g_get_current_time (&start_time);
@ -396,10 +389,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
data1.done = FALSE;
thread1 = g_thread_new ("sleep",
test_sleep_in_thread_func,
&data1,
&error);
g_assert_no_error (error);
g_assert (thread1 != NULL);
&data1);
data2.proxy = proxy;
data2.msec = 20;
@ -408,10 +398,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
data2.done = FALSE;
thread2 = g_thread_new ("sleep2",
test_sleep_in_thread_func,
&data2,
&error);
g_assert_no_error (error);
g_assert (thread2 != NULL);
&data2);
data3.proxy = proxy;
data3.msec = 100;
@ -420,10 +407,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
data3.done = FALSE;
thread3 = g_thread_new ("sleep3",
test_sleep_in_thread_func,
&data3,
&error);
g_assert_no_error (error);
g_assert (thread3 != NULL);
&data3);
/* we handle messages in the main loop - threads will quit it when they are done */
while (!(data1.done && data2.done && data3.done))

4
gio/tests/resolver.c
View File

@ -203,9 +203,7 @@ start_sync_lookups (char **argv, int argc)
for (i = 0; i < argc; i++)
{
GThread *thread;
thread = g_thread_new ("lookup", lookup_thread, argv[i], NULL);
g_assert (thread != NULL);
thread = g_thread_new ("lookup", lookup_thread, argv[i]);
g_thread_unref (thread);
}
}

4
gio/tests/send-data.c
View File

@ -91,10 +91,8 @@ main (int argc, char *argv[])
if (cancel_timeout)
{
GThread *thread;
cancellable = g_cancellable_new ();
thread = g_thread_new ("cancel", cancel_thread, cancellable, NULL);
g_assert (thread != NULL);
thread = g_thread_new ("cancel", cancel_thread, cancellable);
g_thread_unref (thread);
}
else

4
gio/tests/socket-client.c
View File

@ -289,10 +289,8 @@ main (int argc,
if (cancel_timeout)
{
GThread *thread;
cancellable = g_cancellable_new ();
thread = g_thread_new ("cancel", cancel_thread, cancellable, NULL);
g_assert (thread != NULL);
thread = g_thread_new ("cancel", cancel_thread, cancellable);
g_thread_unref (thread);
}
else

4
gio/tests/socket-server.c
View File

@ -82,10 +82,8 @@ main (int argc,
if (cancel_timeout)
{
GThread *thread;
cancellable = g_cancellable_new ();
thread = g_thread_new ("cancel", cancel_thread, cancellable, NULL);
g_assert (thread != NULL);
thread = g_thread_new ("cancel", cancel_thread, cancellable);
g_thread_unref (thread);
}
else

3
gio/tests/socket.c
View File

@ -128,8 +128,7 @@ create_server (GSocketFamily family,
g_socket_listen (server, &error);
g_assert_no_error (error);
data->thread = g_thread_new ("server", server_thread, data, &error);
g_assert_no_error (error);
data->thread = g_thread_new ("server", server_thread, data);
return data;
}

3
gio/tests/tls-interaction.c
View File

@ -426,7 +426,6 @@ static void
setup_with_thread_loop (Test *test,
gconstpointer user_data)
{
GError *error = NULL;
ThreadLoop closure;
setup_without_loop (test, user_data);
@ -437,7 +436,7 @@ setup_with_thread_loop (Test *test,
closure.test = test;
g_mutex_lock (&closure.loop_mutex);
test->loop_thread = g_thread_new ("loop", thread_loop, &closure, &error);
test->loop_thread = g_thread_new ("loop", thread_loop, &closure);
while (!closure.started)
g_cond_wait (&closure.loop_started, &closure.loop_mutex);
g_mutex_unlock (&closure.loop_mutex);

4
gio/tests/unix-streams.c
View File

@ -216,8 +216,8 @@ test_pipe_io (void)
reader_cancel = g_cancellable_new ();
main_cancel = g_cancellable_new ();
writer = g_thread_new ("writer", writer_thread, NULL, NULL);
reader = g_thread_new ("reader", reader_thread, NULL, NULL);
writer = g_thread_new ("writer", writer_thread, NULL);
reader = g_thread_new ("reader", reader_thread, NULL);
in = g_unix_input_stream_new (writer_pipe[0], TRUE);
out = g_unix_output_stream_new (reader_pipe[1], TRUE);

1
glib/glib.symbols
View File

@ -1103,6 +1103,7 @@ g_thread_new_full
g_thread_ref
g_thread_self
g_thread_set_priority
g_thread_try
g_thread_use_default_impl
g_thread_unref
g_thread_yield

6
glib/gmain.c
View File

@ -4757,12 +4757,8 @@ g_get_worker_context (void)
if (g_once_init_enter (&initialised))
{
GError *error = NULL;
glib_worker_context = g_main_context_new ();
if (g_thread_new ("gmain", glib_worker_main, NULL, &error) == NULL)
g_error ("Creating GLib worker thread failed: %s\n", error->message);
g_thread_new ("gmain", glib_worker_main, NULL);
g_once_init_leave (&initialised, TRUE);
}

40
glib/gthread.c
View File

@ -731,17 +731,48 @@ g_thread_proxy (gpointer data)
* a debugger. Some systems restrict the length of @name to
* 16 bytes.
*
* @error can be %NULL to ignore errors, or non-%NULL to report errors.
* The error is set, if and only if the function returns %NULL.
* If the thread can not be created the program aborts. See
* g_thread_try() if you want to attempt to deal with failures.
*
* You must
* Returns: the new #GThread
*
* Since: 2.32
*/
GThread *
g_thread_new (const gchar *name,
GThreadFunc func,
gpointer data)
{
GError *error = NULL;
GThread *thread;
thread = g_thread_new_internal (name, g_thread_proxy, func, data, 0, &error);
if G_UNLIKELY (thread == NULL)
g_error ("creating thread '%s': %s", name ? name : "", error->message);
return thread;
}
/**
* g_thread_try:
* @name: a name for the new thread
* @func: a function to execute in the new thread
* @data: an argument to supply to the new thread
* @error: return location for error
*
* This function is the same as g_thread_new() except that it allows for
* the possibility of failure.
*
* If a thread can not be created (due to resource limits), @error is
* set and %NULL is returned.
*
* Returns: the new #GThread, or %NULL if an error occurred
*
* Since: 2.32
*/
GThread *
g_thread_new (const gchar *name,
g_thread_try (const gchar *name,
GThreadFunc func,
gpointer data,
GError **error)
@ -749,6 +780,7 @@ g_thread_new (const gchar *name,
return g_thread_new_internal (name, g_thread_proxy, func, data, 0, error);
}
/**
* g_thread_new_full:
* @name: a name for the new thread

3
glib/gthread.h
View File

@ -140,6 +140,9 @@ struct _GOnce
GThread * g_thread_ref (GThread *thread);
void g_thread_unref (GThread *thread);
GThread * g_thread_new (const gchar *name,
GThreadFunc func,
gpointer data);
GThread * g_thread_try (const gchar *name,
GThreadFunc func,
gpointer data,
GError **error);

2
glib/gthreadpool.c
View File

@ -414,7 +414,7 @@ g_thread_pool_start_thread (GRealThreadPool *pool,
GThread *thread;
/* No thread was found, we have to start a new one */
thread = g_thread_new ("pool", g_thread_pool_thread_proxy, pool, error);
thread = g_thread_try ("pool", g_thread_pool_thread_proxy, pool, error);
if (thread == NULL)
return FALSE;

2
glib/tests/once.c
View File

@ -104,7 +104,7 @@ test_once3 (void)
shared = 0;
for (i = 0; i < THREADS; i++)
threads[i] = g_thread_new ("once3", thread_func, NULL, NULL);
threads[i] = g_thread_new ("once3", thread_func, NULL);
for (i = 0; i < THREADS; i++)
g_thread_join (threads[i]);

6
glib/tests/thread.c
View File

@ -50,7 +50,7 @@ test_thread1 (void)
GThread *thread;
GError *error = NULL;
thread = g_thread_new ("test", thread1_func, NULL, &error);
thread = g_thread_try ("test", thread1_func, NULL, &error);
g_assert_no_error (error);
result = g_thread_join (thread);
@ -71,7 +71,7 @@ test_thread2 (void)
gpointer result;
GThread *thread;
thread = g_thread_new ("test", thread2_func, NULL, NULL);
thread = g_thread_new ("test", thread2_func, NULL);
g_assert (g_thread_self () != thread);
@ -135,7 +135,7 @@ test_thread4 (void)
g_error ("prlimit failed: %s\n", g_strerror (ret));
error = NULL;
thread = g_thread_new ("a", thread1_func, NULL, &error);
thread = g_thread_try ("a", thread1_func, NULL, &error);
g_assert (thread == NULL);
g_assert_error (error, G_THREAD_ERROR, G_THREAD_ERROR_AGAIN);
g_error_free (error);

2
gobject/tests/dynamictests.c
View File

@ -210,7 +210,7 @@ test_multithreaded_dynamic_type_init (void)
/* create threads */
for (i = 0; i < N_THREADS; i++) {
threads[i] = g_thread_new ("test", ref_unref_thread, (gpointer) DYNAMIC_OBJECT_TYPE, NULL);
threads[i] = g_thread_new ("test", ref_unref_thread, (gpointer) DYNAMIC_OBJECT_TYPE);
}
/* execute threads */

3
gthread/tests/1bit-mutex.c
View File

@ -133,8 +133,7 @@ testcase (gconstpointer data)
for (i = 0; i < THREADS; i++)
threads[i] = g_thread_new ("foo", thread_func,
GINT_TO_POINTER (use_pointers),
NULL);
GINT_TO_POINTER (use_pointers));
for (i = 0; i < THREADS; i++)
g_thread_join (threads[i]);

2
gthread/tests/atomic.c
View File

@ -47,7 +47,7 @@ test_atomic (void)
bucket[i] = 0;
for (i = 0; i < THREADS; i++)
threads[i] = g_thread_new ("atomic", thread_func, GINT_TO_POINTER (i), NULL);
threads[i] = g_thread_new ("atomic", thread_func, GINT_TO_POINTER (i));
for (i = 0; i < THREADS; i++)
g_thread_join (threads[i]);

2
gthread/tests/gwakeuptest.c
View File

@ -229,7 +229,7 @@ test_threaded (void)
for (i = 0; i < NUM_THREADS; i++)
{
context_init (&contexts[i]);
threads[i] = g_thread_new ("test", thread_func, &contexts[i], NULL);
threads[i] = g_thread_new ("test", thread_func, &contexts[i]);
}
/* dispatch tokens */

6
gthread/tests/spawn-multithreaded.c
View File

@ -34,18 +34,16 @@ static void
multithreaded_test_run (GThreadFunc function)
{
int i;
GError *error = NULL;
GPtrArray *threads = g_ptr_array_new ();
for (i = 0; i < N_THREADS; i++)
{
GThread *thread;
thread = g_thread_new ("test", function, GINT_TO_POINTER (i), &error);
g_assert_no_error (error);
thread = g_thread_new ("test", function, GINT_TO_POINTER (i));
g_ptr_array_add (threads, thread);
}
for (i = 0; i < N_THREADS; i++)
{
gpointer ret;