X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Flock.h;h=f46f93d89f7c8da8fba069cb8f4e49058e8e4fef;hb=0363b5435847e66678cd3fa0d8a94e30b9a91663;hp=065ceded55ab5b71706ed22546db97fbb31219e9;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86;p=stockfish
diff --git a/src/lock.h b/src/lock.h
index 065ceded..f46f93d8 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -1,18 +1,18 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -22,63 +22,13 @@
#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;
-# 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)
@@ -86,11 +36,12 @@ typedef pthread_mutex_t Lock;
#else
-
-# include
+#define WIN32_LEAN_AND_MEAN
+#include
+#undef WIN32_LEAN_AND_MEAN
typedef CRITICAL_SECTION Lock;
-# define lock_init(x, y) InitializeCriticalSection(x)
+# define lock_init(x) InitializeCriticalSection(x)
# define lock_grab(x) EnterCriticalSection(x)
# define lock_release(x) LeaveCriticalSection(x)
# define lock_destroy(x) DeleteCriticalSection(x)
@@ -98,5 +49,4 @@ typedef CRITICAL_SECTION Lock;
#endif
-
#endif // !defined(LOCK_H_INCLUDED)