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

diff --git a/src/thread.h b/src/thread.h
index 0348ed82..463739fe 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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,63 +27,51 @@
 #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 {
 
   // Const data after splitPoint has been setup
   SplitPoint* parent;
   const Position* pos;
-  bool pvNode;
   Depth depth;
+  bool pvNode, mateThreat;
   Value beta;
-  int ply, master, slaves[MAX_THREADS];
-  SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
+  int ply;
+  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 moves;
-  volatile int cpus;
-  volatile bool stopRequest;
+  volatile int moveCount;
+  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 {
-  SplitPoint* 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* volatile splitPoint;
+  volatile int activeSplitPoints;
+  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
 };
 
-
 #endif // !defined(THREAD_H_INCLUDED)