luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 03:32:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

thread: Remove the zero_thread

Browse Source 
This was only used for redundant assertion checks.
This commit is contained in:
Ryan Lortie 2011-10-12 18:22:31 -04:00
parent 2b281e40f3
commit ed35d2719b
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/deprecated/gthread-deprecated.c
View File

@ -148,8 +148,6 @@ guint64 (*g_thread_gettime) (void) = gettime;
/* Initialisation {{{1 ---------------------------------------------------- */ /* Initialisation {{{1 ---------------------------------------------------- */
gboolean g_threads_got_initialized = TRUE; gboolean g_threads_got_initialized = TRUE;
GSystemThread zero_thread; /* This is initialized to all zero */
/** /**
* g_thread_init: * g_thread_init:

6
glib/gthread.c
View File

@ -677,12 +677,8 @@ g_thread_cleanup (gpointer data)
* If it is, the structure is freed in g_thread_join() * If it is, the structure is freed in g_thread_join()
*/ */
if (!thread->thread.joinable) if (!thread->thread.joinable)
{
/* Just to make sure, this isn't used any more */
g_system_thread_assign (thread->system_thread, zero_thread);
g_free (thread); g_free (thread);
} }
}
} }
static gpointer static gpointer
@ -891,7 +887,6 @@ g_thread_join (GThread *thread)
g_return_val_if_fail (thread, NULL); g_return_val_if_fail (thread, NULL);
g_return_val_if_fail (thread->joinable, NULL); g_return_val_if_fail (thread->joinable, NULL);
g_return_val_if_fail (!g_system_thread_equal (&real->system_thread, &zero_thread), NULL);
g_system_thread_join (&real->system_thread); g_system_thread_join (&real->system_thread);
@ -899,7 +894,6 @@ g_thread_join (GThread *thread)
/* Just to make sure, this isn't used any more */ /* Just to make sure, this isn't used any more */
thread->joinable = 0; thread->joinable = 0;
g_system_thread_assign (real->system_thread, zero_thread);
/* the thread structure for non-joinable threads is freed upon /* the thread structure for non-joinable threads is freed upon
* thread end. We free the memory here. This will leave a loose end, * thread end. We free the memory here. This will leave a loose end,

1
glib/gthreadprivate.h
View File

@ -72,7 +72,6 @@ struct _GRealThread
GSystemThread system_thread; GSystemThread system_thread;
}; };
G_GNUC_INTERNAL extern GSystemThread zero_thread;
G_GNUC_INTERNAL extern GMutex g_once_mutex; G_GNUC_INTERNAL extern GMutex g_once_mutex;
/* initializers that may also use g_private_new() */ /* initializers that may also use g_private_new() */