along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <cassert>
#include <iostream>
+#include "movegen.h"
#include "search.h"
#include "thread.h"
#include "ucioption.h"
void Thread::wake_up() {
- lock_grab(&sleepLock);
- cond_signal(&sleepCond);
- lock_release(&sleepLock);
+ lock_grab(sleepLock);
+ cond_signal(sleepCond);
+ lock_release(sleepLock);
}
void ThreadsManager::init() {
// Initialize sleep condition and lock used by thread manager
- cond_init(&sleepCond);
- lock_init(&threadsLock);
+ cond_init(sleepCond);
+ lock_init(threadsLock);
// Initialize thread's sleep conditions and split point locks
for (int i = 0; i <= MAX_THREADS; i++)
{
- lock_init(&threads[i].sleepLock);
- cond_init(&threads[i].sleepCond);
+ lock_init(threads[i].sleepLock);
+ cond_init(threads[i].sleepCond);
for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
- lock_init(&(threads[i].splitPoints[j].lock));
+ lock_init(threads[i].splitPoints[j].lock);
}
// Allocate main thread tables to call evaluate() also when not searching
for (int i = 0; i <= MAX_THREADS; i++)
{
threads[i].is_searching = false;
- threads[i].do_sleep = true;
+ threads[i].do_sleep = (i != 0); // Avoid a race with start_thinking()
threads[i].threadID = i;
-#if defined(_MSC_VER)
- threads[i].handle = CreateThread(NULL, 0, start_routine, (LPVOID)&threads[i], 0, NULL);
- bool ok = (threads[i].handle != NULL);
-#else
- bool ok = !pthread_create(&threads[i].handle, NULL, start_routine, (void*)&threads[i]);
-#endif
+ bool ok = thread_create(threads[i].handle, start_routine, threads[i]);
if (!ok)
{
threads[i].do_terminate = true; // Search must be already finished
threads[i].wake_up();
- // Wait for thread termination
-#if defined(_MSC_VER)
- WaitForSingleObject(threads[i].handle, 0);
- CloseHandle(threads[i].handle);
-#else
- pthread_join(threads[i].handle, NULL);
-#endif
+ thread_join(threads[i].handle); // Wait for thread termination
// Now we can safely destroy associated locks and wait conditions
- lock_destroy(&threads[i].sleepLock);
- cond_destroy(&threads[i].sleepCond);
+ lock_destroy(threads[i].sleepLock);
+ cond_destroy(threads[i].sleepCond);
for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
- lock_destroy(&(threads[i].splitPoints[j].lock));
+ lock_destroy(threads[i].splitPoints[j].lock);
}
- lock_destroy(&threadsLock);
- cond_destroy(&sleepCond);
+ lock_destroy(threadsLock);
+ cond_destroy(sleepCond);
}
// Try to allocate available threads and ask them to start searching setting
// is_searching flag. This must be done under lock protection to avoid concurrent
// allocation of the same slave by another master.
- lock_grab(&threadsLock);
+ lock_grab(threadsLock);
for (i = 0; !Fake && i < activeThreads && workersCnt < maxThreadsPerSplitPoint; i++)
if (threads[i].is_available_to(master))
threads[i].wake_up();
}
- lock_release(&threadsLock);
+ lock_release(threadsLock);
// We failed to allocate even one slave, return
if (!Fake && workersCnt == 1)
// We have returned from the idle loop, which means that all threads are
// finished. Note that changing state and decreasing activeSplitPoints is done
// under lock protection to avoid a race with Thread::is_available_to().
- lock_grab(&threadsLock);
+ lock_grab(threadsLock);
masterThread.is_searching = true;
masterThread.activeSplitPoints--;
- lock_release(&threadsLock);
+ lock_release(threadsLock);
masterThread.splitPoint = sp->parent;
pos.set_nodes_searched(pos.nodes_searched() + sp->nodes);
// Thread::timer_loop() is where the timer thread waits maxPly milliseconds and
// then calls do_timer_event(). If maxPly is 0 thread sleeps until is woken up.
-extern void do_timer_event();
+extern void check_time();
void Thread::timer_loop() {
while (!do_terminate)
{
- lock_grab(&sleepLock);
- timed_wait(&sleepCond, &sleepLock, maxPly ? maxPly : INT_MAX);
- lock_release(&sleepLock);
- do_timer_event();
+ lock_grab(sleepLock);
+ timed_wait(sleepCond, sleepLock, maxPly ? maxPly : INT_MAX);
+ lock_release(sleepLock);
+ check_time();
}
}
Thread& timer = threads[MAX_THREADS];
- lock_grab(&timer.sleepLock);
+ lock_grab(timer.sleepLock);
timer.maxPly = msec;
- cond_signal(&timer.sleepCond); // Wake up and restart the timer
- lock_release(&timer.sleepLock);
+ cond_signal(timer.sleepCond); // Wake up and restart the timer
+ lock_release(timer.sleepLock);
}
while (true)
{
- lock_grab(&sleepLock);
+ lock_grab(sleepLock);
do_sleep = true; // Always return to sleep after a search
is_searching = false;
while (do_sleep && !do_terminate)
{
- cond_signal(&Threads.sleepCond); // Wake up UI thread if needed
- cond_wait(&sleepCond, &sleepLock);
+ cond_signal(Threads.sleepCond); // Wake up UI thread if needed
+ cond_wait(sleepCond, sleepLock);
}
is_searching = true;
- lock_release(&sleepLock);
+ lock_release(sleepLock);
if (do_terminate)
return;
- think(); // This is the search entry point
+ Search::think();
}
}
// the search to finish.
void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limits,
- const std::vector<Move>& searchMoves, bool asyncMode) {
+ const std::set<Move>& searchMoves, bool async) {
Thread& main = threads[0];
- lock_grab(&main.sleepLock);
+ lock_grab(main.sleepLock);
// Wait main thread has finished before to launch a new search
while (!main.do_sleep)
- cond_wait(&sleepCond, &main.sleepLock);
+ cond_wait(sleepCond, main.sleepLock);
// Copy input arguments to initialize the search
RootPosition.copy(pos, 0);
Limits = limits;
- SearchMoves = searchMoves;
+ RootMoves.clear();
+
+ // Populate RootMoves with all the legal moves (default) or, if a searchMoves
+ // set is given, with the subset of legal moves to search.
+ for (MoveList<MV_LEGAL> ml(pos); !ml.end(); ++ml)
+ if (searchMoves.empty() || searchMoves.count(ml.move()))
+ RootMoves.push_back(RootMove(ml.move()));
// Reset signals before to start the new search
- memset((void*)&Signals, 0, sizeof(Signals));
+ Signals.stopOnPonderhit = Signals.firstRootMove = false;
+ Signals.stop = Signals.failedLowAtRoot = false;
main.do_sleep = false;
- cond_signal(&main.sleepCond); // Wake up main thread and start searching
+ cond_signal(main.sleepCond); // Wake up main thread and start searching
- if (!asyncMode)
- cond_wait(&sleepCond, &main.sleepLock);
+ if (!async)
+ while (!main.do_sleep)
+ cond_wait(sleepCond, main.sleepLock);
- lock_release(&main.sleepLock);
+ lock_release(main.sleepLock);
}
Search::Signals.stop = true;
- lock_grab(&main.sleepLock);
+ lock_grab(main.sleepLock);
- cond_signal(&main.sleepCond); // In case is waiting for stop or ponderhit
+ cond_signal(main.sleepCond); // In case is waiting for stop or ponderhit
while (!main.do_sleep)
- cond_wait(&sleepCond, &main.sleepLock);
+ cond_wait(sleepCond, main.sleepLock);
- lock_release(&main.sleepLock);
+ lock_release(main.sleepLock);
}
Thread& main = threads[0];
- lock_grab(&main.sleepLock);
+ lock_grab(main.sleepLock);
while (!Signals.stop)
- cond_wait(&main.sleepCond, &main.sleepLock);
+ cond_wait(main.sleepCond, main.sleepLock);
- lock_release(&main.sleepLock);
+ lock_release(main.sleepLock);
}
projects / stockfish / blobdiff