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

propagate exit code and signal

Browse Source
This commit is contained in:
Tomoki Shirasawa
2013-12-10 14:40:22 +09:00
parent 6d9bf6ad84
commit daec3b2f32
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
executer/user/mcexec.c
View File

@@ -858,6 +858,8 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
struct syscall_wait_desc w; struct syscall_wait_desc w;
long ret; long ret;
char *fn; char *fn;
int sig;
int term;
w.cpu = cpu; w.cpu = cpu;
@@ -909,13 +911,15 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
case __NR_exit: case __NR_exit:
case __NR_exit_group: case __NR_exit_group:
sig = 0;
term = 0;
do_syscall_return(fd, cpu, 0, 0, 0, 0, 0); do_syscall_return(fd, cpu, 0, 0, 0, 0, 0);
__dprintf("__NR_exit/__NR_exit_group: %ld (cpu_id: %d)\n", __dprintf("__NR_exit/__NR_exit_group: %ld (cpu_id: %d)\n",
w.sr.args[0], cpu); w.sr.args[0], cpu);
if(w.sr.number == __NR_exit_group){ if(w.sr.number == __NR_exit_group){
int sig = w.sr.args[0] & 0x7f; sig = w.sr.args[0] & 0x7f;
int term = (w.sr.args[0] & 0xff00) >> 8; term = (w.sr.args[0] & 0xff00) >> 8;
if(sig) if(sig)
fprintf(stderr, "Terminate by signal %d\n", sig); fprintf(stderr, "Terminate by signal %d\n", sig);
else if(term) else if(term)
@@ -933,7 +937,11 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
mc_cmd_server_exit(); mc_cmd_server_exit();
__dprint("mccmd server exited\n"); __dprint("mccmd server exited\n");
#endif #endif
exit(0); if(sig){
signal(sig, SIG_DFL);
kill(getpid(), sig);
}
exit(term);
//pthread_mutex_unlock(lock); //pthread_mutex_unlock(lock);
return w.sr.args[0]; return w.sr.args[0];