diff options
| author | Robert Morris <[email protected]> | 2019-07-10 09:24:50 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2019-07-10 09:24:50 -0400 |
| commit | 5eb1685700a7665814f1bcf63fc26f5dbf0f719a (patch) | |
| tree | 1761a1065a9dca8952c864f6bdef4cabf1568160 /kernel/trap.c | |
| parent | 9981bb227093373649acd019d378dfccb54189c8 (diff) | |
| download | xv6-labs-5eb1685700a7665814f1bcf63fc26f5dbf0f719a.tar.gz xv6-labs-5eb1685700a7665814f1bcf63fc26f5dbf0f719a.tar.bz2 xv6-labs-5eb1685700a7665814f1bcf63fc26f5dbf0f719a.zip | |
have kill() lock before looking at p->pid
document wait()'s use of np->parent w/o holding lock.
Diffstat (limited to 'kernel/trap.c')
| -rw-r--r-- | kernel/trap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trap.c b/kernel/trap.c index 27cfd32..eb7f6cf 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -53,6 +53,9 @@ usertrap(void) if(r_scause() == 8){ // system call + if(p->killed) + exit(); + // sepc points to the ecall instruction, // but we want to return to the next instruction. p->tf->epc += 4; |