X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Flock.h;fp=src%2Flock.h;h=334bc7c9b3fe6321f907067e80d938b9cd7c511f;hp=489a5663ab123071d5bb468d1301a620a33f3a5f;hb=f826923f8ecfb90ff6f95d89f89c0f75a2360726;hpb=3201a434603b0cd6707391c9026f31a519d46dc0 diff --git a/src/lock.h b/src/lock.h index 489a5663..334bc7c9 100644 --- a/src/lock.h +++ b/src/lock.h @@ -33,10 +33,10 @@ typedef pthread_cond_t WaitCondition; # 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_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 @@ -44,18 +44,17 @@ typedef pthread_cond_t WaitCondition; #include #undef WIN32_LEAN_AND_MEAN -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); - +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_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 // !defined(LOCK_H_INCLUDED)