strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loolwsd: more frequent zombie reaping in forkit

Browse source 
Change-Id: I10d859880cfd933c38572852f506eedf603e8fad
Reviewed-on: https://gerrit.libreoffice.org/25232
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-05-19 20:27:24 -04:00 committed by Ashod Nakashian
parent cebc99c52d
commit 6ce9868a9c
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
loolwsd/LOOLForKit.cpp
View file

@ -112,6 +112,26 @@ private:
} }
}; };
/// Check if some previously forked kids have died.
static void cleanupChildren()
{
Process::PID exitedChildPid;
int status;
while ((exitedChildPid = waitpid(-1, &status, WNOHANG)) > 0)
{
if (childJails.find(exitedChildPid) != childJails.end())
{
Log::info("Child " + std::to_string(exitedChildPid) + " has exited, removing its jail '" + childJails[exitedChildPid] + "'");
Util::removeFile(childJails[exitedChildPid], true);
childJails.erase(exitedChildPid);
}
else
{
Log::error("Unknown child " + std::to_string(exitedChildPid) + " has exited");
}
}
}
static int createLibreOfficeKit(const std::string& childRoot, static int createLibreOfficeKit(const std::string& childRoot,
const std::string& sysTemplate, const std::string& sysTemplate,
const std::string& loTemplate, const std::string& loTemplate,
@ -142,26 +162,10 @@ static int createLibreOfficeKit(const std::string& childRoot,
else else
{ {
// Parent // Parent
// Check if some previously forked kids have died
Process::PID exitedChildPid;
int status;
while ((exitedChildPid = waitpid(-1, &status, WNOHANG)) > 0)
{
if (childJails.find(exitedChildPid) != childJails.end())
{
Log::info("Child " + std::to_string(exitedChildPid) + " has exited, removing its jail '" + childJails[exitedChildPid] + "'");
Util::removeFile(childJails[exitedChildPid], true);
childJails.erase(exitedChildPid);
}
else
{
Log::error("Unknown child " + std::to_string(exitedChildPid) + " has exited");
}
}
if (pid < 0) if (pid < 0)
{
Log::syserror("Fork failed."); Log::syserror("Fork failed.");
}
else else
{ {
Log::info("Forked kit [" + std::to_string(pid) + "]."); Log::info("Forked kit [" + std::to_string(pid) + "].");
@ -343,6 +347,10 @@ int main(int argc, char** argv)
// If we need to spawn more, retry later. // If we need to spawn more, retry later.
ForkCounter = (newInstances >= ForkCounter ? 0 : ForkCounter - newInstances); ForkCounter = (newInstances >= ForkCounter ? 0 : ForkCounter - newInstances);
} }
else
{
cleanupChildren();
}
} }
close(pipeFd); close(pipeFd);