X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flock.h;h=7f74fcf739033caf29ea40d4e26a8f962d1554f1;hb=007613cb5e665c19368ab0cc2ad8bc45e3c16ad4;hp=9bf59afadc8a8d4fc2949850fdcf6a32c1cbb1f8;hpb=5973e0985425c90c72b98d75f3ccbd1c1bb3d446;p=stockfish
diff --git a/src/lock.h b/src/lock.h
index 9bf59afa..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,32 +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
-// 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)
-
-// Fallback solution to build for Windows XP and older versions, note that
-// cond_wait() is racy between lock_release() and WaitForSingleObject().
-#else
-
+// 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;
@@ -74,7 +59,7 @@ 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); }
-#endif
+# define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(*x,z); lock_grab(y); }
#endif