gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change signal handling at mcexec

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-02-15 17:54:11 +09:00
parent 9a36e7b84a
commit 8b57b2ee57
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
executer/user/mcexec.c
View File

@@ -811,7 +811,7 @@ static void *main_loop_thread_func(void *arg)
return NULL; return NULL;
} }
#define LOCALSIG SIGCHLD #define LOCALSIG SIGURG
void void
sendsig(int sig, siginfo_t *siginfo, void *context) sendsig(int sig, siginfo_t *siginfo, void *context)
@@ -872,8 +872,10 @@ act_sigaction(struct syscall_wait_desc *w)
int sig; int sig;
sig = w->sr.args[0]; sig = w->sr.args[0];
if (sig == SIGCHLD || sig == LOCALSIG)
return;
memset(&act, '\0', sizeof act); memset(&act, '\0', sizeof act);
if (w->sr.args[1] == -1) if (w->sr.args[1] == (unsigned long)SIG_IGN)
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;
else{ else{
act.sa_sigaction = sendsig; act.sa_sigaction = sendsig;
@@ -945,7 +947,7 @@ void init_sigaction(void)
master_tid = gettid(); master_tid = gettid();
for (i = 1; i <= 64; i++) { for (i = 1; i <= 64; i++) {
if (i != SIGKILL && i != SIGSTOP) { if (i != SIGKILL && i != SIGSTOP && i != SIGCHLD) {
struct sigaction act; struct sigaction act;
sigaction(i, NULL, &act); sigaction(i, NULL, &act);
@@ -1714,7 +1716,8 @@ fork_child_out:
/* Parent */ /* Parent */
default: default:
if (read(sync_pipe_fd[0], &sync_msg, 1) != 1) { while ((ret = read(sync_pipe_fd[0], &sync_msg, 1)) == -1 && errno == EINTR);
if (ret != 1) {
fprintf(stderr, "fork(): error reading sync message\n"); fprintf(stderr, "fork(): error reading sync message\n");
child = -1; child = -1;
goto sync_out; goto sync_out;