ecere: Initial Emscripten support

[sdk] / ecere / src / sys / Mutex.ec

diff --git a/ecere/src/sys/Mutex.ec b/ecere/src/sys/Mutex.ec
index f0a3d05..84f167e 100644 (file)
--- a/ecere/src/sys/Mutex.ec
+++ b/ecere/src/sys/Mutex.ec
@@ -1,7 +1,21 @@
+#define _Noreturn
+
+#if defined(__ANDROID__)
+#include <android/log.h>
+
+#define printf(...)  ((void)__android_log_print(ANDROID_LOG_VERBOSE, "ecere-app", __VA_ARGS__))
+#endif
+
 namespace sys;
 
+#undef _GNU_SOURCE
+#undef __USE_UNIX98
+#define _GNU_SOURCE
+#define __USE_UNIX98
 // Platform includes
 #define uint _uint
+#define set _set
+#define String _String
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -9,15 +23,25 @@ namespace sys;
 #include <pthread.h>
 #endif
 #undef uint
+#undef set
+#undef String
 
 import "instance"
 
-#ifdef _DEBUG
-int GetCurrentThreadID();
+// Moved this here from Thread.ec to make compiling ecereCOM in Debug easier
+public int64 GetCurrentThreadID()
+{
+#if defined(__WIN32__)
+   return (int64)GetCurrentThreadId();
+#else
+   return (int64)pthread_self();
 #endif
+}
 
 public class Mutex : struct
 {
+#if !defined(__EMSCRIPTEN__)
+
 //   class_fixed
 #if defined(__WIN32__)
 #ifdef _DEBUG
@@ -28,14 +52,16 @@ public class Mutex : struct
 #else
    pthread_mutex_t mutex;
 #endif
+#endif
 
 #ifdef _DEBUG
-   int owningThread;
+   int64 owningThread;
 #endif
    int lockCount;
 
    Mutex()
    {
+#if !defined(__EMSCRIPTEN__)
 #if defined(__WIN32__)
 #ifdef _DEBUG
       mutex = CreateMutex(null, FALSE, null);
@@ -46,7 +72,8 @@ public class Mutex : struct
       pthread_mutexattr_t attr;
       pthread_mutexattr_init(&attr);
 
-#ifdef __linux__
+      // settype is available on Linux now, and hopefully _GNU_SOURCE should ensure it is
+#if 0 // def __linux__
       pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
 #else
       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -55,6 +82,8 @@ public class Mutex : struct
       pthread_mutex_init(&mutex, &attr);
       pthread_mutexattr_destroy(&attr);
 #endif
+#endif
+
       lockCount = 0;
 #ifdef _DEBUG
       owningThread = 0;
@@ -64,6 +93,7 @@ public class Mutex : struct
 
    ~Mutex()
    {
+#if !defined(__EMSCRIPTEN__)
 #if defined(__WIN32__)
 #ifdef _DEBUG
       CloseHandle(mutex);
@@ -73,6 +103,7 @@ public class Mutex : struct
 #else
       pthread_mutex_destroy(&mutex);
 #endif
+#endif
    }
 
 public:
@@ -80,9 +111,10 @@ public:
    {
       if(this)
       {
+#if !defined(__EMSCRIPTEN__)
          /*
          if(this == globalSystem.fileMonitorMutex)
-            printf("[%d] Waiting on Mutex %x\n", GetCurrentThreadID(), this);
+            printf("[%d] Waiting on Mutex %x\n", (int)GetCurrentThreadID(), this);
          */
 #if defined(__WIN32__)
 #ifdef _DEBUG
@@ -92,8 +124,19 @@ public:
          EnterCriticalSection(&mutex);
 #endif
 #else
+#ifdef _DEBUG
+         {
+            int e;
+            e = pthread_mutex_lock(&mutex);
+            if(e)
+               PrintLn("pthread_mutex_lock returned ", e);
+         }
+#else
          pthread_mutex_lock(&mutex);
 #endif
+#endif
+
+#endif
 
 #ifdef _DEBUG
          owningThread = GetCurrentThreadID();
@@ -106,10 +149,15 @@ public:
    {
       if(this)
       {
+#if !defined(__EMSCRIPTEN__)
          /*
          if(this == globalSystem.fileMonitorMutex)
-            printf("[%d] Releasing Mutex %x\n", GetCurrentThreadID(), this);
+            printf("[%d] Releasing Mutex %x\n", (int)GetCurrentThreadID(), this);
          */
+#ifdef _DEBUG
+         if(lockCount && owningThread != GetCurrentThreadID())
+            PrintLn("WARNING: Not in owning thread!!");
+#endif
 
          if(!--lockCount)
 #ifdef _DEBUG
@@ -124,8 +172,25 @@ public:
          LeaveCriticalSection(&mutex);
 #endif
 #else
+#ifdef _DEBUG
+         {
+            int e;
+            e = pthread_mutex_unlock(&mutex);
+            if(e)
+               PrintLn("pthread_mutex_unlock returned ", e);
+         }
+#else
          pthread_mutex_unlock(&mutex);
 #endif
+#endif
+#endif
+
+#ifdef _DEBUG
+         if(lockCount < 0)
+            PrintLn("WARNING: lockCount < 0");
+#endif
       }
    }
+
+   property int lockCount { get { return lockCount; } }
 };