luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-25 22:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't use the thread_equal vfunc anymore

Browse Source 
Just move the g_system_thread_equal implementation into
the posix and win32 implementations, and drop some micro macro
optimization.
This commit is contained in:
Matthias Clasen
2011-09-18 23:10:25 -04:00
committed by Ryan Lortie
parent e00bcfcdec
commit cc7631cd19
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gthread.c
View File

@@ -1196,7 +1196,7 @@ g_static_rec_mutex_lock (GStaticRecMutex* mutex)
G_THREAD_UF (thread_self, (&self));
if (g_system_thread_equal (self, mutex->owner))
if (g_system_thread_equal (&self, &mutex->owner))
{
mutex->depth++;
return;
@@ -1229,7 +1229,7 @@ g_static_rec_mutex_trylock (GStaticRecMutex* mutex)
G_THREAD_UF (thread_self, (&self));
if (g_system_thread_equal (self, mutex->owner))
if (g_system_thread_equal (&self, &mutex->owner))
{
mutex->depth++;
return TRUE;
@@ -1293,7 +1293,7 @@ g_static_rec_mutex_lock_full (GStaticRecMutex *mutex,
G_THREAD_UF (thread_self, (&self));
if (g_system_thread_equal (self, mutex->owner))
if (g_system_thread_equal (&self, &mutex->owner))
{
mutex->depth += depth;
return;
@@ -1859,8 +1859,7 @@ g_thread_join (GThread* thread)
g_return_val_if_fail (thread, 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_return_val_if_fail (!g_system_thread_equal (&real->system_thread, &zero_thread), NULL);
G_THREAD_UF (thread_join, (&real->system_thread));
@@ -1913,7 +1912,7 @@ g_thread_set_priority (GThread* thread,
GRealThread* real = (GRealThread*) thread;
g_return_if_fail (thread);
g_return_if_fail (!g_system_thread_equal (real->system_thread, zero_thread));
g_return_if_fail (!g_system_thread_equal (&real->system_thread, &zero_thread));
g_return_if_fail (priority >= G_THREAD_PRIORITY_LOW);
g_return_if_fail (priority <= G_THREAD_PRIORITY_URGENT);