notify cv

Author: Exclusivefrog28

src/CLI.cpp

@@ -17,9 +17,8 @@ namespace Interface {
             std::getline(std::cin, input);
             currentInstruction = interpret(input);
 
-            while (!ready) {
-                std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            }
+            std::unique_lock lk(m);
+            cv.wait(lk, [this] { return ready; });
             ready = false;
             std::thread thread(&CLI::handleInstruction, this, currentInstruction);
             thread.detach();
@@ -99,16 +98,19 @@ namespace Interface {
                 }
 
                 const Move bestMove = Search::search(board, timeOut);
+                board.makeMove(bestMove);
 
                 std::cout << "bestmove " << bestMove << std::endl;
 
-                board.makeMove(bestMove);
-
                 break;
             }
             default:
                 break;
         }
-        ready = true;
+        {
+            std::lock_guard lk(m);
+            ready = true;
+        }
+        cv.notify_one();
     }
 }

src/CLI.h

@@ -3,6 +3,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <condition_variable>
 
 #include "ChessBoard.h"
 
@@ -43,7 +44,9 @@ namespace Interface {
 	private:
 		ChessBoard board;
 
-		bool ready = true;
+        std::mutex m;
+        std::condition_variable cv;
+        bool ready = true;
 
 		static Instruction interpret(const std::string&string);
 

src/Logger.cpp

@@ -19,6 +19,11 @@ void Logger::start() {
 }
 
 void Logger::end() {
+    {
+        std::lock_guard lk(m);
+        stop = true;
+    }
+    cv.notify_one();
     stop = true;
     processingThread.join();
 #ifdef logtofile
@@ -102,7 +107,6 @@ Logger::~Logger() {
 
 void Logger::threadFunc() {
     while (!stop) {
-        // Keep processing the buffer, wait a bit when it's empty
         if (!processNode()) {
             std::unique_lock lk(m);
             empty = true;

src/Search.cpp

@@ -20,64 +20,69 @@ Move Search::search(ChessBoard &board, const int timeAllowed) {
     const auto start = std::chrono::steady_clock::now();
 
     int i = 1;
-    try {
-        for (; i < 64; ++i) {
-            search.logger.log(std::format("info searching depth {}\n", i));
-            search.logger.logToFile(std::format("starting depth {}\n", i));
+    {
+        std::thread thread(&Search::threadedSearch, &search, i);
+        thread.join();
+        search.lastPV = search.collectPV(i);
 
-            std::thread thread(&Search::threadedSearch, &search, i);
+        i = search.lastPV.size() + 1;
+    }
 
-            std::unique_lock<std::mutex> lk(search.cv_m);
-            search.stop = false;
-            search.finished = false;
+    for (; i < 64; ++i) {
+        search.logger.log(std::format("info searching depth {}\n", i));
+        search.logger.logToFile(std::format("starting depth {}\n", i));
 
-            const auto timeAvailable = start + timeOut - std::chrono::steady_clock::now();
+        std::thread thread(&Search::threadedSearch, &search, i);
 
-            if (search.cv.wait_for(lk, timeAvailable, [&] { return search.finished; })) {
-                thread.join();
-            } else {
-                search.stop = true;
-                thread.join();
-                break;
-            }
+        std::unique_lock<std::mutex> lk(search.cv_m);
+        search.stop = false;
+        search.finished = false;
 
-            bool endEarly = false;
+        const auto now = std::chrono::steady_clock::now();
+        if (now - start >= timeOut){
+            search.stop = true;
+            thread.join();
+            break;
+        }
+        const auto timeAvailable = start + timeOut -now;
 
-            search.lastPV = search.collectPV(i, endEarly);
+        if (search.cv.wait_for(lk, timeAvailable, [&] { return search.finished; })) {
+            thread.join();
+        } else {
+            search.stop = true;
+            thread.join();
+            break;
+        }
 
-            if (endEarly) break;
+        bool endEarly = false;
 
-            if (search.lastPV.size() > i) {
-                i = search.lastPV.size();
-            }
-        }
-#ifdef wasm
-        printf("Depth: %d\n", i - 1);
-        int score = Evaluator::evaluate(board);
-        if (tt.contains(board.hashCode)) {
-            const TranspositionTable::Entry entry = tt.getEntry(board.hashCode, 0);
-            score = entry.score;
-        }
-        printf("Evaluation: %d\nPV: ", score);
-        for (const Move&move: search.lastPV) {
-            printf("%s%s ", Util::positionToString(move.start).c_str(), Util::positionToString(move.end).c_str());
-        }
-        const int occupancy = tt.occupancy();
-        printf("\nBoard hash: %llu", board.hashCode);
-        printf("\nTT reads: %d", tt.reads);
-        printf("\nTT writes: %d", tt.writes);
-        printf("\nTT collisions: %d", tt.collisions);
-        printf("\nTT occupancy: %d", occupancy);
-        printf("\n**************************\n");
-        search.logger.sendInt("updateDepth", i - 1);
-        search.logger.sendInt("updateTTOccupancy", tt.occupancy());
-#endif
+        search.lastPV = search.collectPV(i, endEarly);
 
-        tt.resetCounters();
+        if (endEarly) break;
     }
-    catch (std::exception &e) {
-        std::cout << "Exception while searching: " << e.what() << "| Will try to return PV[0]" << std::endl;
+#ifdef wasm
+    printf("Depth: %d\n", i - 1);
+    int score = Evaluator::evaluate(board);
+    if (tt.contains(board.hashCode)) {
+        const TranspositionTable::Entry entry = tt.getEntry(board.hashCode, 0);
+        score = entry.score;
+    }
+    printf("Evaluation: %d\nPV: ", score);
+    for (const Move&move: search.lastPV) {
+        printf("%s%s ", Util::positionToString(move.start).c_str(), Util::positionToString(move.end).c_str());
     }
+    const int occupancy = tt.occupancy();
+    printf("\nBoard hash: %llu", board.hashCode);
+    printf("\nTT reads: %d", tt.reads);
+    printf("\nTT writes: %d", tt.writes);
+    printf("\nTT collisions: %d", tt.collisions);
+    printf("\nTT occupancy: %d", occupancy);
+    printf("\n**************************\n");
+    search.logger.sendInt("updateDepth", i - 1);
+    search.logger.sendInt("updateTTOccupancy", tt.occupancy());
+#endif
+
+    tt.resetCounters();
 
     search.lastPV = search.collectPV(i);
 
@@ -90,6 +95,7 @@ Move Search::search(ChessBoard &board, const int timeAllowed) {
     }
 
     search.logger.end();
+    std::cout << "Logger stopped" << std::endl;
 
     return search.lastPV[0];
 }