Use adaptive mutexes when available

These are supposedly better on multi-cpu systems - and who doesn't
have multiple cpus nowadays. One single-processor systems, they
are identical to normal mutexes.
See e.g. http://bugzilla.mozilla.org/show_bug.cgi?id=132089

https://bugzilla.gnome.org/show_bug.cgi?id=659423

diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index fa13ddae1d6013a3f5e66a6814bc2631111051e7..e8028d8677433e1e06d485bb52fc15e6eab00d16 100644 (file)
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
@@ -96,9 +96,20 @@ void
 g_mutex_init (GMutex *mutex)
 {
   gint status;
+  pthread_mutexattr_t *pattr = NULL;
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_t attr;
+  pthread_mutexattr_init (&attr);
+  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+  pattr = &attr;
+#endif
 
-  if G_UNLIKELY ((status = pthread_mutex_init (&mutex->impl, NULL)) != 0)
+  if G_UNLIKELY ((status = pthread_mutex_init (&mutex->impl, pattr)) != 0)
     g_thread_abort (status, "pthread_mutex_init");
+
+#ifdef PTHREAD_ADAPTIVE_MUTEX_NP
+  pthread_mutexattr_destroy (&attr);
+#endif
 }
 
 /**

diff --git a/glib/gthread.h b/glib/gthread.h
index ab2e5cd8d6081d5eb998e76f7a8f3120e055578f..1cb4d45a63b87dd38c0e41eca448a9b2c04594a5 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -82,7 +82,11 @@ struct _GCond
 
 #include <pthread.h>
 
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+#define G_MUTEX_INIT { PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP }
+#else
 #define G_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER }
+#endif
 struct _GMutex
 {
   pthread_mutex_t impl;