X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=34307297dead0fa04a8c21b30f3045d588076f5c;hp=ea645b4547fd878742135fdbaa4f7fd79647c14a;hb=6fa6da3ee13d2b7bdbec3cd24ff8ca43233c74fb;hpb=2dbb1adf2ac3c1655fd6b696c2e73c92e56e78d4

diff --git a/src/thread.h b/src/thread.h
index ea645b45..34307297 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -39,7 +39,7 @@ const size_t MAX_THREADS = 128;
 const size_t MAX_SPLITPOINTS_PER_THREAD = 8;
 const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
 
-
+#if 0
 /// Spinlock class wraps low level atomic operations to provide a spin lock
 
 class Spinlock {
@@ -55,6 +55,18 @@ public:
   void release() { lock.store(1, std::memory_order_release); }
 };
 
+#else
+
+class Spinlock {
+
+  std::mutex mutex;
+
+public:
+  void acquire() { mutex.lock(); }
+  void release() { mutex.unlock(); }
+};
+
+#endif
 
 /// SplitPoint struct stores information shared by the threads searching in
 /// parallel below the same split point. It is populated at splitting time.
@@ -114,7 +126,7 @@ struct Thread : public ThreadBase {
   Thread();
   virtual void idle_loop();
   bool cutoff_occurred() const;
-  bool available_to(const Thread* master) const;
+  bool can_join(const SplitPoint* sp) const;
 
   void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
              Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);
@@ -161,7 +173,7 @@ struct ThreadPool : public std::vector<Thread*> {
 
   MainThread* main() { return static_cast<MainThread*>(at(0)); }
   void read_uci_options();
-  Thread* available_slave(const Thread* master) const;
+  Thread* available_slave(const SplitPoint* sp) const;
   void wait_for_think_finished();
   void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);