X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.cpp;h=735cc97caef33aaed97c643ffadab1354d5b678c;hb=3cc47edf622b1d12a37b3637cae503d6862437c4;hp=9aa0b55ef0deaafac39f430bbab900a754ba855f;hpb=6950d07bf421b122ccb5a15a2ed4fa3a993d9609;p=stockfish
diff --git a/src/thread.cpp b/src/thread.cpp
index 9aa0b55e..735cc97c 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
along with this program. If not, see .
*/
+#include // For std::count
#include
-#include
#include "movegen.h"
#include "search.h"
@@ -29,41 +29,64 @@ using namespace Search;
ThreadPool Threads; // Global object
-namespace { extern "C" {
+namespace {
// start_routine() is the C function which is called when a new thread
// is launched. It is a wrapper to the virtual function idle_loop().
- long start_routine(Thread* th) { th->idle_loop(); return 0; }
+ extern "C" { long start_routine(ThreadBase* th) { th->idle_loop(); return 0; } }
-} }
+ // Helpers to launch a thread after creation and joining before delete. Must be
+ // outside Thread c'tor and d'tor because object shall be fully initialized
+ // when start_routine (and hence virtual idle_loop) is called and when joining.
-// Thread c'tor starts a newly-created thread of execution that will call
-// the the virtual function idle_loop(), going immediately to sleep.
+ template T* new_thread() {
+ T* th = new T();
+ thread_create(th->handle, start_routine, th); // Will go to sleep
+ return th;
+ }
-Thread::Thread() : splitPoints() {
+ void delete_thread(ThreadBase* th) {
+ th->exit = true; // Search must be already finished
+ th->notify_one();
+ thread_join(th->handle); // Wait for thread termination
+ delete th;
+ }
- searching = exit = false;
- maxPly = splitPointsSize = 0;
- activeSplitPoint = NULL;
- idx = Threads.size();
+}
- if (!thread_create(handle, start_routine, this))
- {
- std::cerr << "Failed to create thread number " << idx << std::endl;
- ::exit(EXIT_FAILURE);
- }
+
+// ThreadBase::notify_one() wakes up the thread when there is some work to do
+
+void ThreadBase::notify_one() {
+
+ mutex.lock();
+ sleepCondition.notify_one();
+ mutex.unlock();
}
-// Thread d'tor waits for thread termination before to return
+// ThreadBase::wait_for() set the thread to sleep until condition 'b' turns true
-Thread::~Thread() {
+void ThreadBase::wait_for(volatile const bool& b) {
- exit = true; // Search must be already finished
- notify_one();
- thread_join(handle); // Wait for thread termination
+ mutex.lock();
+ while (!b) sleepCondition.wait(mutex);
+ mutex.unlock();
+}
+
+
+// Thread c'tor just inits data but does not launch any thread of execution that
+// instead will be started only upon c'tor returns.
+
+Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC
+
+ searching = false;
+ maxPly = splitPointsSize = 0;
+ activeSplitPoint = NULL;
+ activePosition = NULL;
+ idx = Threads.size();
}
@@ -121,32 +144,12 @@ void MainThread::idle_loop() {
}
-// Thread::notify_one() wakes up the thread when there is some search to do
-
-void Thread::notify_one() {
-
- mutex.lock();
- sleepCondition.notify_one();
- mutex.unlock();
-}
-
-
-// Thread::wait_for() set the thread to sleep until condition 'b' turns true
-
-void Thread::wait_for(volatile const bool& b) {
-
- mutex.lock();
- while (!b) sleepCondition.wait(mutex);
- mutex.unlock();
-}
-
-
// Thread::cutoff_occurred() checks whether a beta cutoff has occurred in the
// current active split point, or in some ancestor of the split point.
bool Thread::cutoff_occurred() const {
- for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parent)
+ for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parentSplitPoint)
if (sp->cutoff)
return true;
@@ -154,14 +157,14 @@ bool Thread::cutoff_occurred() const {
}
-// Thread::is_available_to() checks whether the thread is available to help the
+// Thread::available_to() checks whether the thread is available to help the
// thread 'master' at a split point. An obvious requirement is that thread must
// be idle. With more than two threads, this is not sufficient: If the thread is
// the master of some split point, it is only available as a slave to the slaves
// which are busy searching the split point at the top of slaves split point
// stack (the "helpful master concept" in YBWC terminology).
-bool Thread::is_available_to(Thread* master) const {
+bool Thread::available_to(const Thread* master) const {
if (searching)
return false;
@@ -184,8 +187,8 @@ bool Thread::is_available_to(Thread* master) const {
void ThreadPool::init() {
sleepWhileIdle = true;
- timer = new TimerThread();
- threads.push_back(new MainThread());
+ timer = new_thread();
+ push_back(new_thread());
read_uci_options();
}
@@ -194,10 +197,10 @@ void ThreadPool::init() {
void ThreadPool::exit() {
- delete timer; // As first because check_time() accesses threads data
+ delete_thread(timer); // As first because check_time() accesses threads data
- for (size_t i = 0; i < threads.size(); i++)
- delete threads[i];
+ for (iterator it = begin(); it != end(); ++it)
+ delete_thread(*it);
}
@@ -214,13 +217,20 @@ void ThreadPool::read_uci_options() {
assert(requested > 0);
- while (threads.size() < requested)
- threads.push_back(new Thread());
+ // Value 0 has a special meaning: We determine the optimal minimum split depth
+ // automatically. Anyhow the minimumSplitDepth should never be under 4 plies.
+ if (!minimumSplitDepth)
+ minimumSplitDepth = (requested < 8 ? 4 : 7) * ONE_PLY;
+ else
+ minimumSplitDepth = std::max(4 * ONE_PLY, minimumSplitDepth);
- while (threads.size() > requested)
+ while (size() < requested)
+ push_back(new_thread());
+
+ while (size() > requested)
{
- delete threads.back();
- threads.pop_back();
+ delete_thread(back());
+ pop_back();
}
}
@@ -228,13 +238,13 @@ void ThreadPool::read_uci_options() {
// slave_available() tries to find an idle thread which is available as a slave
// for the thread 'master'.
-bool ThreadPool::slave_available(Thread* master) const {
+Thread* ThreadPool::available_slave(const Thread* master) const {
- for (size_t i = 0; i < threads.size(); i++)
- if (threads[i]->is_available_to(master))
- return true;
+ for (const_iterator it = begin(); it != end(); ++it)
+ if ((*it)->available_to(master))
+ return *it;
- return false;
+ return NULL;
}
@@ -248,34 +258,32 @@ bool ThreadPool::slave_available(Thread* master) const {
// search() then split() returns.
template
-Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
- Value bestValue, Move* bestMove, Depth depth, Move threatMove,
- int moveCount, MovePicker& mp, int nodeType) {
+void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Value* bestValue,
+ Move* bestMove, Depth depth, Move threatMove, int moveCount,
+ MovePicker* movePicker, int nodeType, bool cutNode) {
assert(pos.pos_is_ok());
- assert(bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE);
- assert(bestValue > -VALUE_INFINITE);
+ assert(*bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE);
+ assert(*bestValue > -VALUE_INFINITE);
assert(depth >= Threads.minimumSplitDepth);
-
- Thread* master = pos.this_thread();
-
- assert(master->searching);
- assert(master->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
+ assert(searching);
+ assert(splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
// Pick the next available split point from the split point stack
- SplitPoint& sp = master->splitPoints[master->splitPointsSize];
+ SplitPoint& sp = splitPoints[splitPointsSize];
- sp.master = master;
- sp.parent = master->activeSplitPoint;
- sp.slavesMask = 1ULL << master->idx;
+ sp.masterThread = this;
+ sp.parentSplitPoint = activeSplitPoint;
+ sp.slavesMask = 1ULL << idx;
sp.depth = depth;
+ sp.bestValue = *bestValue;
sp.bestMove = *bestMove;
sp.threatMove = threatMove;
sp.alpha = alpha;
sp.beta = beta;
sp.nodeType = nodeType;
- sp.bestValue = bestValue;
- sp.mp = ∓
+ sp.cutNode = cutNode;
+ sp.movePicker = movePicker;
sp.moveCount = moveCount;
sp.pos = &pos;
sp.nodes = 0;
@@ -285,25 +293,24 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
// Try to allocate available threads and ask them to start searching setting
// 'searching' flag. This must be done under lock protection to avoid concurrent
// allocation of the same slave by another master.
- mutex.lock();
+ Threads.mutex.lock();
sp.mutex.lock();
- master->splitPointsSize++;
- master->activeSplitPoint = &sp;
+ ++splitPointsSize;
+ activeSplitPoint = &sp;
+ activePosition = NULL;
- size_t slavesCnt = 1; // Master is always included
+ size_t slavesCnt = 1; // This thread is always included
+ Thread* slave;
- for (size_t i = 0; i < threads.size() && !Fake; ++i)
- if (threads[i]->is_available_to(master) && ++slavesCnt <= maxThreadsPerSplitPoint)
- {
- sp.slavesMask |= 1ULL << i;
- threads[i]->activeSplitPoint = &sp;
- threads[i]->searching = true; // Slave leaves idle_loop()
- threads[i]->notify_one(); // Could be sleeping
- }
-
- sp.mutex.unlock();
- mutex.unlock();
+ while ( (slave = Threads.available_slave(this)) != NULL
+ && ++slavesCnt <= Threads.maxThreadsPerSplitPoint && !Fake)
+ {
+ sp.slavesMask |= 1ULL << slave->idx;
+ slave->activeSplitPoint = &sp;
+ slave->searching = true; // Slave leaves idle_loop()
+ slave->notify_one(); // Could be sleeping
+ }
// Everything is set up. The master thread enters the idle loop, from which
// it will instantly launch a search, because its 'searching' flag is set.
@@ -311,49 +318,53 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
// their work at this split point.
if (slavesCnt > 1 || Fake)
{
- master->Thread::idle_loop(); // Force a call to base class idle_loop()
+ sp.mutex.unlock();
+ Threads.mutex.unlock();
+
+ Thread::idle_loop(); // Force a call to base class idle_loop()
// In helpful master concept a master can help only a sub-tree of its split
// point, and because here is all finished is not possible master is booked.
- assert(!master->searching);
+ assert(!searching);
+ assert(!activePosition);
+
+ // We have returned from the idle loop, which means that all threads are
+ // finished. Note that setting 'searching' and decreasing splitPointsSize is
+ // done under lock protection to avoid a race with Thread::available_to().
+ Threads.mutex.lock();
+ sp.mutex.lock();
}
- // We have returned from the idle loop, which means that all threads are
- // finished. Note that setting 'searching' and decreasing splitPointsSize is
- // done under lock protection to avoid a race with Thread::is_available_to().
- mutex.lock();
- sp.mutex.lock();
-
- master->searching = true;
- master->splitPointsSize--;
- master->activeSplitPoint = sp.parent;
+ searching = true;
+ --splitPointsSize;
+ activeSplitPoint = sp.parentSplitPoint;
+ activePosition = &pos;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove;
+ *bestValue = sp.bestValue;
sp.mutex.unlock();
- mutex.unlock();
-
- return sp.bestValue;
+ Threads.mutex.unlock();
}
// Explicit template instantiations
-template Value ThreadPool::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
-template Value ThreadPool::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
+template void Thread::split(Position&, const Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool);
+template void Thread::split< true>(Position&, const Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool);
// wait_for_think_finished() waits for main thread to go to sleep then returns
void ThreadPool::wait_for_think_finished() {
- MainThread* t = main_thread();
+ MainThread* t = main();
t->mutex.lock();
while (t->thinking) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
-// start_thinking() wakes up the main thread sleeping in main_loop() so to start
-// a new search, then returns immediately.
+// start_thinking() wakes up the main thread sleeping in MainThread::idle_loop()
+// so to start a new search, then returns immediately.
void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
const std::vector& searchMoves, StateStackPtr& states) {
@@ -364,15 +375,20 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
Signals.stopOnPonderhit = Signals.firstRootMove = false;
Signals.stop = Signals.failedLowAtRoot = false;
+ RootMoves.clear();
RootPos = pos;
Limits = limits;
- SetupStates = states; // Ownership transfer here
- RootMoves.clear();
+ if (states.get()) // If we don't set a new position, preserve current state
+ {
+ SetupStates = states; // Ownership transfer here
+ assert(!states.get());
+ }
- for (MoveList ml(pos); !ml.end(); ++ml)
- if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
- RootMoves.push_back(RootMove(ml.move()));
+ for (MoveList it(pos); *it; ++it)
+ if ( searchMoves.empty()
+ || std::count(searchMoves.begin(), searchMoves.end(), *it))
+ RootMoves.push_back(RootMove(*it));
- main_thread()->thinking = true;
- main_thread()->notify_one(); // Starts main thread
+ main()->thinking = true;
+ main()->notify_one(); // Starts main thread
}