kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

Retire THREAD_SLEEPING and use THREAD_AVAILABLE instead

Browse source 
This is a prerequisite for future work and anyhow removes
a state flag, so it is good anyhow.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-10-17 08:57:20 +01:00
parent 9440fb06da
commit 13d8231746
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/search.cpp
View file

@ -2224,11 +2224,16 @@ split_point_start: // At split points actual search starts from here
// If we are not thinking, wait for a condition to be signaled // If we are not thinking, wait for a condition to be signaled
// instead of wasting CPU time polling for work. // instead of wasting CPU time polling for work.
while (threadID >= ActiveThreads) while ( threadID >= ActiveThreads
|| threads[threadID].state == THREAD_INITIALIZING)
{ {
assert(!sp); assert(!sp);
assert(threadID != 0); assert(threadID != 0);
threads[threadID].state = THREAD_SLEEPING;
if (AllThreadsShouldExit)
break;
threads[threadID].state = THREAD_AVAILABLE;
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
lock_grab(&WaitLock); lock_grab(&WaitLock);
@ -2240,10 +2245,6 @@ split_point_start: // At split points actual search starts from here
#endif #endif
} }
// If thread has just woken up, mark it as available
if (threads[threadID].state == THREAD_SLEEPING)
threads[threadID].state = THREAD_AVAILABLE;
// If this thread has been assigned work, launch a search // If this thread has been assigned work, launch a search
if (threads[threadID].state == THREAD_WORKISWAITING) if (threads[threadID].state == THREAD_WORKISWAITING)
{ {
@ -2318,13 +2319,13 @@ split_point_start: // At split points actual search starts from here
// Will be set just before program exits to properly end the threads // Will be set just before program exits to properly end the threads
AllThreadsShouldExit = false; AllThreadsShouldExit = false;
// Threads will be put to sleep as soon as created // Threads will be put all threads to sleep as soon as created
ActiveThreads = 1; ActiveThreads = 1;
// All threads except the main thread should be initialized to THREAD_AVAILABLE // All threads except the main thread should be initialized to THREAD_INITIALIZING
threads[0].state = THREAD_SEARCHING; threads[0].state = THREAD_SEARCHING;
for (i = 1; i < MAX_THREADS; i++) for (i = 1; i < MAX_THREADS; i++)
threads[i].state = THREAD_AVAILABLE; threads[i].state = THREAD_INITIALIZING;
// Launch the helper threads // Launch the helper threads
for (i = 1; i < MAX_THREADS; i++) for (i = 1; i < MAX_THREADS; i++)
@ -2344,7 +2345,7 @@ split_point_start: // At split points actual search starts from here
} }
// Wait until the thread has finished launching and is gone to sleep // Wait until the thread has finished launching and is gone to sleep
while (threads[i].state != THREAD_SLEEPING) {} while (threads[i].state == THREAD_INITIALIZING) {}
} }
} }
@ -2355,7 +2356,6 @@ split_point_start: // At split points actual search starts from here
void ThreadsManager::exit_threads() { void ThreadsManager::exit_threads() {
AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop() AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop()
ActiveThreads = MAX_THREADS; // Avoid any woken up thread comes back to sleep
// Wake up all the threads and waits for termination // Wake up all the threads and waits for termination
for (int i = 1; i < MAX_THREADS; i++) for (int i = 1; i < MAX_THREADS; i++)
@ -2563,7 +2563,7 @@ split_point_start: // At split points actual search starts from here
void ThreadsManager::wake_sleeping_thread(int threadID) { void ThreadsManager::wake_sleeping_thread(int threadID) {
assert(threadID > 0); assert(threadID > 0);
assert(threads[threadID].state == THREAD_SLEEPING); assert(threads[threadID].state == THREAD_AVAILABLE);
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
pthread_mutex_lock(&WaitLock); pthread_mutex_lock(&WaitLock);

4
src/thread.h
View file

@ -75,9 +75,9 @@ struct SplitPoint {
enum ThreadState enum ThreadState
{ {
THREAD_INITIALIZING, // thread is initializing itself
THREAD_SEARCHING, // thread is performing work THREAD_SEARCHING, // thread is performing work
THREAD_AVAILABLE, // thread is polling for work THREAD_AVAILABLE, // thread is waiting for work
THREAD_SLEEPING, // we are not thinking, so thread is sleeping
THREAD_BOOKED, // other thread (master) has booked us as a slave THREAD_BOOKED, // other thread (master) has booked us as a slave
THREAD_WORKISWAITING, // master has ordered us to start THREAD_WORKISWAITING, // master has ordered us to start
THREAD_TERMINATED // we are quitting and thread is terminated THREAD_TERMINATED // we are quitting and thread is terminated