diff options
author | Brad King <brad.king@kitware.com> | 2018-01-25 09:22:47 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-01-25 09:22:47 -0500 |
commit | 3ec5f7c1a2fbfec42be1012210471f6b532e93a3 (patch) | |
tree | becaaae035f4643922179b7c3fa87652f58a7f51 /Source/CTest/cmCTestMultiProcessHandler.cxx | |
parent | 1ad58d30321757327675451ba6d095b5204b999c (diff) | |
download | cmake-3ec5f7c1a2fbfec42be1012210471f6b532e93a3.tar.gz |
De-duplicate cmUVSignalHackRAII
This was added separately in `cmCTestMultiProcessHandler` and
`cmQtAutoGenerator`. Factor out the duplicate code into a common header
for re-use.
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 45d5bde2c4..2821ab80aa 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -11,6 +11,8 @@ #include "cm_uv.h" +#include "cmUVSignalHackRAII.h" // IWYU pragma: keep + #include "cmsys/FStream.hxx" #include "cmsys/String.hxx" #include "cmsys/SystemInformation.hxx" @@ -25,43 +27,6 @@ #include <stdlib.h> #include <utility> -#if defined(CMAKE_USE_SYSTEM_LIBUV) && !defined(_WIN32) && \ - UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR < 19 -#define CMAKE_UV_SIGNAL_HACK -/* - 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 - class TestComparator { public: |