handle ctrl+c during datagen properly on non-windows

Bench: 4827402

Author: Ciekce

CMakeLists.txt

@@ -63,7 +63,7 @@ set(STORMPHRAX_COMMON_SRC src/types.h src/main.cpp src/uci.h src/uci.cpp src/cor
 	src/eval/nnue/layers/scale.h src/eval/nnue/layers/dequantize.h src/util/simd/x64common.h src/util/simd/avx512.h
 	src/util/simd/avx2.h src/util/simd/sse41.h src/util/simd/neon.h src/util/simd/none.h src/util/align.h
 	src/3rdparty/zstd/zstddeclib.c src/eval/nnue/io_impl.h src/eval/nnue/io_impl.cpp src/datagen/fen.h
-	src/datagen/fen.cpp)
+	src/datagen/fen.cpp src/util/ctrlc.h src/util/ctrlc.cpp)
 
 set(STORMPHRAX_BMI2_SRC src/attacks/bmi2/data.h src/attacks/bmi2/attacks.h src/attacks/bmi2/attacks.cpp)
 set(STORMPHRAX_NON_BMI2_SRC src/attacks/black_magic/data.h src/attacks/black_magic/attacks.h

Makefile

@@ -14,7 +14,7 @@ endif
 PGO = on
 COMMIT_HASH = off
 
-SOURCES_COMMON := src/main.cpp src/uci.cpp src/util/split.cpp src/position/position.cpp src/movegen.cpp src/search.cpp src/util/timer.cpp src/pretty.cpp src/ttable.cpp src/limit/time.cpp src/eval/nnue.cpp src/perft.cpp src/bench.cpp src/tunable.cpp src/opts.cpp src/3rdparty/fathom/tbprobe.cpp src/datagen/datagen.cpp src/wdl.cpp src/cuckoo.cpp src/datagen/marlinformat.cpp src/datagen/viriformat.cpp src/datagen/fen.cpp src/tb.cpp src/3rdparty/zstd/zstddeclib.c src/eval/nnue/io_impl.cpp
+SOURCES_COMMON := src/main.cpp src/uci.cpp src/util/split.cpp src/position/position.cpp src/movegen.cpp src/search.cpp src/util/timer.cpp src/pretty.cpp src/ttable.cpp src/limit/time.cpp src/eval/nnue.cpp src/perft.cpp src/bench.cpp src/tunable.cpp src/opts.cpp src/3rdparty/fathom/tbprobe.cpp src/datagen/datagen.cpp src/wdl.cpp src/cuckoo.cpp src/datagen/marlinformat.cpp src/datagen/viriformat.cpp src/datagen/fen.cpp src/tb.cpp src/3rdparty/zstd/zstddeclib.c src/eval/nnue/io_impl.cpp src/util/ctrlc.cpp
 SOURCES_BMI2 := src/attacks/bmi2/attacks.cpp
 SOURCES_BLACK_MAGIC := src/attacks/black_magic/attacks.cpp
 

src/datagen/datagen.cpp

@@ -26,14 +26,6 @@
 #include <optional>
 #include <cassert>
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#else
-//TODO
-#endif
-
 #include "../limit/limit.h"
 #include "../search.h"
 #include "../movegen.h"
@@ -44,6 +36,7 @@
 #include "viriformat.h"
 #include "marlinformat.h"
 #include "fen.h"
+#include "../util/ctrlc.h"
 
 // abandon hope all ye who enter here
 // my search was not written with this in mind
@@ -58,16 +51,10 @@ namespace stormphrax::datagen
 
 		auto initCtrlCHandler()
 		{
-#ifdef _WIN32
-			if (!SetConsoleCtrlHandler([](DWORD dwCtrlType) -> BOOL
-				{
-					s_stop.store(true, std::memory_order::seq_cst);
-					return TRUE;
-				}, TRUE))
-				std::cerr << "failed to set ctrl+c handler" << std::endl;
-#else
-			//TODO
-#endif
+			util::signal::addCtrlCHandler([]
+			{
+				s_stop.store(true, std::memory_order::seq_cst);
+			});
 		}
 
 		class DatagenNodeLimiter final : public limit::ISearchLimiter

src/main.cpp

@@ -23,6 +23,7 @@
 #include "eval/nnue.h"
 #include "tunable.h"
 #include "cuckoo.h"
+#include "util/ctrlc.h"
 
 #if SP_EXTERNAL_TUNE
 #include "util/split.h"
@@ -32,6 +33,8 @@ using namespace stormphrax;
 
 auto main(i32 argc, const char *argv[]) -> i32
 {
+	util::signal::init();
+
 	tunable::init();
 	cuckoo::init();
 

src/util/ctrlc.cpp

@@ -0,0 +1,79 @@
+/*
+ * Stormphrax, a UCI chess engine
+ * Copyright (C) 2024 Ciekce
+ *
+ * Stormphrax is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Stormphrax is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Stormphrax. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ctrlc.h"
+
+#include <iostream>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <Windows.h>
+#else
+#include <signal.h>
+#endif
+
+namespace stormphrax::util::signal
+{
+	namespace
+	{
+		std::vector<CtrlCHandler> s_handlers{};
+	}
+
+	auto addCtrlCHandler(CtrlCHandler handler) -> void
+	{
+		s_handlers.push_back(std::move(handler));
+	}
+
+	auto init() -> void
+	{
+#ifdef _WIN32
+		const auto result = SetConsoleCtrlHandler([](DWORD dwCtrlType) -> BOOL
+		{
+			if (dwCtrlType == CTRL_BREAK_EVENT)
+				return FALSE;
+
+			for (auto &handler : s_handlers)
+			{
+				handler();
+			}
+
+			return TRUE;
+		}, TRUE);
+
+		if (!result)
+			std::cerr << "failed to set ctrl+c handler" << std::endl;
+#else
+		struct sigaction action {
+			.sa_flags = SA_RESTART
+		};
+
+		// on some platforms this is a union, and C++ doesn't support nested designated initialisers
+		action.sa_handler = [](int signal)
+		{
+			for (auto &handler : s_handlers)
+			{
+				handler();
+			}
+		};
+
+		if (sigaction(SIGINT, &action, nullptr))
+			std::cerr << "failed to set ctrl+c handler" << std::endl;
+#endif
+	}
+}

src/util/ctrlc.h

@@ -0,0 +1,31 @@
+/*
+ * Stormphrax, a UCI chess engine
+ * Copyright (C) 2024 Ciekce
+ *
+ * Stormphrax is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Stormphrax is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Stormphrax. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "../types.h"
+
+#include <functional>
+
+namespace stormphrax::util::signal
+{
+	using CtrlCHandler = std::function<void()>;
+	auto addCtrlCHandler(CtrlCHandler handler) -> void;
+
+	auto init() -> void;
+}

version.txt

@@ -1 +1 @@
-5.0.29
+5.0.30