along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm> // For std::count
#include <cassert>
#include <iostream>
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;
assert(bestValue > -VALUE_INFINITE);
assert(depth >= Threads.minimumSplitDepth);
- Thread* master = pos.this_thread();
+ Thread* thisThread = pos.this_thread();
- assert(master->searching);
- assert(master->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
+ assert(thisThread->searching);
+ assert(thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
// Pick the next available split point from the split point stack
- SplitPoint& sp = master->splitPoints[master->splitPointsSize];
+ SplitPoint& sp = thisThread->splitPoints[thisThread->splitPointsSize];
- sp.master = master;
- sp.parent = master->activeSplitPoint;
- sp.slavesMask = 1ULL << master->idx;
+ sp.masterThread = thisThread;
+ sp.parentSplitPoint = thisThread->activeSplitPoint;
+ sp.slavesMask = 1ULL << thisThread->idx;
sp.depth = depth;
sp.bestMove = *bestMove;
sp.threatMove = threatMove;
sp.beta = beta;
sp.nodeType = nodeType;
sp.bestValue = bestValue;
- sp.mp = ∓
+ sp.movePicker = ∓
sp.moveCount = moveCount;
sp.pos = &pos;
sp.nodes = 0;
mutex.lock();
sp.mutex.lock();
- master->splitPointsSize++;
- master->activeSplitPoint = &sp;
+ thisThread->splitPointsSize++;
+ thisThread->activeSplitPoint = &sp;
size_t slavesCnt = 1; // Master is always included
for (size_t i = 0; i < threads.size() && !Fake; ++i)
- if (threads[i]->is_available_to(master) && ++slavesCnt <= maxThreadsPerSplitPoint)
+ if (threads[i]->is_available_to(thisThread) && ++slavesCnt <= maxThreadsPerSplitPoint)
{
- sp.slavesMask |= 1ULL << i;
+ sp.slavesMask |= 1ULL << threads[i]->idx;
threads[i]->activeSplitPoint = &sp;
threads[i]->searching = true; // Slave leaves idle_loop()
threads[i]->notify_one(); // Could be sleeping
// their work at this split point.
if (slavesCnt > 1 || Fake)
{
- master->Thread::idle_loop(); // Force a call to base class idle_loop()
+ thisThread->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(!thisThread->searching);
}
// We have returned from the idle loop, which means that all threads are
mutex.lock();
sp.mutex.lock();
- master->searching = true;
- master->splitPointsSize--;
- master->activeSplitPoint = sp.parent;
+ thisThread->searching = true;
+ thisThread->splitPointsSize--;
+ thisThread->activeSplitPoint = sp.parentSplitPoint;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove;
}
-// 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<Move>& searchMoves, StateStackPtr& states) {
RootMoves.clear();
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
- if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
+ if ( searchMoves.empty()
+ || std::count(searchMoves.begin(), searchMoves.end(), ml.move()))
RootMoves.push_back(RootMove(ml.move()));
main_thread()->thinking = true;