X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=beb09e4d5df5700a212bb08db0b84e5a7c161a9a;hp=13615c2c92daca51714ff5456491926b2b95fa8c;hb=eeef654cd78853c966efe38daf97494bb4caeab1;hpb=0f7cbaca75124d88136d356cf7b082207b572b3c

diff --git a/src/thread.h b/src/thread.h
index 13615c2c..beb09e4d 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -20,7 +20,7 @@
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-#include <cstring>
+#include <set>
 
 #include "lock.h"
 #include "material.h"
@@ -46,16 +46,16 @@ struct SplitPoint {
 
   // Const pointers to shared data
   MovePicker* mp;
-  SearchStack* ss;
+  Search::Stack* ss;
 
   // Shared data
   Lock lock;
+  volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
   volatile bool is_betaCutoff;
-  volatile bool is_slave[MAX_THREADS];
 };
 
 
@@ -69,7 +69,7 @@ struct Thread {
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp);
+  void idle_loop(SplitPoint* sp_master);
   void main_loop();
   void timer_loop();
 
@@ -80,17 +80,12 @@ struct Thread {
   int maxPly;
   Lock sleepLock;
   WaitCondition sleepCond;
+  ThreadHandle handle;
   SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
   volatile bool is_searching;
   volatile bool do_sleep;
-  volatile bool do_terminate;
-
-#if defined(_MSC_VER)
-  HANDLE handle;
-#else
-  pthread_t handle;
-#endif
+  volatile bool do_exit;
 };
 
 
@@ -115,14 +110,14 @@ public:
   void set_size(int cnt);
   void read_uci_options();
   bool available_slave_exists(int master) const;
-  bool split_point_finished(SplitPoint* sp) const;
   void set_timer(int msec);
   void wait_for_stop_or_ponderhit();
+  void stop_thinking();
   void start_thinking(const Position& pos, const Search::LimitsType& limits,
-                      const std::vector<Move>& searchMoves, bool asyncMode);
+                      const std::set<Move>& = std::set<Move>(), bool async = false);
 
   template <bool Fake>
-  Value split(Position& pos, SearchStack* ss, Value alpha, Value beta, Value bestValue,
+  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue,
               Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
 private:
   friend struct Thread;