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

terminate(): do not iterate process hash if no children processes exist

Browse Source
This commit is contained in:
Balazs Gerofi
2017-06-08 14:53:57 +09:00
parent 5758dba7cf
commit 66fad4c7a4
2 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/host.c
View File

@@ -625,7 +625,7 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
syscall_channel_send(resp_channel, &pckt); syscall_channel_send(resp_channel, &pckt);
rc = do_kill(NULL, info.pid, info.tid, info.sig, &info.info, 0); rc = do_kill(NULL, info.pid, info.tid, info.sig, &info.info, 0);
kprintf("SCD_MSG_SEND_SIGNAL: do_kill(pid=%d, tid=%d, sig=%d)=%d\n", info.pid, info.tid, info.sig, rc); dkprintf("SCD_MSG_SEND_SIGNAL: do_kill(pid=%d, tid=%d, sig=%d)=%d\n", info.pid, info.tid, info.sig, rc);
ret = 0; ret = 0;
break; break;

2
kernel/syscall.c
View File

@@ -811,6 +811,7 @@ terminate(int rc, int sig)
kfree(ids); kfree(ids);
} }
if (!list_empty(&proc->children_list)) {
// clean up children // clean up children
for(i = 0; i < HASH_SIZE; i++){ for(i = 0; i < HASH_SIZE; i++){
mcs_rwlock_writer_lock(&resource_set->process_hash->lock[i], mcs_rwlock_writer_lock(&resource_set->process_hash->lock[i],
@@ -854,6 +855,7 @@ terminate(int rc, int sig)
mcs_rwlock_writer_unlock(&resource_set->process_hash->lock[i], mcs_rwlock_writer_unlock(&resource_set->process_hash->lock[i],
&lock); &lock);
} }
}
dkprintf("terminate,pid=%d\n", proc->pid); dkprintf("terminate,pid=%d\n", proc->pid);