X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Flock.h;h=7f74fcf739033caf29ea40d4e26a8f962d1554f1;hp=334bc7c9b3fe6321f907067e80d938b9cd7c511f;hb=0026c88b3ab184b45532498d407859b71d929783;hpb=f826923f8ecfb90ff6f95d89f89c0f75a2360726
diff --git a/src/lock.h b/src/lock.h
index 334bc7c9..7f74fcf7 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,13 +35,19 @@ 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
+// We use critical sections on Windows to support Windows XP and older versions,
+// unfortunatly cond_wait() is racy between lock_release() and WaitForSingleObject()
+// but apart from this they have the same speed performance of SRW locks.
typedef CRITICAL_SECTION Lock;
typedef HANDLE WaitCondition;
@@ -55,6 +59,8 @@ typedef HANDLE WaitCondition;
# 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_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(*x,z); lock_grab(y); }
+
#endif
#endif // !defined(LOCK_H_INCLUDED)