From 2f0b4d698bc48f4efb4b9fdca20f415ec765bf41 Mon Sep 17 00:00:00 2001
From: Frans Kaashoek <kaashoek@mit.edu>
Date: Mon, 22 Aug 2022 19:58:33 -0400
Subject: Use pp instead of np to be more consistent
---
kernel/proc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'kernel/proc.c')
diff --git a/kernel/proc.c b/kernel/proc.c
index 3bb2618..1ed3ee5 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -390,7 +390,7 @@ exit(int status)
int
wait(uint64 addr)
{
- struct proc *np;
+ struct proc *pp;
int havekids, pid;
struct proc *p = myproc();
@@ -399,27 +399,27 @@ wait(uint64 addr)
for(;;){
// Scan through table looking for exited children.
havekids = 0;
- for(np = proc; np < &proc[NPROC]; np++){
- if(np->parent == p){
+ for(pp = proc; pp < &proc[NPROC]; pp++){
+ if(pp->parent == p){
// make sure the child isn't still in exit() or swtch().
- acquire(&np->lock);
+ acquire(&pp->lock);
havekids = 1;
- if(np->state == ZOMBIE){
+ if(pp->state == ZOMBIE){
// Found one.
- pid = np->pid;
- if(addr != 0 && copyout(p->pagetable, addr, (char *)&np->xstate,
- sizeof(np->xstate)) < 0) {
- release(&np->lock);
+ pid = pp->pid;
+ if(addr != 0 && copyout(p->pagetable, addr, (char *)&pp->xstate,
+ sizeof(pp->xstate)) < 0) {
+ release(&pp->lock);
release(&wait_lock);
return -1;
}
- freeproc(np);
- release(&np->lock);
+ freeproc(pp);
+ release(&pp->lock);
release(&wait_lock);
return pid;
}
- release(&np->lock);
+ release(&pp->lock);
}
}
--
cgit v1.2.3