Simplify start_searching() signature
authorMarco Costalba <mcostalba@gmail.com>
Mon, 26 Mar 2012 17:56:48 +0000 (18:56 +0100)
committerMarco Costalba <mcostalba@gmail.com>
Mon, 26 Mar 2012 17:59:01 +0000 (18:59 +0100)
Retire the "sync" behaviour that now is up to
the caller to honour.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
src/benchmark.cpp
src/thread.cpp
src/thread.h
src/uci.cpp

index 9f0ac0c..35fd725 100644 (file)
@@ -119,6 +119,7 @@ void benchmark(int argc, char* argv[]) {
       else
       {
           Threads.start_searching(pos, limits);
+          Threads.wait_for_search_finished();
           nodes += Search::RootPosition.nodes_searched();
       }
   }
index 65d01d9..10f432b 100644 (file)
@@ -424,13 +424,11 @@ void ThreadsManager::wait_for_search_finished() {
 }
 
 
-// ThreadsManager::start_searching() is used by UI thread to wake up the main
-// thread parked in main_loop() and starting a new search. If async is true
-// then function returns immediately, otherwise caller is blocked waiting for
-// the search to finish.
+// ThreadsManager::start_searching() wakes up the main thread sleeping in
+// main_loop() so to start a new search, then returns immediately.
 
 void ThreadsManager::start_searching(const Position& pos, const LimitsType& limits,
-                                     const std::set<Move>& searchMoves, bool async) {
+                                     const std::set<Move>& searchMoves) {
   wait_for_search_finished();
 
   Signals.stopOnPonderhit = Signals.firstRootMove = false;
@@ -444,8 +442,5 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi
       if (searchMoves.empty() || searchMoves.count(ml.move()))
           RootMoves.push_back(RootMove(ml.move()));
 
-  threads[0]->wake_up(); // Start main thread
-
-  if (!async)
-      wait_for_search_finished();
+  threads[0]->wake_up();
 }
index e6a4cf9..9b0a8bc 100644 (file)
@@ -126,7 +126,7 @@ public:
   void set_timer(int msec);
   void wait_for_search_finished();
   void start_searching(const Position& pos, const Search::LimitsType& limits,
-                       const std::set<Move>& = std::set<Move>(), bool async = false);
+                       const std::set<Move>& = std::set<Move>());
 
   template <bool Fake>
   Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
index 0057881..7c2bd1e 100644 (file)
@@ -228,7 +228,7 @@ namespace {
     limits.time = time[pos.side_to_move()];
     limits.increment = inc[pos.side_to_move()];
 
-    Threads.start_searching(pos, limits, searchMoves, true);
+    Threads.start_searching(pos, limits, searchMoves);
   }