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

Add POSIX equivalent for detecting parent termination

Browse Source
This commit is contained in:
Benau 2018-03-17 12:26:37 +08:00
parent e66c4eed35
commit 6a963ffcc9
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main_loop.cpp
View File

@ -44,6 +44,10 @@
#include "states_screens/state_manager.hpp"
#include "utils/profiler.hpp"
#ifndef WIN32
#include <unistd.h>
#endif
MainLoop* main_loop = 0;
MainLoop::MainLoop(unsigned parent_pid)
@ -323,6 +327,10 @@ void MainLoop::run()
if (WaitForSingleObject(parent, 0) != WAIT_TIMEOUT)
m_abort = true;
}
#else
// POSIX equivalent
if (m_parent_pid != 0 && getppid() != (int)m_parent_pid)
m_abort = true;
#endif
m_is_last_substep = false;
PROFILER_PUSH_CPU_MARKER("Main loop", 0xFF, 0x00, 0xF7);

4
src/utils/separate_process.cpp
View File

@ -253,6 +253,9 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
}
}
std::string parent_pid = "--parent-process=";
int current_pid = getpid();
parent_pid += StringUtils::toString(current_pid);
child = fork();
if (child == 0)
{
@ -289,6 +292,7 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
argv.push_back(const_cast<char*>(exe_file.c_str()));
for (unsigned i = 0; i < rest_argv.size(); i++)
argv.push_back(const_cast<char*>(rest_argv[i].c_str()));
argv.push_back(const_cast<char*>(parent_pid.c_str()));
argv.push_back(NULL);
execvp(exe.c_str(), argv.data());
Log::error("SeparateProcess", "Error in execl: errnp %d", errno);