X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Flock.h;h=7f74fcf739033caf29ea40d4e26a8f962d1554f1;hp=0af1443d740f47a81532da075916955e58d4bd64;hb=0026c88b3ab184b45532498d407859b71d929783;hpb=22e40c8c107500931e775ca72da74f4ac8df0620 diff --git a/src/lock.h b/src/lock.h index 0af1443d..7f74fcf7 100644 --- a/src/lock.h +++ b/src/lock.h @@ -45,26 +45,9 @@ typedef pthread_cond_t WaitCondition; #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) -# define cond_timedwait(x,y,z) SleepConditionVariableSRW(x,y,z,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; @@ -75,10 +58,8 @@ typedef HANDLE WaitCondition; # 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) { ResetEvent(*x); lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); } -# define cond_timedwait(x,y,z) { ResetEvent(*x); lock_release(y); WaitForSingleObject(*x,z); lock_grab(y); } - -#endif +# 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