X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=b476d529f4d3a1455e662958a8190a6094178870;hp=c209e125d1de0e62ec313307bdcd7d22c6b3f6ff;hb=79e50a2fbfdf2e866255e002b7d7cdc55d96bb9e;hpb=d004ec924de058f46076b23c0cf244d46e752ac7

diff --git a/src/thread.h b/src/thread.h
index c209e125..b476d529 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,15 +17,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-
-////
-//// Includes
-////
-
 #include <cstring>
 
 #include "lock.h"
@@ -33,64 +27,60 @@
 #include "position.h"
 #include "search.h"
 
-
-////
-//// Constants and variables
-////
-
-const int MAX_THREADS = 8;
+const int MAX_THREADS = 32;
 const int MAX_ACTIVE_SPLIT_POINTS = 8;
 
-
-////
-//// Types
-////
-
 struct SplitPoint {
 
   // Const data after splitPoint has been setup
   SplitPoint* parent;
   const Position* pos;
   Depth depth;
-  bool pvNode, mateThreat;
+  bool pvNode;
   Value beta;
   int ply;
+  int master;
   Move threatMove;
-  SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
 
   // Const pointers to shared data
   MovePicker* mp;
-  SearchStack* parentSstack;
+  SearchStack* ss;
 
   // Shared data
   Lock lock;
+  volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
-  volatile bool stopRequest;
+  volatile bool betaCutoff;
   volatile int slaves[MAX_THREADS];
 };
 
 // ThreadState type is used to represent thread's current state
-
 enum ThreadState
 {
+  THREAD_INITIALIZING,  // thread is initializing itself
   THREAD_SEARCHING,     // thread is performing work
-  THREAD_AVAILABLE,     // thread is polling for work
-  THREAD_SLEEPING,      // we are not thinking, so thread is sleeping
+  THREAD_AVAILABLE,     // thread is waiting for work
   THREAD_BOOKED,        // other thread (master) has booked us as a slave
   THREAD_WORKISWAITING, // master has ordered us to start
   THREAD_TERMINATED     // we are quitting and thread is terminated
 };
 
 struct Thread {
-  uint64_t nodes;
-  uint64_t betaCutOffs[2];
+  int maxPly;
+  Lock sleepLock;
+  WaitCondition sleepCond;
   volatile ThreadState state;
   SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
   SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
-};
 
+  void wake_up() {
+    lock_grab(&sleepLock);
+    cond_signal(&sleepCond);
+    lock_release(&sleepLock);
+  }
+};
 
 #endif // !defined(THREAD_H_INCLUDED)