X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Flock.h;h=0af1443d740f47a81532da075916955e58d4bd64;hp=334bc7c9b3fe6321f907067e80d938b9cd7c511f;hb=9db9e4f7d39a3bb189fc8f2b6713826c01ae9ba1;hpb=f826923f8ecfb90ff6f95d89f89c0f75a2360726
diff --git a/src/lock.h b/src/lock.h
index 334bc7c9..0af1443d 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,11 +17,9 @@
along with this program. If not, see .
*/
-
#if !defined(LOCK_H_INCLUDED)
#define LOCK_H_INCLUDED
-
#if !defined(_MSC_VER)
# include
@@ -37,12 +35,35 @@ typedef pthread_cond_t WaitCondition;
# 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_timedwait(x,y,z) pthread_cond_timedwait(x,y,z)
#else
+#define NOMINMAX // disable macros min() and max()
#define WIN32_LEAN_AND_MEAN
#include
#undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
+
+// Default fast and race free locks and condition variables
+#if !defined(OLD_LOCKS)
+
+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)
+# define cond_timedwait(x,y,z) SleepConditionVariableSRW(x,y,z,0)
+
+// Fallback solution to build for Windows XP and older versions, note that
+// cond_wait() is racy between lock_release() and WaitForSingleObject().
+#else
typedef CRITICAL_SECTION Lock;
typedef HANDLE WaitCondition;
@@ -54,7 +75,11 @@ typedef HANDLE WaitCondition;
# 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); }
+# define cond_wait(x,y) { ResetEvent(*x); lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
+# define cond_timedwait(x,y,z) { ResetEvent(*x); lock_release(y); WaitForSingleObject(*x,z); lock_grab(y); }
+
+#endif
+
#endif
#endif // !defined(LOCK_H_INCLUDED)