X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Flock.h;h=1e71305ec1c7403bbcbebe538d50e6e135ddc9bc;hb=34178205fc762638e633a61ecc45360e1662bdee;hp=82726517317764f77abbf5a68020f53e043c45aa;hpb=472971f8516eb068a3e93473b4d9f5c95e6874d4;p=stockfish
diff --git a/src/lock.h b/src/lock.h
index 82726517..1e71305e 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,40 +17,58 @@
along with this program. If not, see .
*/
-
#if !defined(LOCK_H_INCLUDED)
#define LOCK_H_INCLUDED
-
-#if !defined(_MSC_VER)
+#if !defined(_WIN32) && !defined(_WIN64)
# include
typedef pthread_mutex_t Lock;
typedef pthread_cond_t WaitCondition;
-
-# 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_signal(x) pthread_cond_signal(x);
+typedef pthread_t ThreadHandle;
+
+# 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))
+# define cond_timedwait(x,y,z) pthread_cond_timedwait(&(x),&(y),z)
+# define thread_create(x,f,id) !pthread_create(&(x),NULL,f,&(id))
+# define thread_join(x) pthread_join(x, NULL)
#else
+#if !defined(NOMINMAX)
+# define NOMINMAX // disable macros min() and max()
+#endif
+
#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;
-
-# 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_destroy(x) CloseHandle(*x);
-# define cond_signal(x) SetEvent(*x);
+typedef HANDLE ThreadHandle;
+
+# 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); }
+# define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(x,z); lock_grab(y); }
+# define thread_create(x,f,id) (x = CreateThread(NULL,0,f,&(id),0,NULL), x != NULL)
+# define thread_join(x) { WaitForSingleObject(x, INFINITE); CloseHandle(x); }
#endif