Thread threads[MAX_THREADS];
SplitPoint SplitPointStack[MAX_THREADS][ACTIVE_SPLIT_POINTS_MAX];
- Lock MPLock;
+ Lock MPLock, WaitLock;
#if !defined(_MSC_VER)
pthread_cond_t WaitCond;
- pthread_mutex_t WaitLock;
#else
HANDLE SitIdleEvent[MAX_THREADS];
#endif
DWORD WINAPI init_thread(LPVOID threadID) {
TM.idle_loop(*(int*)threadID, NULL);
- return NULL;
+ return 0;
}
#endif
threads[threadID].state = THREAD_SLEEPING;
#if !defined(_MSC_VER)
- pthread_mutex_lock(&WaitLock);
+ lock_grab(&WaitLock);
if (AllThreadsShouldSleep || threadID >= ActiveThreads)
pthread_cond_wait(&WaitCond, &WaitLock);
- pthread_mutex_unlock(&WaitLock);
+ lock_release(&WaitLock);
#else
WaitForSingleObject(SitIdleEvent[threadID], INFINITE);
#endif
// Initialize global locks
lock_init(&MPLock, NULL);
+ lock_init(&WaitLock, NULL);
+
+#if !defined(_MSC_VER)
+ pthread_cond_init(&WaitCond, NULL);
+#else
+ for (i = 0; i < MAX_THREADS; i++)
+ SitIdleEvent[i] = CreateEvent(0, FALSE, FALSE, 0);
+#endif
// Initialize SplitPointStack locks
for (i = 0; i < MAX_THREADS; i++)
lock_init(&(SplitPointStack[i][j].lock), NULL);
}
-#if !defined(_MSC_VER)
- pthread_mutex_init(&WaitLock, NULL);
- pthread_cond_init(&WaitCond, NULL);
-#else
- for (i = 0; i < MAX_THREADS; i++)
- SitIdleEvent[i] = CreateEvent(0, FALSE, FALSE, 0);
-#endif
-
// Will be set just before program exits to properly end the threads
AllThreadsShouldExit = false;
#if !defined(_MSC_VER)
ok = (pthread_create(pthread, NULL, init_thread, (void*)(&i)) == 0);
#else
- DWORD iID[1];
- ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&i), 0, iID) != NULL);
+ ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&i), 0, NULL) != NULL);
#endif
if (!ok)
for (int i = 0; i < MAX_THREADS; i++)
for (int j = 0; j < ACTIVE_SPLIT_POINTS_MAX; j++)
lock_destroy(&(SplitPointStack[i][j].lock));
+
+ lock_destroy(&WaitLock);
+ lock_destroy(&MPLock);
}