summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrsc <rsc>2009-05-31 05:13:51 +0000
committerrsc <rsc>2009-05-31 05:13:51 +0000
commit27ff8f0e6f56e5f84688bcd41a7b4018b4e61173 (patch)
tree03ea4e9e6ae6ae2472ff42c2213dc335e88b7b3b /proc.c
parent34295f461a416e40bb76e67c568a761222dc6913 (diff)
downloadxv6-labs-27ff8f0e6f56e5f84688bcd41a7b4018b4e61173.tar.gz
xv6-labs-27ff8f0e6f56e5f84688bcd41a7b4018b4e61173.tar.bz2
xv6-labs-27ff8f0e6f56e5f84688bcd41a7b4018b4e61173.zip
compile fixes
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/proc.c b/proc.c
index 9ab4922..554ad28 100644
--- a/proc.c
+++ b/proc.c
@@ -29,7 +29,6 @@ pinit(void)
static struct proc*
allocproc(void)
{
- int i;
struct proc *p;
acquire(&ptable.lock);
@@ -209,7 +208,6 @@ void
scheduler(void)
{
struct proc *p;
- int i;
for(;;){
// Enable interrupts on this processor, in lieu of saving intena.
@@ -327,7 +325,7 @@ wakeup1(void *chan)
{
struct proc *p;
- for(p = proc; p < &proc[NPROC]; p++)
+ for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
if(p->state == SLEEPING && p->chan == chan)
p->state = RUNNABLE;
}
@@ -414,7 +412,7 @@ int
wait(void)
{
struct proc *p;
- int i, havekids, pid;
+ int havekids, pid;
acquire(&ptable.lock);
for(;;){
@@ -465,7 +463,7 @@ procdump(void)
[RUNNING] "run ",
[ZOMBIE] "zombie"
};
- int i, j;
+ int i;
struct proc *p;
char *state;
uint pc[10];
@@ -480,8 +478,8 @@ procdump(void)
cprintf("%d %s %s", p->pid, state, p->name);
if(p->state == SLEEPING){
getcallerpcs((uint*)p->context->ebp+2, pc);
- for(j=0; j<10 && pc[j] != 0; j++)
- cprintf(" %p", pc[j]);
+ for(i=0; i<10 && pc[i] != 0; i++)
+ cprintf(" %p", pc[i]);
}
cprintf("\n");
}