summaryrefslogtreecommitdiff
path: root/kernel/proc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2022-08-11 14:22:00 -0400
committerFrans Kaashoek <[email protected]>2022-08-11 14:22:00 -0400
commit4f716c8550b406c3e4b3e0c21b986ef99bc06c40 (patch)
tree282dde85659ea25f81c03a4368efa909df65f58e /kernel/proc.c
parent429c7b717edd4c23d3666327986052b9b6eb29eb (diff)
downloadxv6-labs-4f716c8550b406c3e4b3e0c21b986ef99bc06c40.tar.gz
xv6-labs-4f716c8550b406c3e4b3e0c21b986ef99bc06c40.tar.bz2
xv6-labs-4f716c8550b406c3e4b3e0c21b986ef99bc06c40.zip
Use p->lock to read p->killed
Diffstat (limited to 'kernel/proc.c')
-rw-r--r--kernel/proc.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index b4f8a80..5e37cb7 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -588,7 +588,7 @@ kill(int pid)
for(p = proc; p < &proc[NPROC]; p++){
acquire(&p->lock);
if(p->pid == pid){
- __atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST);
+ p->killed = 1;
if(p->state == SLEEPING){
// Wake process from sleep().
p->state = RUNNABLE;
@@ -601,10 +601,23 @@ kill(int pid)
return -1;
}
+void
+setkilled(struct proc *p)
+{
+ acquire(&p->lock);
+ p->killed = 1;
+ release(&p->lock);
+}
+
int
killed(struct proc *p)
{
- return __atomic_load_n(&p->killed, __ATOMIC_SEQ_CST);
+ int k;
+
+ acquire(&p->lock);
+ k = p->killed;
+ release(&p->lock);
+ return k;
}
// Copy to either a user address, or kernel address,