Use error-checking mutexes on all platforms when DEBUG is on

[ghc-hetmet.git] / rts / posix / OSThreads.c

diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index 79d395f..ee4958a 100644 (file)
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -94,7 +94,7 @@ osThreadId()
 }
 
 rtsBool
-osThreadIsAlive(OSThreadId id)
+osThreadIsAlive(OSThreadId id STG_UNUSED)
 {
     // no good way to implement this on POSIX, AFAICT.  Returning true
     // is safe.
@@ -104,10 +104,14 @@ osThreadIsAlive(OSThreadId id)
 void
 initMutex(Mutex* pMut)
 {
-#if defined(DEBUG) && defined(linux_HOST_OS)
+#if defined(DEBUG)
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
+#if defined(linux_HOST_OS)
     pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_ERRORCHECK_NP);
+#else
+    pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_ERRORCHECK);
+#endif
     pthread_mutex_init(pMut,&attr);
 #else
     pthread_mutex_init(pMut,NULL);
@@ -148,6 +152,15 @@ setThreadLocalVar (ThreadLocalKey *key, void *value)
     }
 }
 
+void
+freeThreadLocalKey (ThreadLocalKey *key)
+{
+    int r;
+    if ((r = pthread_key_delete(*key)) != 0) {
+       barf("freeThreadLocalKey: %s", strerror(r));
+    }
+}
+
 static void *
 forkOS_createThreadWrapper ( void * entry )
 {