Renamed thread_should_stop() in cutoff_at_splitpoint()

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 558a6752da9c679cfa59f6c4b614356703df2680..d06291ebd61526a1a4b672833489ba2979d5c185 100644 (file)
--- 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
@@ -26,7 +26,8 @@
 //// Includes
 ////
 
-#include "history.h"
+#include <cstring>
+
 #include "lock.h"
 #include "movepick.h"
 #include "position.h"
@@ -37,7 +38,8 @@
 //// Constants and variables
 ////
 
-const int THREAD_MAX = 8;
+const int MAX_THREADS = 16;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
 
 
 ////
@@ -45,37 +47,49 @@ const int THREAD_MAX = 8;
 ////
 
 struct SplitPoint {
-  SplitPoint *parent;
-  Position pos;
-  SearchStack sstack[THREAD_MAX][PLY_MAX];
-  SearchStack *parentSstack;
-  int ply;
+
+  // Const data after splitPoint has been setup
+  SplitPoint* parent;
+  const Position* pos;
   Depth depth;
-  volatile Value alpha, beta, bestValue;
-  bool pvNode;
-  Bitboard dcCandidates;
-  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 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 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;
-  int activeSplitPoints;
-  uint64_t nodes;
-  uint64_t betaCutOffs[2];
-  bool failHighPly1;
-  volatile bool stop;
-  volatile bool running;
-  volatile bool idle;
-  volatile bool workIsWaiting;
-  volatile bool printCurrentLine;
-  History H;
-  unsigned char pad[64]; // set some distance among local data for each thread
+  volatile ThreadState state;
+  SplitPoint* volatile splitPoint;
+  volatile int activeSplitPoints;
+  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
 };