X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=c7d9d4104e248642170e594813111bef6de789ac;hp=18e35fb062ca9e11919cd6bab60148d2c13a3e7a;hb=e25de55faca30c2196612fcb208d88802ad29bae;hpb=87b483f99922c493d20b40d9dd16beeb9ee443c1
diff --git a/src/thread.cpp b/src/thread.cpp
index 18e35fb0..c7d9d410 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 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,10 @@
along with this program. If not, see .
*/
+#include
#include
+#include "movegen.h"
#include "search.h"
#include "thread.h"
#include "ucioption.h"
@@ -112,11 +114,11 @@ bool Thread::is_available_to(int master) const {
void ThreadsManager::read_uci_options() {
- maxThreadsPerSplitPoint = Options["Max Threads per Split Point"].value();
- minimumSplitDepth = Options["Min Split Depth"].value() * ONE_PLY;
- useSleepingThreads = Options["Use Sleeping Threads"].value();
+ maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
+ minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY;
+ useSleepingThreads = Options["Use Sleeping Threads"];
- set_size(Options["Threads"].value());
+ set_size(Options["Threads"]);
}
@@ -172,14 +174,14 @@ void ThreadsManager::init() {
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);
+ threads[i].handle = CreateThread(NULL, 0, start_routine, &threads[i], 0, NULL);
bool ok = (threads[i].handle != NULL);
#else
- bool ok = !pthread_create(&threads[i].handle, NULL, start_routine, (void*)&threads[i]);
+ bool ok = !pthread_create(&threads[i].handle, NULL, start_routine, &threads[i]);
#endif
if (!ok)
@@ -197,12 +199,12 @@ void ThreadsManager::exit() {
for (int i = 0; i <= MAX_THREADS; i++)
{
- threads[i].do_terminate = true;
+ 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);
+ WaitForSingleObject(threads[i].handle, INFINITE);
CloseHandle(threads[i].handle);
#else
pthread_join(threads[i].handle, NULL);
@@ -367,7 +369,7 @@ template Value ThreadsManager::split(Position&, Stack*, Value, Value, Valu
// 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() {
@@ -376,7 +378,7 @@ void Thread::timer_loop() {
lock_grab(&sleepLock);
timed_wait(&sleepCond, &sleepLock, maxPly ? maxPly : INT_MAX);
lock_release(&sleepLock);
- do_timer_event();
+ check_time();
}
}
@@ -420,7 +422,7 @@ void Thread::main_loop() {
if (do_terminate)
return;
- think(); // This is the search entry point
+ Search::think();
}
}
@@ -431,7 +433,7 @@ void Thread::main_loop() {
// the search to finish.
void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limits,
- const std::vector& searchMoves, bool asyncMode) {
+ const std::set& searchMoves, bool async) {
Thread& main = threads[0];
lock_grab(&main.sleepLock);
@@ -443,15 +445,44 @@ void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limit
// 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 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
- if (!asyncMode)
+ if (!async)
+ while (!main.do_sleep)
+ cond_wait(&sleepCond, &main.sleepLock);
+
+ lock_release(&main.sleepLock);
+}
+
+
+// ThreadsManager::stop_thinking() is used by UI thread to raise a stop request
+// and to wait for the main thread finishing the search. Needed to wait exiting
+// and terminate the threads after a 'quit' command.
+
+void ThreadsManager::stop_thinking() {
+
+ Thread& main = threads[0];
+
+ Search::Signals.stop = true;
+
+ lock_grab(&main.sleepLock);
+
+ cond_signal(&main.sleepCond); // In case is waiting for stop or ponderhit
+
+ while (!main.do_sleep)
cond_wait(&sleepCond, &main.sleepLock);
lock_release(&main.sleepLock);