# 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
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
-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 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);
#endif
// If we are not thinking, wait for a condition to be signaled
// instead of wasting CPU time polling for work.
- while ( threadID >= ActiveThreads
- || threads[threadID].state == THREAD_INITIALIZING)
+ while (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING)
{
assert(!sp);
assert(threadID != 0);
threads[threadID].state = THREAD_AVAILABLE;
-#if !defined(_MSC_VER)
lock_grab(&WaitLock);
- if (threadID >= ActiveThreads)
- pthread_cond_wait(&WaitCond[threadID], &WaitLock);
+
+ if (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING)
+ cond_wait(&WaitCond[threadID], &WaitLock);
+
lock_release(&WaitLock);
-#else
- WaitForSingleObject(WaitCond[threadID], INFINITE);
-#endif
}
// If this thread has been assigned work, launch a search
lock_init(&WaitLock);
for (i = 0; i < MAX_THREADS; i++)
-#if !defined(_MSC_VER)
- pthread_cond_init(&WaitCond[i], NULL);
-#else
- WaitCond[i] = CreateEvent(0, FALSE, FALSE, 0);
-#endif
+ cond_init(&WaitCond[i]);
// Initialize splitPoints[] locks
for (i = 0; i < MAX_THREADS; i++)