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-03-19 22:36:27 +01:00
parent 5f8518fe23
commit dbafdf6744
5 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controller/controller.cpp
View file

@ -596,10 +596,10 @@ int main(int argc, char **argv){
Controller::conf.activate();
uint64_t reTimer = 0;
while (Controller::conf.is_active){
Util::Procs::fork_prepare();
pid_t pid = fork();
if (pid == 0){
Util::Procs::handler_set = false;
Util::Procs::reaper_thread = 0;
Util::Procs::fork_complete();
{
struct sigaction new_action;
new_action.sa_sigaction = handleUSR1;
@ -609,6 +609,7 @@ int main(int argc, char **argv){
}
return main_loop(argc, argv);
}
Util::Procs::fork_complete();
if (pid == -1){
FAIL_MSG("Unable to spawn controller process!");
return 2;

11
src/input/input.cpp
View file

@ -310,11 +310,8 @@ namespace Mist {
streamStatus.master = false;
if (streamStatus){streamStatus.mapped[0] = STRMSTAT_INIT;}
}
//Abandon all semaphores, ye who enter here.
playerLock.abandon();
pullLock.abandon();
if (!preRun()){return 0;}
int ret = run();
int ret = 0;
if (preRun()){ret = run();}
if (playerLock){
playerLock.unlink();
char pageName[NAME_BUFFER_SIZE];
@ -322,14 +319,17 @@ namespace Mist {
streamStatus.init(pageName, 1, true, false);
streamStatus.close();
}
playerLock.unlink();
pullLock.unlink();
return ret;
}
uint64_t reTimer = 0;
while (config->is_active){
Util::Procs::fork_prepare();
pid_t pid = fork();
if (pid == 0){
Util::Procs::fork_complete();
if (playerLock){
//Re-init streamStatus, previously closed
char pageName[NAME_BUFFER_SIZE];
@ -344,6 +344,7 @@ namespace Mist {
if (!preRun()){return 0;}
return run();
}
Util::Procs::fork_complete();
if (pid == -1){
FAIL_MSG("Unable to spawn input process");
//We failed. Release the kra... semaphores!