openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Prevent duplicate signals from makeparallel" 

am: 70aac88a61

Change-Id: Iade687bc2bfe56a357b0c8215b5f03cfdec2df9d
This commit is contained in:
Dan Willemsen 2017-02-21 23:27:14 +00:00 committed by android-build-merger
parent b98cde50aa 70aac88a61
commit 52ac801739
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/makeparallel/makeparallel.cpp
View File

@ -357,8 +357,8 @@ int main(int argc, char* argv[]) {
static pid_t pid;
// Set up signal handlers to forward SIGHUP, SIGINT, SIGQUIT, SIGTERM, and
// SIGALRM to child
// Set up signal handlers to forward SIGTERM to child
// Assume that all other signals are sent to the entire process group
struct sigaction action = {};
action.sa_flags = SA_SIGINFO | SA_RESTART,
action.sa_sigaction = [](int signal, siginfo_t*, void*) {
@ -368,11 +368,7 @@ int main(int argc, char* argv[]) {
};
int ret = 0;
if (!ret) ret = sigaction(SIGHUP, &action, NULL);
if (!ret) ret = sigaction(SIGINT, &action, NULL);
if (!ret) ret = sigaction(SIGQUIT, &action, NULL);
if (!ret) ret = sigaction(SIGTERM, &action, NULL);
if (!ret) ret = sigaction(SIGALRM, &action, NULL);
if (ret < 0) {
error(errno, errno, "sigaction failed");
}