luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32 threads: use our own data, not system_thread

Browse Source 
Stop using the generic system_thread field in GRealThread.  Use our own
pointer instead.
This commit is contained in:
Ryan Lortie 2011-10-12 22:53:52 -04:00
parent 67e28068e1
commit e0c9757b9b
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-win32.c
View File

@ -463,10 +463,19 @@ struct _GThreadData
gboolean joinable;
};
typedef struct
{
GRealThread thread;
GThreadData *data;
} GThreadWin32;
void
g_system_thread_free (GRealThread *thread)
{
g_slice_free (GRealThread, thread);
GThreadWin32 *wt = (GThreadWin32 *) thread;
g_slice_free (GThreadWin32, wt);
}
void
@ -497,11 +506,11 @@ g_system_thread_new (GThreadFunc func,
gboolean joinable,
GError **error)
{
GRealThread *thread;
GThreadWin32 *thread;
guint ignore;
GThreadData *retval;
thread = g_slice_new0 (GRealThread);
thread = g_slice_new0 (GThreadWin32);
retval = g_new(GThreadData, 1);
retval->func = func;
retval->data = thread;
@ -518,13 +527,13 @@ g_system_thread_new (GThreadFunc func,
"Error creating thread: %s", win_error);
g_free (retval);
g_free (win_error);
g_slice_free (GRealThread, thread);
g_slice_free (GThreadWin32, thread);
return NULL;
}
*(GThreadData **) &(thread->system_thread) = retval;
thread->data = retval;
return thread;
return (GRealThread *) thread;
}
void
@ -536,7 +545,8 @@ g_thread_yield (void)
void
g_system_thread_wait (GRealThread *thread)
{
GThreadData *target = *(GThreadData **)&(thread->system_thread);
GThreadWin32 *wt = (GThreadWin32 *) thread;
GThreadData *target = wt->data;
g_return_if_fail (target->joinable);