X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=98576ccea2131a877edc2a61a16ff164219596c3;hp=14924bf2280662be82523e81e94d09a7136d1c16;hb=00d9fe8af09891e82d66f88c48b513d6a7326f2a;hpb=093dd8fe88d278db6cd5c956a771a45a295e1de3

diff --git a/src/thread.h b/src/thread.h
index 14924bf2..98576cce 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
@@ -38,8 +38,8 @@
 //// Constants and variables
 ////
 
-const int THREAD_MAX = 8;
-const int ACTIVE_SPLIT_POINTS_MAX = 8;
+const int MAX_THREADS = 8;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
 
 
 ////
@@ -47,39 +47,49 @@ const int ACTIVE_SPLIT_POINTS_MAX = 8;
 ////
 
 struct SplitPoint {
-  SplitPoint *parent;
+
+  // Const data after splitPoint has been setup
+  SplitPoint* parent;
   const Position* pos;
-  SearchStack sstack[THREAD_MAX][PLY_MAX_PLUS_2];
-  SearchStack *parentSstack;
-  int ply;
   Depth depth;
-  volatile Value alpha, beta, bestValue;
-  Value futilityValue;
-  bool pvNode;
-  int master, slaves[THREAD_MAX];
+  bool pvNode, mateThreat;
+  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;
+
+  // Shared data
   Lock lock;
-  MovePicker *mp;
-  volatile int moves;
-  volatile int cpus;
-  bool finished;
+  volatile int64_t nodes;
+  volatile Value alpha;
+  volatile Value bestValue;
+  volatile int moveCount;
+  volatile bool stopRequest;
+  volatile int slaves[MAX_THREADS];
 };
 
+// ThreadState type is used to represent thread's current state
 
-struct Thread {
-
-  Thread() { memset(this, 0, sizeof(Thread)); }
+enum ThreadState
+{
+  THREAD_INITIALIZING,  // thread is initializing itself
+  THREAD_SEARCHING,     // thread is performing work
+  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
+};
 
-  SplitPoint *splitPoint;
+struct Thread {
+  volatile ThreadState state;
+  SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
-  uint64_t nodes;
-  uint64_t betaCutOffs[2];
-  volatile bool stop;
-  volatile bool running;
-  volatile bool idle;
-  volatile bool sleeping;
-  volatile bool workIsWaiting;
-  volatile bool printCurrentLine;
-  unsigned char pad[64]; // set some distance among local data for each thread
+  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
 };