hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct handling of reaper thread in forking binaries

Browse source
This commit is contained in:
Thulinma 2021-04-21 17:56:16 +02:00
parent ddd9e8c67d
commit bffd81f27e
5 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/procs.cpp
View file

@ -157,6 +157,28 @@ void Util::Procs::exit_handler() {
FAIL_MSG("Giving up with %d children left.", (int)listcopy.size());
}
// Joins the reaper thread, if any, before a fork
void Util::Procs::fork_prepare(){
tthread::lock_guard<tthread::mutex> guard(plistMutex);
if (handler_set){
thread_handler = false;
if (reaper_thread){
reaper_thread->join();
delete reaper_thread;
reaper_thread = 0;
}
}
}
/// Restarts reaper thread if it was joined
void Util::Procs::fork_complete(){
tthread::lock_guard<tthread::mutex> guard(plistMutex);
if (handler_set){
thread_handler = true;
reaper_thread = new tthread::thread(grim_reaper, 0);
}
}
/// Sets up exit and childsig handlers.
/// Spawns grim_reaper. exit handler despawns grim_reaper
/// Called by every Start* function.