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

mcctrl: Add mcexec_terminate_thread_unsafe()

Browse Source 
Change-Id: I6ca54cdac2ab9449d40b22f7329f1a215e5aa33b
This commit is contained in:
Masamichi Takagi
2018-09-04 19:29:31 +09:00
parent ba93b83d68
commit c71291a429
3 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
executer/user/mcexec.c
View File

@@ -3036,17 +3036,17 @@ create_tracer(unsigned long user_start, unsigned long user_end)
sig = 0;
waitpid(-1, &st, __WALL);
if (WIFEXITED(st) || WIFSIGNALED(st)) {
unsigned long term_param[4];
struct terminate_thread_desc term_desc;
term_param[0] = uti_desc->pid;
term_param[1] = uti_desc->tid;
term_param[3] = uti_desc->key;
term_desc.pid = uti_desc->pid;
term_desc.tid = uti_desc->tid;
term_desc.tsk = uti_desc->key;
code = st;
if (exited == 2) { /* exit_group */
code |= 0x0000000100000000;
}
term_param[2] = code;
term_desc.sig = code;
/* How return_syscall() is called depends on how utility thread exits:
exit:
@@ -3063,7 +3063,7 @@ create_tracer(unsigned long user_start, unsigned long user_end)
*/
if (exited == 1 || exited == 2) {
__dprintf("calling MCEXEC_UP_TERMINATE_THREAD,exited=%d,code=%lx\n", exited, code);
if (ioctl(fd, MCEXEC_UP_TERMINATE_THREAD, term_param) != 0) {
if (ioctl(fd, MCEXEC_UP_TERMINATE_THREAD, &term_desc) != 0) {
fprintf(stderr, "%s: INFO: MCEXEC_UP_TERMINATE_THREAD returned %d\n", __FUNCTION__, errno);
}
}