experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If a signal handler runs during select() loop in clixon_event_loop() and unless the signal handler sets clixon_exit, the select will be restarted.

Browse source
This commit is contained in:
Olof hagsand 2021-02-25 22:35:13 +01:00
parent c509868345
commit d5edd64257
5 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/backend/backend_main.c
View file

@ -48,6 +48,7 @@
#include <signal.h>
#include <fcntl.h>
#include <time.h>
#include <wait.h>
#include <syslog.h>
#include <ifaddrs.h>
#include <sys/time.h>
@ -158,6 +159,21 @@ backend_sig_term(int arg)
clicon_exit_set(); /* checked in clixon_event_loop() */
}
/*! wait for killed child
* primary use in case restconf daemon forked using process-control API
* This may cause EINTR in eg select() in clixon_event_loop() which will be ignored
*/
static void
backend_sig_child(int arg)
{
int status;
int pid;
clicon_debug(1, "%s", __FUNCTION__);
if ((pid = waitpid(-1, &status, 0)) != -1 && WIFEXITED(status)){
}
}
/*! Create backend server socket and register callback
* @param[in] h Clicon handle
* @retval s Server socket file descriptor (see socket(2))
@ -996,7 +1012,11 @@ main(int argc,
clicon_err(OE_DAEMON, errno, "Setting signal");
goto done;
}
/* This is in case restconf daemon forked using process-control API */
if (set_signal(SIGCHLD, backend_sig_child, NULL) < 0){
clicon_err(OE_DAEMON, errno, "Setting signal");
goto done;
}
/* Initialize server socket and save it to handle */
if ((ss = backend_server_socket(h)) < 0)
goto done;