Don't use SRWLOCK and Condition Variables under Windows
authorMarco Costalba <mcostalba@gmail.com>
Sat, 1 Jan 2011 14:49:26 +0000 (15:49 +0100)
committerMarco Costalba <mcostalba@gmail.com>
Sat, 1 Jan 2011 15:07:32 +0000 (16:07 +0100)
They are not compatible with Windows XP

Revert to old CRITICAL_SECTION locks and events.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
src/lock.h

index 489a5663ab123071d5bb468d1301a620a33f3a5f..334bc7c9b3fe6321f907067e80d938b9cd7c511f 100644 (file)
@@ -33,10 +33,10 @@ typedef pthread_cond_t WaitCondition;
 #  define lock_grab(x) pthread_mutex_lock(x)
 #  define lock_release(x) pthread_mutex_unlock(x)
 #  define lock_destroy(x) pthread_mutex_destroy(x)
-#  define cond_destroy(x) pthread_cond_destroy(x);
-#  define cond_init(x) pthread_cond_init(x, NULL);
-#  define cond_signal(x) pthread_cond_signal(x);
-#  define cond_wait(x,y) pthread_cond_wait(x,y);
+#  define cond_destroy(x) pthread_cond_destroy(x)
+#  define cond_init(x) pthread_cond_init(x, NULL)
+#  define cond_signal(x) pthread_cond_signal(x)
+#  define cond_wait(x,y) pthread_cond_wait(x,y)
 
 #else
 
@@ -44,18 +44,17 @@ typedef pthread_cond_t WaitCondition;
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 
-typedef SRWLOCK Lock;
-typedef CONDITION_VARIABLE WaitCondition;
-
-#  define lock_init(x) InitializeSRWLock(x)
-#  define lock_grab(x) AcquireSRWLockExclusive(x)
-#  define lock_release(x) ReleaseSRWLockExclusive(x)
-#  define lock_destroy(x) (x)
-#  define cond_destroy(x) (x);
-#  define cond_init(x) InitializeConditionVariable(x);
-#  define cond_signal(x) WakeConditionVariable(x);
-#  define cond_wait(x,y) SleepConditionVariableSRW(x, y, INFINITE,0);
-
+typedef CRITICAL_SECTION Lock;
+typedef HANDLE WaitCondition;
+
+#  define lock_init(x) InitializeCriticalSection(x)
+#  define lock_grab(x) EnterCriticalSection(x)
+#  define lock_release(x) LeaveCriticalSection(x)
+#  define lock_destroy(x) DeleteCriticalSection(x)
+#  define cond_init(x) { *x = CreateEvent(0, FALSE, FALSE, 0); }
+#  define cond_destroy(x) CloseHandle(*x)
+#  define cond_signal(x) SetEvent(*x)
+#  define cond_wait(x,y) { lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
 #endif
 
 #endif // !defined(LOCK_H_INCLUDED)