&& depth >= Threads.minimumSplitDepth
&& ( !thisThread->activeSplitPoint
|| !thisThread->activeSplitPoint->allSlavesSearching
- || ( int(Threads.size()) > MAX_SLAVES_PER_SPLITPOINT
- && thisThread->activeSplitPoint->slavesCount == MAX_SLAVES_PER_SPLITPOINT))
+ || ( Threads.size() > MAX_SLAVES_PER_SPLITPOINT
+ && thisThread->activeSplitPoint->slavesMask.count() == MAX_SLAVES_PER_SPLITPOINT))
&& thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
{
assert(bestValue > -VALUE_INFINITE && bestValue < beta);
if ( sp
&& sp->allSlavesSearching
- && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(Threads[i]))
{
assert(this != Threads[i]);
for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
level++;
- int score = level * 256 * 256 + sp->slavesCount * 256 - sp->depth * 1;
+ int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
if (score < bestScore)
{
sp->mutex.lock();
if ( sp->allSlavesSearching
- && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(bestThread))
{
sp->slavesMask.set(idx);
- sp->slavesCount++;
activeSplitPoint = sp;
searching = true;
}
sp.masterThread = this;
sp.parentSplitPoint = activeSplitPoint;
sp.slavesMask = 0, sp.slavesMask.set(idx);
- sp.slavesCount = 1;
sp.depth = depth;
sp.bestValue = *bestValue;
sp.bestMove = *bestMove;
Thread* slave;
- while ( sp.slavesCount < MAX_SLAVES_PER_SPLITPOINT
+ while ( sp.slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& (slave = Threads.available_slave(this)) != NULL)
{
sp.slavesMask.set(slave->idx);
- sp.slavesCount++;
slave->activeSplitPoint = &sp;
slave->searching = true; // Slave leaves idle_loop()
slave->notify_one(); // Could be sleeping
const int MAX_THREADS = 128;
const int MAX_SPLITPOINTS_PER_THREAD = 8;
-const int MAX_SLAVES_PER_SPLITPOINT = 4;
+const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
/// Mutex and ConditionVariable struct are wrappers of the low level locking
/// machinery and are modeled after the corresponding C++11 classes.
// Shared variable data
Mutex mutex;
std::bitset<MAX_THREADS> slavesMask;
- int slavesCount;
volatile bool allSlavesSearching;
volatile uint64_t nodes;
volatile Value alpha;