summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-09 17:32:40 +0000
committerrsc <rsc>2007-08-09 17:32:40 +0000
commit9583b476bf0caa3fca61f08dcb8afe138f4b4fb9 (patch)
treeeab343d678599672102009097ea55b35fa5bdc45 /proc.c
parent22330658fff5039b69e6b68ac3f5197c417003b6 (diff)
downloadxv6-labs-9583b476bf0caa3fca61f08dcb8afe138f4b4fb9.tar.gz
xv6-labs-9583b476bf0caa3fca61f08dcb8afe138f4b4fb9.tar.bz2
xv6-labs-9583b476bf0caa3fca61f08dcb8afe138f4b4fb9.zip
try to use cp only for curproc[cpu()]
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/proc.c b/proc.c
index 37adbb4..89eb1d4 100644
--- a/proc.c
+++ b/proc.c
@@ -204,9 +204,9 @@ scheduler(void)
void
sched(void)
{
- struct proc *p = curproc[cpu()];
+ struct proc *cp = curproc[cpu()];
- if(p->state == RUNNING)
+ if(cp->state == RUNNING)
panic("sched running");
if(!holding(&proc_table_lock))
panic("sched proc_table_lock");
@@ -221,10 +221,10 @@ sched(void)
void
yield(void)
{
- struct proc *p = curproc[cpu()];
+ struct proc *cp = curproc[cpu()];
acquire(&proc_table_lock);
- p->state = RUNNABLE;
+ cp->state = RUNNABLE;
sched();
release(&proc_table_lock);
}
@@ -246,9 +246,9 @@ forkret(void)
void
sleep(void *chan, struct spinlock *lk)
{
- struct proc *p = curproc[cpu()];
+ struct proc *cp = curproc[cpu()];
- if(p == 0)
+ if(cp == 0)
panic("sleep");
if(lk == 0)
@@ -266,12 +266,12 @@ sleep(void *chan, struct spinlock *lk)
}
// Go to sleep.
- p->chan = chan;
- p->state = SLEEPING;
+ cp->chan = chan;
+ cp->state = SLEEPING;
sched();
// Tidy up.
- p->chan = 0;
+ cp->chan = 0;
// Reacquire original lock.
if(lk != &proc_table_lock){