Don't need pthread_detach() after pthread_join()

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 9992049efdacc4792138348d63febaed162bfc84..9923ef1dbc1fdf5ce2d6493dc05662d599900e29 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -409,9 +409,7 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) {
   read_evaluation_uci_options(pos.side_to_move());
   Threads.read_uci_options();
 
-  // Allocate pawn and material hash tables if number of active threads
-  // increased and set a new TT size if changed.
-  Threads.init_hash_tables();
+  // Set a new TT size if changed
   TT.set_size(Options["Hash"].value<int>());
 
   if (Options["Clear Hash"].value<bool>())
@@ -536,8 +534,10 @@ namespace {
 
         Rml.bestMoveChanges = 0;
 
-        // MultiPV iteration loop
-        for (MultiPVIteration = 0; MultiPVIteration < Min(MultiPV, (int)Rml.size()); MultiPVIteration++)
+        // MultiPV iteration loop. At depth 1 perform at least 2 iterations to
+        // get a score of the second best move for easy move detection.
+        int e = Min(Max(MultiPV, 2 * int(depth == 1)), (int)Rml.size());
+        for (MultiPVIteration = 0; MultiPVIteration < e; MultiPVIteration++)
         {
             // Calculate dynamic aspiration window based on previous iterations
             if (depth >= 5 && abs(Rml[MultiPVIteration].prevScore) < VALUE_KNOWN_WIN)
@@ -1002,8 +1002,7 @@ split_point_start: // At split points actual search starts from here
                    << " currmovenumber " << moveCount + MultiPVIteration << endl;
       }
 
-      // At Root and at first iteration do a PV search on all the moves to score root moves
-      isPvMove = (PvNode && moveCount <= (RootNode && depth <= ONE_PLY ? MAX_MOVES : 1));
+      isPvMove = (PvNode && moveCount == 1);
       givesCheck = pos.move_gives_check(move, ci);
       captureOrPromotion = pos.move_is_capture_or_promotion(move);
 
@@ -2130,13 +2129,11 @@ split_point_start: // At split points actual search starts from here
 } // namespace
 
 
-// Little helper used by idle_loop() to check that all the slaves of a
-// master thread have finished searching.
+// Little helper used by idle_loop() to check that all the slave threads of a
+// split point have finished searching.
 
 static bool all_slaves_finished(SplitPoint* sp) {
 
-  assert(sp);
-
   for (int i = 0; i < Threads.size(); i++)
       if (sp->is_slave[i])
           return false;