Skip to content

tooldata_db: Fix signal handling - waiting for multiple processes #3833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoe wants to merge 1 commit into
base: 2.9
Choose a base branch
from
+20 −18
Open

tooldata_db: Fix signal handling - waiting for multiple processes #3833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions src/emc/tooldata/tooldata_db.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,29 +64,31 @@ static int pipes[NUM_PIPES][2];
static bool is_random_toolchanger = 0;
static char db_childname[PATH_MAX];

static void handle_sigchild(int s)
static void handle_sigchild(int /*s*/)
{
pid_t pid;
int status;
while((pid = waitpid(-1, &status, WUNTRACED | WCONTINUED | WNOHANG)) > 0) ;
if (WIFSIGNALED(status)) {
db_live = 0;
fprintf(stderr,"%5d !!!%s terminated by signal %d\n"
,getpid(),db_childname,WTERMSIG(status));
}
if (WIFEXITED(status)) {
db_live = 0;
fprintf(stderr,"%5d ===%s normal exit status=%d\n"
int status = 0;
while((pid = waitpid(-1, &status, WUNTRACED | WCONTINUED | WNOHANG)) > 0) {

if (WIFSIGNALED(status)) {
db_live = 0;
fprintf(stderr,"%5d !!!%s terminated by signal %d\n"
,getpid(),db_childname,WTERMSIG(status));
}
if (WIFEXITED(status)) {
db_live = 0;
fprintf(stderr,"%5d ===%s normal exit status=%d\n"
,getpid(),db_childname,WEXITSTATUS(status));
}
}
#if 0
if (WIFSTOPPED(status)) {
fprintf(stderr,"%5d ===%s stopped\n",getpid(),db_childname);
}
if (WIFCONTINUED(status)) {
fprintf(stderr,"%5d ===%s continued\n",getpid(),db_childname);
}
if (WIFSTOPPED(status)) {
fprintf(stderr,"%5d ===%s stopped\n",getpid(),db_childname);
}
if (WIFCONTINUED(status)) {
fprintf(stderr,"%5d ===%s continued\n",getpid(),db_childname);
}
#endif
}
}

static int fork_create(int myargc,char *const myargv[])
Expand Down
Loading