goto finalize;
}
- if (Options["OwnBook"])
+ if (Options["OwnBook"] && !Limits.infinite)
{
Move bookMove = book.probe(pos, Options["Book File"], Options["Best Book Move"]);
// but if we are pondering or in infinite search, we shouldn't print the best
// move before we are told to do so.
if (!Signals.stop && (Limits.ponder || Limits.infinite))
- Threads.this_thread()->wait_for_stop_or_ponderhit();
+ pos.this_thread()->wait_for_stop_or_ponderhit();
// Best move could be MOVE_NONE when searching on a stalemate position
cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960)
assert((alpha == beta - 1) || PvNode);
assert(depth > DEPTH_ZERO);
- Move movesSearched[MAX_MOVES];
+ Move movesSearched[64];
StateInfo st;
const TTEntry *tte;
Key posKey;
bool isPvMove, inCheck, singularExtensionNode, givesCheck;
bool captureOrPromotion, dangerous, doFullDepthSearch;
int moveCount = 0, playedMoveCount = 0;
- Thread* thisThread = Threads.this_thread();
+ Thread* thisThread = pos.this_thread();
SplitPoint* sp = NULL;
refinedValue = bestValue = value = -VALUE_INFINITE;
}
ss->currentMove = move;
- if (!SpNode && !captureOrPromotion)
+ if (!SpNode && !captureOrPromotion && playedMoveCount < 64)
movesSearched[playedMoveCount++] = move;
// Step 14. Make the move
lock_release(Threads.splitLock);
Stack ss[MAX_PLY_PLUS_2];
- Position pos(*sp->pos);
+ Position pos(*sp->pos, this);
memcpy(ss, sp->ss - 1, 4 * sizeof(Stack));
(ss+1)->sp = sp;
// our feet by the sp master. Also accessing other Thread objects is
// unsafe because if we are exiting there is a chance are already freed.
lock_release(sp->lock);
+
+ // Try to reparent to another split point. Only for slave threads
+ // that are not master of any active split point.
+ if ( !sp_master
+ && !is_searching
+ && !do_sleep
+ && !do_exit
+ && !splitPointsCnt
+ && Threads.size() > 2)
+ {
+ for (int i = 0; i < Threads.size(); i++)
+ {
+ SplitPoint* oldest = &Threads[i].splitPoints[0];
+
+ // Find the first oldest split point with still all slaves running
+ if ( Threads[i].splitPointsCnt
+ && oldest->slavesMask == oldest->allSlavesMask
+ && !single_bit(oldest->allSlavesMask))
+ {
+ lock_grab(oldest->lock);
+ lock_grab(Threads.splitLock); // Needed by is_searching
+
+ // Retest all under lock protection, we are in the middle
+ // of a race storm !
+ if ( !is_searching
+ && !do_sleep
+ && !do_exit
+ && Threads[i].splitPointsCnt
+ && oldest->slavesMask == oldest->allSlavesMask
+ && !single_bit(oldest->allSlavesMask))
+ {
+ oldest->slavesMask |= 1ULL << idx; // allSlavesMask is not updated
+ curSplitPoint = oldest;
+ is_searching = true;
+ }
+
+ lock_release(Threads.splitLock);
+ lock_release(oldest->lock);
+
+ break; // Exit anyhow, only one try (enough in 99% of cases)
+ }
+ }
+ }
}
}
}