ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't kill everything if fork failed

Browse Source
This commit is contained in:
Deve 2018-08-15 22:10:00 +02:00
parent 73c264df94
commit c43975c03a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/utils/separate_process.cpp
View File

@ -132,22 +132,26 @@ SeparateProcess::~SeparateProcess()
close(m_child_stdin_write);
close(m_child_stdout_read);
}
kill(m_child_pid, SIGTERM);
for (int i = 0; i < 5; i++)
if (m_child_pid != -1)
{
int status;
if (waitpid(m_child_pid, &status, WNOHANG) == m_child_pid)
kill(m_child_pid, SIGTERM);
for (int i = 0; i < 5; i++)
{
dead = true;
break;
int status;
if (waitpid(m_child_pid, &status, WNOHANG) == m_child_pid)
{
dead = true;
break;
}
StkTime::sleep(1000);
}
if (!dead)
{
Log::info("SeparateProcess", "Timeout waiting for child process to "
"self-destroying, killing it anyway");
kill(m_child_pid, SIGKILL);
}
StkTime::sleep(1000);
}
if (!dead)
{
Log::info("SeparateProcess", "Timeout waiting for child process to "
"self-destroying, killing it anyway");
kill(m_child_pid, SIGKILL);
}
#endif
Log::info("SeparateProcess", "Destroyed");