X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flock.h;h=939b7da0ad544052b104ce04d0c1b13a92c02469;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hp=cd4dfa702c87756c2cb1d11fde5a99b859163057;hpb=d3c4618b3ac0e444ce3b9dd894b87f86a50863c5;p=stockfish
diff --git a/src/lock.h b/src/lock.h
index cd4dfa70..939b7da0 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-2009 Marco Costalba
+ Copyright (C) 2008-2010 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,86 +17,63 @@
along with this program. If not, see .
*/
-
#if !defined(LOCK_H_INCLUDED)
#define LOCK_H_INCLUDED
-
-// x86 assembly language locks or OS spin locks may perform faster than
-// mutex locks on some platforms. On my machine, mutexes seem to be the
-// best.
-
-//#define ASM_LOCK
-//#define OS_SPIN_LOCK
-
-
-#if defined(ASM_LOCK)
-
-
-typedef volatile int Lock;
-
-static inline void LockX86(Lock *lock) {
- int dummy;
- asm __volatile__("1: movl $1, %0" "\n\t"
- " xchgl (%1), %0" "\n\t" " testl %0, %0" "\n\t"
- " jz 3f" "\n\t" "2: pause" "\n\t"
- " movl (%1), %0" "\n\t" " testl %0, %0" "\n\t"
- " jnz 2b" "\n\t" " jmp 1b" "\n\t" "3:"
- "\n\t":"=&q"(dummy)
- :"q"(lock)
- :"cc");
-}
-
-static inline void UnlockX86(Lock *lock) {
- int dummy;
- asm __volatile__("movl $0, (%1)":"=&q"(dummy)
- :"q"(lock));
-}
-
-# define lock_init(x, y) (*(x) = 0)
-# define lock_grab(x) LockX86(x)
-# define lock_release(x) UnlockX86(x)
-# define lock_destroy(x)
-
-
-#elif defined(OS_SPIN_LOCK)
-
-
-# include
-
-typedef OSSpinLock Lock;
-
-# define lock_init(x, y) (*(x) = 0)
-# define lock_grab(x) OSSpinLockLock(x)
-# define lock_release(x) OSSpinLockUnlock(x)
-# define lock_destroy(x)
-
-
-#elif !defined(_MSC_VER)
+#if !defined(_MSC_VER)
# include
typedef pthread_mutex_t Lock;
+typedef pthread_cond_t WaitCondition;
-# define lock_init(x, y) pthread_mutex_init(x, y)
+# define lock_init(x) pthread_mutex_init(x, NULL)
# 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)
#else
-
+#define WIN32_LEAN_AND_MEAN
#include
+#undef WIN32_LEAN_AND_MEAN
+
+// 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
typedef CRITICAL_SECTION Lock;
-# define lock_init(x, y) InitializeCriticalSection(x)
+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
#endif // !defined(LOCK_H_INCLUDED)