Index: /trunk/psLib/src/sys/psMutex.h
===================================================================
--- /trunk/psLib/src/sys/psMutex.h	(revision 19231)
+++ /trunk/psLib/src/sys/psMutex.h	(revision 19232)
@@ -5,17 +5,57 @@
 #include <assert.h>
 
-typedef pthread_mutex_t psMutex;        /// Mutual Exclusion using pthreads
+// We desire that these functions be fast (they may get called a lot), so we've defined them as macros.
+
 //#define PS_MUTEX_CAREFUL                // Use error-checking mutexes, trace messages, check the results
 
+typedef pthread_mutex_t psMutex;        /// Mutual Exclusion using pthreads
+
+// Set type of mutex to use based on what sort of system we're using.
+// GNU systems define a "fast" mutex that is non-portable (i.e., non-standard) that we'd like to use if we can
+#ifdef __USE_GNU
 #ifdef PS_MUTEX_CAREFUL
+
+// These bells and whistles are only defined if PS_MUTEX_CAREFUL and __USE_GNU are both defined
+#define PS_MUTEX_TYPE PTHREAD_MUTEX_ERRORCHECK_NP // Error-checking mutex
+#define PS_MUTEX_TRACE(LEVEL, STRING, PTR) psTrace("psLib.sys.mutex", LEVEL, STRING, #PTR); // Trace message
+#define PS_MUTEX_TRACE_THREAD(LEVEL, STRING, PTR) \ // Trace message with thread and pointer
+    psTrace("psLib.sys.mutex", LEVEL, STRING, (void*)pthread_self(), #PTR);
+#define PS_MUTEX_CHECK_DEADLOCK() \     // Check for dead-locked mutex
+    if (pml == EDEADLK) { \
+        psAbort("Deadlocked mutex on %s", #PTR); \
+    }
+#define PS_MUTEX_CHECK_STOLEN(PTR) \       // Check for stolen mutex
+    if (pmu == EPERM) { \
+        psAbort("Unlocking stolen mutex on %s", #PTR); \
+    }
+
+#else  // PS_MUTEX_CAREFUL
+
+#define PS_MUTEX_TYPE PTHREAD_MUTEX_FAST_NP // Fast mutex
+#define PS_MUTEX_TRACE(LEVEL, STRING, PTR) // No action
+#define PS_MUTEX_TRACE_THREAD(LEVEL, STRING, PTR) // No action
+#define PS_MUTEX_CHECK_DEADLOCK(PTR)    // No action
+#define PS_MUTEX_CHECK_STOLEN(PTR)      // No action
+
+#endif // PS_MUTEX_CAREFUL
+#else  // __USE_GNU
+
+#define PS_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT // Default mutex type: portable
+#define PS_MUTEX_TRACE(LEVEL, STRING, PTR) // No action
+#define PS_MUTEX_TRACE_THREAD(LEVEL, STRING, PTR) // No action
+#define PS_MUTEX_CHECK_DEADLOCK(PTR)    // No action
+#define PS_MUTEX_CHECK_STOLEN(PTR)      // No action
+
+#endif
+
 
 /// Initialize a mutex
 #define psMutexInit(PTR) { \
     psAssert(PTR, "Require non-NULL pointer to initialise mutex"); \
-    psTrace("psLib.sys.mutex", 3, "Initialising mutex on %s...", #PTR); \
+    PS_MUTEX_TRACE(3, "Initialising mutex on %s...", PTR); \
     /* Gotta go the long way, since we can't use PTHREAD_MUTEX_INITIALIZER after we declare the variable */ \
     pthread_mutexattr_t attr; /* Mutex attributes */ \
     pthread_mutexattr_init(&attr); \
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); \
+    pthread_mutexattr_settype(&attr, PS_MUTEX_TYPE); \
     pthread_mutex_init(&(PTR)->lock, &attr); \
     pthread_mutexattr_destroy(&attr); \
@@ -25,13 +65,11 @@
 #define psMutexLock(PTR) { \
     psAssert(PTR, "Require non-NULL pointer to lock mutex"); \
-    psTrace("psLib.sys.mutex", 1, "Thread %p waiting for mutex lock on %s...", (void*)pthread_self(), #PTR); \
+    PS_MUTEX_TRACE_THREAD(1, "Thread %p waiting for mutex lock on %s...", PTR); \
     int pml = pthread_mutex_lock(&(PTR)->lock); \
-    psTrace("psLib.sys.mutex", 1, "Thread %p locked mutex on %s", (void*)pthread_self(), #PTR); \
+    PS_MUTEX_TRACE_THREAD(1, "Thread %p locked mutex on %s", PTR); \
     if (pml == EINVAL) { \
         psAbort("Cannot lock mutex on %s: not initialised", #PTR); \
     } \
-    if (pml == EDEADLK) { \
-        psAbort("Deadlocked mutex on %s", #PTR); \
-    } \
+    PS_MUTEX_CHECK_DEADLOCK(PTR); \
 }
 
@@ -39,44 +77,11 @@
 #define psMutexUnlock(PTR) { \
     psAssert(PTR, "Require non-NULL pointer to unlock mutex"); \
-    psTrace("psLib.sys.mutex", 1, "Thread %p unlocking mutex on %s", (void*)pthread_self(), #PTR); \
+    PS_MUTEX_TRACE_THREAD(1, "Thread %p unlocking mutex on %s", PTR); \
     int pmu = pthread_mutex_unlock(&(PTR)->lock); \
     if (pmu == EINVAL) { \
         psAbort("Cannot unlock mutex on %s: not initialised", #PTR); \
     } \
-    if (pmu == EPERM) { \
-        psAbort("Unlocking stolen mutex on %s", #PTR); \
-    } \
+    PS_MUTEX_CHECK_STOLEN(PTR); \
 }
-
-#else  // PS_MUTEX_CAREFUL
-
-/// Initialize a mutex
-#define psMutexInit(PTR) { \
-    psAssert(PTR, "Require non-NULL pointer to initialise mutex"); \
-    /* Gotta go the long way, since we can't use PTHREAD_MUTEX_INITIALIZER after we declare the variable */ \
-    pthread_mutexattr_t attr; /* Mutex attributes */ \
-    pthread_mutexattr_init(&attr); \
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); \
-    pthread_mutex_init(&(PTR)->lock, &attr); \
-    pthread_mutexattr_destroy(&attr); \
-}
-
-/// Lock a mutex
-#define psMutexLock(PTR) { \
-    psAssert(PTR, "Require non-NULL pointer to lock mutex"); \
-    if (pthread_mutex_lock(&(PTR)->lock) == EINVAL) { \
-        psAbort("Cannot lock mutex on %s: not initialised", #PTR); \
-    } \
-}
-
-/// Unlock a mutex
-#define psMutexUnlock(PTR) { \
-    psAssert(PTR, "Require non-NULL pointer to unlock mutex"); \
-    if (pthread_mutex_unlock(&(PTR)->lock) == EINVAL) { \
-        psAbort("Cannot unlock mutex on %s: not initialised", #PTR); \
-    } \
-}
-
-#endif // PS_MUTEX_CAREFUL
 
 /// Destroy a mutex