Make an error message a little more intelligible.

[oota-llvm.git] / lib / System / Mutex.cpp

diff --git a/lib/System/Mutex.cpp b/lib/System/Mutex.cpp
index 4ec5af302f935fd47c09b8235e640f1e83416d3d..44e3332d1791477464cd8f28071b87c01ed2ab3b 100644 (file)
--- a/lib/System/Mutex.cpp
+++ b/lib/System/Mutex.cpp
@@ -11,34 +11,48 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/System/Mutex.h"
 #include "llvm/Config/config.h"
+#include "llvm/System/Mutex.h"
+#include "llvm/System/IncludeFile.h"
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only TRULY operating system
 //===          independent code.
 //===----------------------------------------------------------------------===//
 
-#if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_MUTEX_LOCK)
-
+#if !defined(ENABLE_THREADS) || ENABLE_THREADS == 0
+// Define all methods as no-ops if threading is explicitly disabled
 namespace llvm {
 using namespace sys;
+Mutex::Mutex( bool recursive) { }
+Mutex::~Mutex() { }
+bool Mutex::acquire() { return true; }
+bool Mutex::release() { return true; }
+bool Mutex::tryacquire() { return true; }
+}
+#else
+
+#if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_MUTEX_LOCK)
 
 #include <cassert>
 #include <pthread.h>
 #include <stdlib.h>
 
+namespace llvm {
+using namespace sys;
+
+
 // This variable is useful for situations where the pthread library has been
-// compiled with weak linkage for its interface symbols. This allows the 
+// compiled with weak linkage for its interface symbols. This allows the
 // threading support to be turned off by simply not linking against -lpthread.
-// In that situation, the value of pthread_mutex_init will be 0 and 
+// In that situation, the value of pthread_mutex_init will be 0 and
 // consequently pthread_enabled will be false. In such situations, all the
 // pthread operations become no-ops and the functions all return false. If
 // pthread_mutex_init does have an address, then mutex support is enabled.
 // Note: all LLVM tools will link against -lpthread if its available since it
 //       is configured into the LIBS variable.
 // Note: this line of code generates a warning if pthread_mutex_init is not
-//       declared with weak linkage. Its safe to ignore the warning.
+//       declared with weak linkage. It's safe to ignore the warning.
 static const bool pthread_enabled = static_cast<bool>(pthread_mutex_init);
 
 // Construct a Mutex using pthread calls
@@ -48,7 +62,7 @@ Mutex::Mutex( bool recursive)
   if (pthread_enabled)
   {
     // Declare the pthread_mutex data structures
-    pthread_mutex_t* mutex = 
+    pthread_mutex_t* mutex =
       static_cast<pthread_mutex_t*>(malloc(sizeof(pthread_mutex_t)));
     pthread_mutexattr_t attr;
 
@@ -62,8 +76,10 @@ Mutex::Mutex( bool recursive)
     errorcode = pthread_mutexattr_settype(&attr, kind);
     assert(errorcode == 0);
 
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
     // Make it a process local mutex
     errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
+#endif
 
     // Initialize the mutex
     errorcode = pthread_mutex_init(mutex, &attr);
@@ -90,10 +106,10 @@ Mutex::~Mutex()
   }
 }
 
-bool 
+bool
 Mutex::acquire()
 {
-  if (pthread_enabled) 
+  if (pthread_enabled)
   {
     pthread_mutex_t* mutex = reinterpret_cast<pthread_mutex_t*>(data_);
     assert(mutex != 0);
@@ -104,7 +120,7 @@ Mutex::acquire()
   return false;
 }
 
-bool 
+bool
 Mutex::release()
 {
   if (pthread_enabled)
@@ -118,7 +134,7 @@ Mutex::release()
   return false;
 }
 
-bool 
+bool
 Mutex::tryacquire()
 {
   if (pthread_enabled)
@@ -141,3 +157,6 @@ Mutex::tryacquire()
 #else
 #warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/Mutex.cpp
 #endif
+#endif
+
+DEFINING_FILE_FOR(SystemMutex)