lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Kill the build hook rather than shutting it down cleanly

Browse source 
Waiting for the hook to shut down cleanly sometimes seems to lead to
hangs.
This commit is contained in:
Eelco Dolstra 2012-12-19 11:47:42 +01:00
parent 228ea7c2f9
commit fbf0b2fa45
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -710,13 +710,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance()
{
try {
/* Cleanly shut down the hook by closing its stdin if it's not
already building. Otherwise pid's destructor will kill
it. */
if (pid != -1 && toHook.writeSide != -1) {
toHook.writeSide.close();
pid.wait(true);
}
pid.kill();
} catch (...) {
ignoreException();
}