max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-27 00:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove "killing process <pid>" messages

Browse source 
They convey no useful information.
This commit is contained in:
Eelco Dolstra 2017-03-16 10:52:28 +01:00
parent 43f158bb08
commit 0ec7f47b00
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libmain/shared.cc
View file

@ -331,14 +331,10 @@ RunPager::~RunPager()
close(STDOUT_FILENO);
pid.wait();
}
} catch (...) {
try {
pid.kill(true);
} catch (...) {
ignoreException();
}
}
}
string showBytes(unsigned long long bytes)

4
src/libstore/build.cc
View file

@ -642,7 +642,7 @@ HookInstance::~HookInstance()
{
try {
toHook.writeSide = -1;
if (pid != -1) pid.kill(true);
if (pid != -1) pid.kill();
} catch (...) {
ignoreException();
}
@ -1437,7 +1437,7 @@ void DerivationGoal::buildDone()
to have terminated. In fact, the builder could also have
simply have closed its end of the pipe, so just to be sure,
kill it. */
int status = hook ? hook->pid.kill(true) : pid.kill(true);
int status = hook ? hook->pid.kill() : pid.kill();
debug(format("builder process for ‘%1%’ finished") % drvPath);

5
src/libutil/util.cc
View file

@ -678,12 +678,11 @@ Pid::operator pid_t()
}
int Pid::kill(bool quiet)
int Pid::kill()
{
assert(pid != -1);
if (!quiet)
printError(format("killing process %1%") % pid);
debug(format("killing process %1%") % pid);
/* Send the requested signal to the child. If it has its own
process group, send the signal to every process in the child

2
src/libutil/util.hh
View file

@ -203,7 +203,7 @@ public:
~Pid();
void operator =(pid_t pid);
operator pid_t();
int kill(bool quiet = false);
int kill();
int wait();
void setSeparatePG(bool separatePG);