luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

posix threads: use our own system_thread

Browse Source 
Wrap GRealThread in a GThreadPosix that includes its own pthread_t field
called "system_thread" and use that instead of the generic field in
GRealThread.
This commit is contained in:
Ryan Lortie 2011-10-12 22:40:37 -04:00
parent 2f5486f020
commit 2010f7f955
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glib/gthread-posix.c
View File

@ -1069,10 +1069,19 @@ g_private_replace (GPrivate *key,
#define posix_check_cmd(cmd) posix_check_err (cmd, #cmd) #define posix_check_cmd(cmd) posix_check_err (cmd, #cmd)
typedef struct
{
GRealThread thread;
pthread_t system_thread;
} GThreadPosix;
void void
g_system_thread_free (GRealThread *thread) g_system_thread_free (GRealThread *thread)
{ {
g_slice_free (GRealThread, thread); GThreadPosix *pt = (GThreadPosix *) thread;
g_slice_free (GThreadPosix, pt);
} }
GRealThread * GRealThread *
@ -1081,11 +1090,11 @@ g_system_thread_new (GThreadFunc thread_func,
gboolean joinable, gboolean joinable,
GError **error) GError **error)
{ {
GRealThread *thread; GThreadPosix *thread;
pthread_attr_t attr; pthread_attr_t attr;
gint ret; gint ret;
thread = g_slice_new0 (GRealThread); thread = g_slice_new0 (GThreadPosix);
posix_check_cmd (pthread_attr_init (&attr)); posix_check_cmd (pthread_attr_init (&attr));
@ -1104,7 +1113,7 @@ g_system_thread_new (GThreadFunc thread_func,
posix_check_cmd (pthread_attr_setdetachstate (&attr, posix_check_cmd (pthread_attr_setdetachstate (&attr,
joinable ? PTHREAD_CREATE_JOINABLE : PTHREAD_CREATE_DETACHED)); joinable ? PTHREAD_CREATE_JOINABLE : PTHREAD_CREATE_DETACHED));
ret = pthread_create ((pthread_t *) &(thread->system_thread), &attr, (void* (*)(void*))thread_func, thread); ret = pthread_create (&thread->system_thread, &attr, (void* (*)(void*))thread_func, thread);
posix_check_cmd (pthread_attr_destroy (&attr)); posix_check_cmd (pthread_attr_destroy (&attr));
@ -1112,13 +1121,13 @@ g_system_thread_new (GThreadFunc thread_func,
{ {
g_set_error (error, G_THREAD_ERROR, G_THREAD_ERROR_AGAIN, g_set_error (error, G_THREAD_ERROR, G_THREAD_ERROR_AGAIN,
"Error creating thread: %s", g_strerror (ret)); "Error creating thread: %s", g_strerror (ret));
g_slice_free (GRealThread, thread); g_slice_free (GThreadPosix, thread);
return NULL; return NULL;
} }
posix_check_err (ret, "pthread_create"); posix_check_err (ret, "pthread_create");
return thread; return (GRealThread *) thread;
} }
/** /**
@ -1138,8 +1147,9 @@ g_thread_yield (void)
void void
g_system_thread_wait (GRealThread *thread) g_system_thread_wait (GRealThread *thread)
{ {
GThreadPosix *pt = (GThreadPosix *) thread;
gpointer ignore; gpointer ignore;
posix_check_cmd (pthread_join (*(pthread_t*)&(thread->system_thread), &ignore)); posix_check_cmd (pthread_join (pt->system_thread, &ignore));
} }
void void