Restore LMR depth limit

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index cc490639ed4f4c8bb23a400166a840fa10a9ec86..beb09e4d5df5700a212bb08db0b84e5a7c161a9a 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -20,7 +20,6 @@
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-#include <cstring>
 #include <set>
 
 #include "lock.h"
@@ -51,12 +50,12 @@ struct SplitPoint {
 
   // Shared data
   Lock lock;
+  volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
   volatile bool is_betaCutoff;
-  volatile bool is_slave[MAX_THREADS];
 };
 
 
@@ -70,7 +69,7 @@ struct Thread {
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp);
+  void idle_loop(SplitPoint* sp_master);
   void main_loop();
   void timer_loop();
 
@@ -81,17 +80,12 @@ struct Thread {
   int maxPly;
   Lock sleepLock;
   WaitCondition sleepCond;
+  ThreadHandle handle;
   SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
   volatile bool is_searching;
   volatile bool do_sleep;
-  volatile bool do_terminate;
-
-#if defined(_MSC_VER)
-  HANDLE handle;
-#else
-  pthread_t handle;
-#endif
+  volatile bool do_exit;
 };
 
 
@@ -116,7 +110,6 @@ public:
   void set_size(int cnt);
   void read_uci_options();
   bool available_slave_exists(int master) const;
-  bool split_point_finished(SplitPoint* sp) const;
   void set_timer(int msec);
   void wait_for_stop_or_ponderhit();
   void stop_thinking();