Changeset 1744

Timestamp:

08/11/11 11:45:43 (7 months ago)

Author:

Freddie Akeroyd

Message:

Add pthread locking for Linux. Refs #300

File:

• trunk/src/napi.c (modified) (3 diffs)

trunk/src/napi.c

@@ -34 +34 @@
 #include <stdarg.h>
 #include <stdint.h>
+
+#include "nxconfig.h"
 #include "napi.h"
 #include "nxstack.h"
@@ -58 +60 @@
 #include "nx_stptok.h"
 
-#ifdef _WIN32
+#if defined(_WIN32)
 /*
  *  HDF5 on windows does not do locking for multiple threads conveniently so we will implement it ourselves.
@@ -88 +90 @@
     ( nxilock() , nxiunlock(__call) )
 
+#elif HAVE_LIBPTHREAD
+
+#include <pthread.h>
+
+static pthread_mutex_t nx_mutex;
+
+static void nx_pthread_init()
+{
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+    pthread_mutex_init(&nx_mutex, &attr);
+}
+
+static int nxilock()
+{
+    static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+    if (pthread_once(&once_control, nx_pthread_init) != 0)
+    {
+        NXReportError("pthread_once failed");
+        return NX_ERROR;
+    }
+    if (pthread_mutex_lock(&nx_mutex) != 0)
+    {
+        NXReportError("pthread_mutex_lock failed");
+        return NX_ERROR;
+    }
+    return NX_OK;
+}
+
+static int nxiunlock(int ret)
+{
+    if (pthread_mutex_unlock(&nx_mutex) != 0)
+    {
+        NXReportError("pthread_mutex_unlock failed");
+        return NX_ERROR;
+    }
+    return ret;
+}
+
+#define LOCKED_CALL(__call) \
+    ( nxilock() , nxiunlock(__call) )
+
 #else
 
 #define LOCKED_CALL(__call) \
-        __call
+           __call
 
 #endif /* _WIN32 */