Use fast SRWLOCK locks under Windows

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 46dd53ebd1e7919bb937699d649f1996b7553939..b303d31f521e61a6bf61f690cc9b3de3391401fd 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -83,7 +83,6 @@ namespace {
     bool thread_is_available(int slave, int master) const;
     bool thread_should_stop(int threadID) const;
     void wake_sleeping_thread(int threadID);
-    void put_threads_to_sleep();
     void idle_loop(int threadID, SplitPoint* sp);
 
     template <bool Fake>
@@ -501,7 +500,8 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr
   if (UseLogFile)
       LogFile.close();
 
-  ThreadsMgr.put_threads_to_sleep();
+  // This makes all the threads to go to sleep
+  ThreadsMgr.set_active_threads(1);
 
   return !Quit;
 }
@@ -2224,8 +2224,7 @@ split_point_start: // At split points actual search starts from here
 
         // If we are not thinking, wait for a condition to be signaled
         // instead of wasting CPU time polling for work.
-        while (   threadID >= ActiveThreads
-               || threads[threadID].state == THREAD_INITIALIZING)
+        while (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING)
         {
             assert(!sp);
             assert(threadID != 0);
@@ -2235,14 +2234,12 @@ split_point_start: // At split points actual search starts from here
 
             threads[threadID].state = THREAD_AVAILABLE;
 
-#if !defined(_MSC_VER)
             lock_grab(&WaitLock);
-            if (threadID >= ActiveThreads)
-                pthread_cond_wait(&WaitCond[threadID], &WaitLock);
+
+            if (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING)
+                cond_wait(&WaitCond[threadID], &WaitLock);
+
             lock_release(&WaitLock);
-#else
-            WaitForSingleObject(WaitCond[threadID], INFINITE);
-#endif
         }
 
         // If this thread has been assigned work, launch a search
@@ -2305,11 +2302,7 @@ split_point_start: // At split points actual search starts from here
     lock_init(&WaitLock);
 
     for (i = 0; i < MAX_THREADS; i++)
-#if !defined(_MSC_VER)
-        pthread_cond_init(&WaitCond[i], NULL);
-#else
-        WaitCond[i] = CreateEvent(0, FALSE, FALSE, 0);
-#endif
+        cond_init(&WaitCond[i]);
 
     // Initialize splitPoints[] locks
     for (i = 0; i < MAX_THREADS; i++)
@@ -2562,29 +2555,12 @@ split_point_start: // At split points actual search starts from here
 
   void ThreadsManager::wake_sleeping_thread(int threadID) {
 
-    assert(threadID > 0);
-    assert(threads[threadID].state == THREAD_AVAILABLE);
-
-#if !defined(_MSC_VER)
-        pthread_mutex_lock(&WaitLock);
-        pthread_cond_signal(&WaitCond[threadID]);
-        pthread_mutex_unlock(&WaitLock);
-#else
-        SetEvent(WaitCond[threadID]);
-#endif
+     lock_grab(&WaitLock);
+     cond_signal(&WaitCond[threadID]);
+     lock_release(&WaitLock);
   }
 
 
-  // put_threads_to_sleep() makes all the threads go to sleep just before
-  // to leave think(), at the end of the search. Threads should have already
-  // finished the job and should be idle.
-
-  void ThreadsManager::put_threads_to_sleep() {
-
-    // This makes the threads to go to sleep
-    ActiveThreads = 1;
-  }
-
   /// The RootMoveList class
 
   // RootMoveList c'tor