jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #214 from morphis/f/fork-session-mgr

Browse source 
Start session manager when not already running
This commit is contained in:
Simon Fels 2017-05-07 12:05:53 +02:00 • committed by GitHub
commit da20611a6c
16 changed files with 290 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
external/process-cpp-minimal/src/core/posix/child_process.cpp vendored
View file

@ -303,7 +303,7 @@ struct ChildProcess::Private
~Private()
{
// Check if we are in the original parent process.
if (original_parent_pid == getpid())
if (original_parent_pid == getpid() && !dont_kill_on_cleanup)
{
// If so, check if we are considering a valid pid here.
// If so, we kill the original child.
@ -333,6 +333,8 @@ struct ChildProcess::Private
// is called from the child process.
pid_t original_parent_pid;
pid_t original_child_pid;
bool dont_kill_on_cleanup = false;
};
ChildProcess ChildProcess::invalid()
@ -395,6 +397,11 @@ wait::Result ChildProcess::wait_for(const wait::Flags& flags)
return result;
}
void ChildProcess::dont_kill_on_cleanup()
{
d->dont_kill_on_cleanup = true;
}
#ifndef ANDROID
std::istream& ChildProcess::cerr()
{