tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Prevent duplicate signals from makeparallel" am: 70aac88a61 am: 52ac801739

Browse source 
am: 06fbe5bec5

Change-Id: I1b162f02dad89e781662ad3a1e9b3f5d654760d0
This commit is contained in:
Dan Willemsen 2017-02-21 23:31:38 +00:00 committed by android-build-merger
commit 06faf20877
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");
}