X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=463739fe2eff7c39617ad66ee59953214731676a;hp=782694ad7d25607e8161b1be8ce9803022222332;hb=c980163316d48ff304bfb253089c7d474d090b12;hpb=a8b9c11f5666a6298d684e21156f4ac9d89c8d8c

diff --git a/src/thread.h b/src/thread.h
index 782694ad..463739fe 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,18 +27,8 @@
 #include "position.h"
 #include "search.h"
 
-
-////
-//// Constants and variables
-////
-
-const int MAX_THREADS = 8;
-const int ACTIVE_SPLIT_POINTS_MAX = 8;
-
-
-////
-//// Types
-////
+const int MAX_THREADS = 32;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
 
 struct SplitPoint {
 
@@ -55,41 +39,39 @@ struct SplitPoint {
   bool pvNode, mateThreat;
   Value beta;
   int ply;
-  SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
+  int master;
+  Move threatMove;
 
   // 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 {
+  volatile ThreadState state;
   SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
-  uint64_t nodes;
-  uint64_t betaCutOffs[2];
-  volatile ThreadState state;
-  unsigned char pad[64]; // set some distance among local data for each thread
+  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
 };
 
-
 #endif // !defined(THREAD_H_INCLUDED)