reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-04 09:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'dedup-uv-signal-hack'

Browse Source 
3ec5f7c1 De-duplicate cmUVSignalHackRAII
1ad58d30 cmUVSignalHackRAII: Use nullptr instead of NULL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1699
This commit is contained in:
Brad King 2018-01-26 13:27:34 +00:00 committed by Kitware Robot
commit 0e793e7bed
4 changed files with 48 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CMakeLists.txt
View File

@ -351,6 +351,7 @@ set(SRCS
cmUuid.cxx
cmUVHandlePtr.cxx
cmUVHandlePtr.h
cmUVSignalHackRAII.h
cmVariableWatch.cxx
cmVariableWatch.h
cmVersion.cxx

39
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -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, NULL, &hack_sa);
if (!(hack_sa.sa_flags & SA_RESTART)) {
hack_sa.sa_flags |= SA_RESTART;
sigaction(SIGCHLD, &hack_sa, NULL);
}
}
~cmUVSignalHackRAII()
{
this->HackSignal.stop();
uv_loop_close(&this->HackLoop);
}
};
#endif
class TestComparator
{
public:

38
Source/cmQtAutoGenerator.h
View File

@ -7,6 +7,7 @@
#include "cmQtAutoGen.h"
#include "cmUVHandlePtr.h"
#include "cmUVSignalHackRAII.h" // IWYU pragma: keep
#include "cm_uv.h"
#include <array>
@ -203,43 +204,6 @@ public:
PipeT UVPipeErr_;
};
#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, NULL, &hack_sa);
if (!(hack_sa.sa_flags & SA_RESTART)) {
hack_sa.sa_flags |= SA_RESTART;
sigaction(SIGCHLD, &hack_sa, NULL);
}
}
~cmUVSignalHackRAII()
{
this->HackSignal.stop();
uv_loop_close(&this->HackLoop);
}
};
#endif
public:
// -- Constructors
cmQtAutoGenerator();

44
Source/cmUVSignalHackRAII.h Normal file
View File

@ -0,0 +1,44 @@
/* 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 "cm_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