Revert "xrCore: now Event and Lock common for all platform" due possi…

…ble performance issues

This reverts commit 7eafbf4.

src/xrCore/Threading/Event.cpp

@@ -1,61 +1,82 @@
 #include "stdafx.h"
 #include "Event.hpp"
+#if defined(WINDOWS)
 
+Event::Event() noexcept { handle = (void*)CreateEvent(NULL, FALSE, FALSE, NULL); }
+Event::~Event() noexcept { CloseHandle(handle); }
+void Event::Reset() noexcept { ResetEvent(handle); }
+void Event::Set() noexcept { SetEvent(handle); }
+void Event::Wait() noexcept { WaitForSingleObject(handle, INFINITE); }
+bool Event::Wait(u32 millisecondsTimeout) noexcept
+{
+    return WaitForSingleObject(handle, millisecondsTimeout) != WAIT_TIMEOUT;
+}
+#elif defined(LINUX)
+#include <pthread.h>
 Event::Event() noexcept
 {
-    signaled = false;
-    mutex = SDL_CreateMutex();
-    cond = SDL_CreateCond();
+    m_id.signaled = false;
+    pthread_mutex_init(&m_id.mutex, nullptr);
+    pthread_cond_init(&m_id.cond, nullptr);
 }
 Event::~Event() noexcept
 {
-    SDL_DestroyMutex(mutex);
-    SDL_DestroyCond(cond);
+    pthread_mutex_destroy(&m_id.mutex);
+    pthread_cond_destroy(&m_id.cond);
 }
 void Event::Reset() noexcept
 {
-    SDL_LockMutex(mutex);
-    SDL_CondSignal(cond);
-    signaled = false;
-    SDL_UnlockMutex(mutex);
+    pthread_mutex_lock(&m_id.mutex);
+    pthread_cond_signal(&m_id.cond);
+    m_id.signaled = false;
+    pthread_mutex_unlock(&m_id.mutex);
 }
 void Event::Set() noexcept
 {
-    SDL_LockMutex(mutex);
-    SDL_CondSignal(cond);
-    signaled = true;
-    SDL_UnlockMutex(mutex);
+    pthread_mutex_lock(&m_id.mutex);
+    pthread_cond_signal(&m_id.cond);
+    m_id.signaled = true;
+    pthread_mutex_unlock(&m_id.mutex);
 }
 void Event::Wait() noexcept
 {
-    SDL_LockMutex(mutex);
+    pthread_mutex_lock(&m_id.mutex);
 
-    while (!signaled)
+    while (!m_id.signaled)
     {
-        SDL_CondWait(cond, mutex);
+        pthread_cond_wait(&m_id.cond, &m_id.mutex);
     }
-    signaled = false; // due in WaitForSingleObject() "Before returning, a wait function modifies the state of some types of synchronization"
+    m_id.signaled = false; // due in WaitForSingleObject() "Before returning, a wait function modifies the state of some types of synchronization"
 
-    SDL_UnlockMutex(mutex);
+    pthread_mutex_unlock(&m_id.mutex);
 }
 bool Event::Wait(u32 millisecondsTimeout) noexcept
 {
     bool result = false;
-    SDL_LockMutex(mutex);
+    pthread_mutex_lock(&m_id.mutex);
 
-    while(!signaled)
+    timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    ts.tv_nsec += (long) millisecondsTimeout * 1000 * 1000;
+    if(ts.tv_nsec > 1000000000)
     {
-        int res = SDL_CondWaitTimeout(cond, mutex, millisecondsTimeout);
+        ts.tv_nsec -= 1000000000;
+        ts.tv_sec += 1;
+    }
 
-        if (res == SDL_MUTEX_TIMEDOUT)
+    while(!m_id.signaled)
+    {
+        int res = pthread_cond_timedwait(&m_id.cond, &m_id.mutex, &ts);
+        if(res == ETIMEDOUT)
         {
             result = true;
             break;
         }
     }
-    signaled = false;
+    m_id.signaled = false;
 
-    SDL_UnlockMutex(mutex);
+    pthread_mutex_unlock(&m_id.mutex);
 
     return result;
 }
+#endif

src/xrCore/Threading/Event.hpp

@@ -6,11 +6,17 @@
 class XRCORE_API Event
 {
     void* handle;
+#if defined(LINUX)
+    struct EventHandle
+    {
+        pthread_mutex_t mutex;
+        pthread_cond_t cond;
+        bool signaled;
+    };
 
 private:
-    SDL_mutex* mutex;
-    SDL_cond* cond;
-    bool signaled;
+    EventHandle m_id;
+#endif
 
 public:
     Event() noexcept;

src/xrCore/Threading/Lock.cpp

@@ -4,11 +4,22 @@
 
 struct LockImpl
 {
+#ifdef WINDOWS
+    CRITICAL_SECTION cs;
+
+    LockImpl() { InitializeCriticalSection(&cs); }
+    ~LockImpl() { DeleteCriticalSection(&cs); }
+
+    ICF void Lock() { EnterCriticalSection(&cs); }
+    ICF void Unlock() { LeaveCriticalSection(&cs); }
+    ICF bool TryLock() { return !!TryEnterCriticalSection(&cs); }
+#else
     std::recursive_mutex mutex;
 
     ICF void Lock() { mutex.lock(); }
     ICF void Unlock() { mutex.unlock(); }
     ICF bool TryLock() { return mutex.try_lock(); }
+#endif
 };
 
 #ifdef CONFIG_PROFILE_LOCKS