diff options
author | Brad King <brad.king@kitware.com> | 2023-10-27 23:18:09 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-11-17 13:49:21 (GMT) |
commit | 6ef03ca03e20c3866ae42448c5c25a6bf57536cb (patch) | |
tree | 5b0297a40566756beabc0c2d6a705ecf3f9f49c5 | |
parent | 6f8532fbfac3912fcb0e8729d549f2bfb045c64e (diff) | |
download | CMake-6ef03ca03e20c3866ae42448c5c25a6bf57536cb.zip CMake-6ef03ca03e20c3866ae42448c5c25a6bf57536cb.tar.gz CMake-6ef03ca03e20c3866ae42448c5c25a6bf57536cb.tar.bz2 |
cmUVSignalHackRAII: Drop outdated and unused libuv SA_RESTART workaround
It is only needed for libuv < 1.19, but since commit c050d6a01e
(string(TIMESTAMP): add %f specifier for microseconds, 2022-01-27,
v3.23.0-rc1~59^2) we require libuv >= 1.28.
-rw-r--r-- | Source/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 4 | ||||
-rw-r--r-- | Source/cmUVSignalHackRAII.h | 45 | ||||
-rw-r--r-- | Source/cmWorkerPool.cxx | 7 |
4 files changed, 0 insertions, 57 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 13eade3..eafb3b8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -450,7 +450,6 @@ add_library( cmUVProcessChain.h cmUVStream.h cmUVStreambuf.h - cmUVSignalHackRAII.h cmVariableWatch.cxx cmVariableWatch.h cmVersion.cxx diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index ca07a08..55e5249 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -40,7 +40,6 @@ #include "cmRange.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmUVSignalHackRAII.h" // IWYU pragma: keep #include "cmWorkingDirectory.h" namespace cmsys { @@ -132,9 +131,6 @@ void cmCTestMultiProcessHandler::RunTests() if (this->HasCycles || this->HasInvalidGeneratedResourceSpec) { return; } -#ifdef CMAKE_UV_SIGNAL_HACK - cmUVSignalHackRAII hackRAII; -#endif this->TestHandler->SetMaxIndex(this->FindMaxIndex()); uv_loop_init(&this->Loop); diff --git a/Source/cmUVSignalHackRAII.h b/Source/cmUVSignalHackRAII.h deleted file mode 100644 index 60e4ca8..0000000 --- a/Source/cmUVSignalHackRAII.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#pragma once -#include "cmConfigure.h" // IWYU pragma: keep - -#include <cm3p/uv.h> - -#if defined(CMAKE_USE_SYSTEM_LIBUV) && !defined(_WIN32) && \ - UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR < 19 -# define CMAKE_UV_SIGNAL_HACK -# include "cmUVHandlePtr.h" -/* - libuv does not use SA_RESTART on its signal handler, but C++ streams - depend on it for reliable i/o operations. This RAII helper convinces - libuv to install its handler, and then revises the handler to add the - SA_RESTART flag. We use a distinct uv loop that never runs to avoid - ever really getting a callback. libuv may fill the hack loop's signal - pipe and then stop writing, but that won't break any real loops. - */ -class cmUVSignalHackRAII -{ - uv_loop_t HackLoop; - cm::uv_signal_ptr HackSignal; - static void HackCB(uv_signal_t*, int) {} - -public: - cmUVSignalHackRAII() - { - uv_loop_init(&this->HackLoop); - this->HackSignal.init(this->HackLoop); - this->HackSignal.start(HackCB, SIGCHLD); - struct sigaction hack_sa; - sigaction(SIGCHLD, nullptr, &hack_sa); - if (!(hack_sa.sa_flags & SA_RESTART)) { - hack_sa.sa_flags |= SA_RESTART; - sigaction(SIGCHLD, &hack_sa, nullptr); - } - } - ~cmUVSignalHackRAII() - { - this->HackSignal.stop(); - uv_loop_close(&this->HackLoop); - } -}; -#endif diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx index 27cdbba..dd8f459 100644 --- a/Source/cmWorkerPool.cxx +++ b/Source/cmWorkerPool.cxx @@ -18,7 +18,6 @@ #include "cmRange.h" #include "cmStringAlgorithms.h" #include "cmUVHandlePtr.h" -#include "cmUVSignalHackRAII.h" // IWYU pragma: keep /** * @brief libuv pipe buffer class @@ -516,9 +515,6 @@ public: static void UVSlotEnd(uv_async_t* handle); // -- UV loop -#ifdef CMAKE_UV_SIGNAL_HACK - std::unique_ptr<cmUVSignalHackRAII> UVHackRAII; -#endif std::unique_ptr<uv_loop_t> UVLoop; cm::uv_async_ptr UVRequestBegin; cm::uv_async_ptr UVRequestEnd; @@ -563,9 +559,6 @@ cmWorkerPoolInternal::cmWorkerPoolInternal(cmWorkerPool* pool) { // Initialize libuv loop uv_disable_stdio_inheritance(); -#ifdef CMAKE_UV_SIGNAL_HACK - UVHackRAII = cm::make_unique<cmUVSignalHackRAII>(); -#endif this->UVLoop = cm::make_unique<uv_loop_t>(); uv_loop_init(this->UVLoop.get()); } |