X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=abb7a22333800f4aa2d648290640f71261e749ab;hp=793a3c606797c573131fe5f59cbc4e6c915c4b6e;hb=00d9e9fd283b31e63389af091b158dbc3fedfc0e;hpb=588670e8d2ed5735300c5549ef754ceb09f1f461

diff --git a/src/thread.h b/src/thread.h
index 793a3c60..abb7a223 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 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,9 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
 #define THREAD_H_INCLUDED
 
+#include <atomic>
+#include <bitset>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
 #include <vector>
 
 #include "material.h"
@@ -27,62 +32,28 @@
 #include "pawns.h"
 #include "position.h"
 #include "search.h"
+#include "thread_win32.h"
 
-const int MAX_THREADS = 64; // Because SplitPoint::slavesMask is a uint64_t
-const int MAX_SPLITPOINTS_PER_THREAD = 8;
-
-struct Mutex {
-  Mutex() { lock_init(l); }
- ~Mutex() { lock_destroy(l); }
-
-  void lock() { lock_grab(l); }
-  void unlock() { lock_release(l); }
-
-private:
-  friend struct ConditionVariable;
-
-  Lock l;
-};
-
-struct ConditionVariable {
-  ConditionVariable() { cond_init(c); }
- ~ConditionVariable() { cond_destroy(c); }
-
-  void wait(Mutex& m) { cond_wait(c, m.l); }
-  void wait_for(Mutex& m, int ms) { timed_wait(c, m.l, ms); }
-  void notify_one() { cond_signal(c); }
+struct Thread;
 
-private:
-  WaitCondition c;
-};
+const size_t MAX_THREADS = 128;
 
-struct Thread;
 
-struct SplitPoint {
+/// ThreadBase struct is the base of the hierarchy from where we derive all the
+/// specialized thread classes.
 
-  // Const data after split point has been setup
-  const Position* pos;
-  const Search::Stack* ss;
-  Depth depth;
-  Value beta;
-  int nodeType;
-  Thread* master;
-  Move threatMove;
+struct ThreadBase : public std::thread {
 
-  // Const pointers to shared data
-  MovePicker* mp;
-  SplitPoint* parent;
+  ThreadBase() { exit = false; }
+  virtual ~ThreadBase() = default;
+  virtual void idle_loop() = 0;
+  void notify_one();
+  void wait(std::atomic<bool>& b);
+  void wait_while(std::atomic<bool>& b);
 
-  // Shared data
   Mutex mutex;
-  Position* activePositions[MAX_THREADS];
-  volatile uint64_t slavesMask;
-  volatile int64_t nodes;
-  volatile Value alpha;
-  volatile Value bestValue;
-  volatile Move bestMove;
-  volatile int moveCount;
-  volatile bool cutoff;
+  ConditionVariable sleepCondition;
+  std::atomic<bool> exit;
 };
 
 
@@ -91,89 +62,65 @@ struct SplitPoint {
 /// tables so that once we get a pointer to an entry its life time is unlimited
 /// and we don't have to care about someone changing the entry under our feet.
 
-struct Thread {
+struct Thread : public ThreadBase {
 
   Thread();
-  virtual ~Thread();
-
   virtual void idle_loop();
-  void notify_one();
-  bool cutoff_occurred() const;
-  bool is_available_to(Thread* master) const;
-  void wait_for(volatile const bool& b);
+  void search(bool isMainThread = false);
 
-  SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
+  Pawns::Table pawnsTable;
   Material::Table materialTable;
   Endgames endgames;
-  Pawns::Table pawnsTable;
-  size_t idx;
+  size_t idx, PVIdx;
   int maxPly;
-  Mutex mutex;
-  ConditionVariable sleepCondition;
-  NativeHandle handle;
-  SplitPoint* volatile curSplitPoint;
-  volatile int splitPointsCnt;
-  volatile bool searching;
-  volatile bool exit;
+  std::atomic<bool> searching;
+
+  Position rootPos;
+  Search::RootMoveVector rootMoves;
+  Depth rootDepth;
+  Search::Stack stack[MAX_PLY+4];
+  HistoryStats history;
+  MovesStats counterMoves;
 };
 
 
-/// MainThread and TimerThread are sublassed from Thread to charaterize the two
+/// MainThread and TimerThread are derived classes used to characterize the two
 /// special threads: the main one and the recurring timer.
 
 struct MainThread : public Thread {
-  MainThread() : thinking(true) {} // Avoid a race with start_thinking()
+  MainThread() { thinking = true; } // Avoid a race with start_thinking()
   virtual void idle_loop();
-  volatile bool thinking;
+  void join();
+  void think();
+  std::atomic<bool> thinking;
 };
 
-struct TimerThread : public Thread {
-  TimerThread() : msec(0) {}
+struct TimerThread : public ThreadBase {
+
+  static const int Resolution = 5; // Millisec between two check_time() calls
+
   virtual void idle_loop();
-  int msec;
+
+  bool run = false;
 };
 
 
-/// ThreadPool class handles all the threads related stuff like init, starting,
-/// parking and, the most important, launching a slave thread at a split point.
+/// ThreadPool struct handles all the threads related stuff like init, starting,
+/// parking and, most importantly, launching a slave thread at a split point.
 /// All the access to shared thread data is done through this class.
 
-class ThreadPool {
+struct ThreadPool : public std::vector<Thread*> {
 
-public:
-  void init(); // No c'tor and d'tor, threads rely on globals that should
-  void exit(); // be initialized and valid during the whole thread lifetime.
-
-  Thread& operator[](size_t id) { return *threads[id]; }
-  size_t size() const { return threads.size(); }
-  MainThread* main_thread() { return static_cast<MainThread*>(threads[0]); }
-  TimerThread* timer_thread() { return timer; }
+  void init(); // No c'tor and d'tor, threads rely on globals that should be
+  void exit(); // initialized and are valid during the whole thread lifetime.
 
+  MainThread* main() { return static_cast<MainThread*>(at(0)); }
   void read_uci_options();
-  bool available_slave_exists(Thread* master) const;
-  void wait_for_think_finished();
-  void start_thinking(const Position&, const Search::LimitsType&,
-                       const std::vector<Move>&, Search::StateStackPtr&);
-
-  template <bool Fake>
-  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
-              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
-
-  bool sleepWhileIdle;
-  Depth minimumSplitDepth;
-
-private:
-  friend struct Thread;
-  friend struct MainThread;
-  friend void check_time();
-
-  std::vector<Thread*> threads;
+  void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
+  int64_t nodes_searched();
   TimerThread* timer;
-  Mutex mutex;
-  ConditionVariable sleepCondition;
-  int maxThreadsPerSplitPoint;
 };
 
 extern ThreadPool Threads;
 
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED