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

loolwsd: child exit codes are required before fork new lokit process

Browse source
This commit is contained in:
Henry Castro 2016-02-03 17:35:35 -04:00
parent 1fc3d06e37
commit b7ee46f729
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
loolwsd/LOOLBroker.cpp
View file

@ -949,29 +949,6 @@ int main(int argc, char** argv)
unsigned timeoutCounter = 0;
while (!TerminationFlag)
{
if (forkCounter > 0)
{
std::lock_guard<std::recursive_mutex> lock(forkMutex);
const signed empty = pipeHandler.syncChilds();
const signed total = _childProcesses.size();
// Figure out how many children we need. Always create at least as many
// as configured pre-spawn or one more than requested (whichever is larger).
signed spawn = std::max(static_cast<int>(forkCounter) + 1, numPreSpawnedChildren);
Log::debug() << "Creating " << spawn << " childs. Current Total: "
<< total << ", Empty: " << empty << Log::end;
do
{
if (createLibreOfficeKit(sharePages, loSubPath, jailId) < 0)
Log::error("Error: fork failed.");
}
while (--spawn > 0);
// We've done our best. If need more, retrying will bump the counter.
forkCounter = 0;
}
int status;
const pid_t pid = waitpid(-1, &status, WUNTRACED | WNOHANG);
if (pid > 0)
@ -1019,6 +996,29 @@ int main(int argc, char** argv)
else if (pid < 0)
Log::error("Error: waitpid failed.");
if (forkCounter > 0)
{
std::lock_guard<std::recursive_mutex> lock(forkMutex);
const signed empty = pipeHandler.syncChilds();
const signed total = _childProcesses.size();
// Figure out how many children we need. Always create at least as many
// as configured pre-spawn or one more than requested (whichever is larger).
signed spawn = std::max(static_cast<int>(forkCounter) + 1, numPreSpawnedChildren);
Log::debug() << "Creating " << spawn << " childs. Current Total: "
<< total << ", Empty: " << empty << Log::end;
do
{
if (createLibreOfficeKit(sharePages, loSubPath, jailId) < 0)
Log::error("Error: fork failed.");
}
while (--spawn > 0);
// We've done our best. If need more, retrying will bump the counter.
forkCounter = 0;
}
if (timeoutCounter++ == INTERVAL_PROBES)
{
timeoutCounter = 0;