[Utils] Split out mutex to its own file

include/occa/utils/mutex.hpp

@@ -0,0 +1,27 @@
+#ifndef OCCA_UTILS_MUTEX_HEADER
+#define OCCA_UTILS_MUTEX_HEADER
+
+#include <occa/defines.hpp>
+
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+#  include <pthread.h>
+#endif
+
+namespace occa {
+  class mutex_t {
+  public:
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+    pthread_mutex_t mutexHandle;
+#else
+    void *mutexHandle;
+#endif
+
+    mutex_t();
+    void free();
+
+    void lock();
+    void unlock();
+  };
+}
+
+#endif

src/occa/internal/utils/sys.cpp

@@ -290,7 +290,7 @@ namespace occa {
     }
 
     bool isSafeToRmrf(const std::string &filename) {
-      const std::string expFilename = io::filename(filename);
+      const std::string expFilename = io::expandFilename(filename);
       int depth = 0;
 
       strVector path = split(expFilename, '/', '\0');
@@ -330,7 +330,7 @@ namespace occa {
     }
 
     void mkpath(const std::string &dir) {
-      strVector path = split(io::filename(dir), '/', '\0');
+      strVector path = split(io::expandFilename(dir), '/', '\0');
 
       const int dirCount = (int) path.size();
       std::string sPath;
@@ -1090,48 +1090,4 @@ namespace occa {
 #endif
     }
   }
-
-  mutex::mutex() {
-#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
-    int error = pthread_mutex_init(&mutexHandle, NULL);
-#if OCCA_UNSAFE
-    ignoreResult(error);
-#endif
-
-    OCCA_ERROR("Error initializing mutex",
-               error == 0);
-#else
-    mutexHandle = CreateMutex(NULL, FALSE, NULL);
-#endif
-  }
-
-  void mutex::free() {
-#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
-    int error = pthread_mutex_destroy(&mutexHandle);
-#if OCCA_UNSAFE
-    ignoreResult(error);
-#endif
-
-    OCCA_ERROR("Error freeing mutex",
-               error == 0);
-#else
-    CloseHandle(mutexHandle);
-#endif
-  }
-
-  void mutex::lock() {
-#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
-    pthread_mutex_lock(&mutexHandle);
-#else
-    WaitForSingleObject(mutexHandle, INFINITE);
-#endif
-  }
-
-  void mutex::unlock() {
-#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
-    pthread_mutex_unlock(&mutexHandle);
-#else
-    ReleaseMutex(mutexHandle);
-#endif
-  }
 }

src/occa/internal/utils/sys.hpp

@@ -171,21 +171,6 @@ namespace occa {
     std::string prettyStackSymbol(void *frame, const char *symbol);
     //==================================
   }
-
-  class mutex {
-  public:
-#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
-    pthread_mutex_t mutexHandle;
-#else
-    void *mutexHandle;
-#endif
-
-    mutex();
-    void free();
-
-    void lock();
-    void unlock();
-  };
 }
 
 #endif

src/utils/mutex.cpp

@@ -0,0 +1,49 @@
+#include <occa/utils/mutex.hpp>
+#include <occa/utils/logging.hpp>
+
+namespace occa {
+  mutex_t::mutex_t() :
+    mutexHandle(PTHREAD_MUTEX_INITIALIZER) {
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+    int error = pthread_mutex_init(&mutexHandle, NULL);
+#if OCCA_UNSAFE
+    ignoreResult(error);
+#endif
+
+    OCCA_ERROR("Error initializing mutex",
+               error == 0);
+#else
+    mutexHandle = CreateMutex(NULL, FALSE, NULL);
+#endif
+  }
+
+  void mutex_t::free() {
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+    int error = pthread_mutex_destroy(&mutexHandle);
+#if OCCA_UNSAFE
+    ignoreResult(error);
+#endif
+
+    OCCA_ERROR("Error freeing mutex",
+               error == 0);
+#else
+    CloseHandle(mutexHandle);
+#endif
+  }
+
+  void mutex_t::lock() {
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+    pthread_mutex_lock(&mutexHandle);
+#else
+    WaitForSingleObject(mutexHandle, INFINITE);
+#endif
+  }
+
+  void mutex_t::unlock() {
+#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
+    pthread_mutex_unlock(&mutexHandle);
+#else
+    ReleaseMutex(mutexHandle);
+#endif
+  }
+}