ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

nits

Browse source
This commit is contained in:
Robert Morris 2019-10-16 12:27:08 -04:00
parent f2df0fa547
commit 2821d43cc9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/pipe.c
View file

@ -83,7 +83,7 @@ pipewrite(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock); acquire(&pi->lock);
for(i = 0; i < n; i++){ for(i = 0; i < n; i++){
while(pi->nwrite == pi->nread + PIPESIZE){ //DOC: pipewrite-full while(pi->nwrite == pi->nread + PIPESIZE){ //DOC: pipewrite-full
if(pi->readopen == 0 || myproc()->killed){ if(pi->readopen == 0 || pr->killed){
release(&pi->lock); release(&pi->lock);
return -1; return -1;
} }
@ -108,7 +108,7 @@ piperead(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock); acquire(&pi->lock);
while(pi->nread == pi->nwrite && pi->writeopen){ //DOC: pipe-empty while(pi->nread == pi->nwrite && pi->writeopen){ //DOC: pipe-empty
if(myproc()->killed){ if(pr->killed){
release(&pi->lock); release(&pi->lock);
return -1; return -1;
} }

2
kernel/proc.c
View file

@ -116,7 +116,7 @@ found:
// Set up new context to start executing at forkret, // Set up new context to start executing at forkret,
// which returns to user space. // which returns to user space.
memset(&p->context, 0, sizeof p->context); memset(&p->context, 0, sizeof(p->context));
p->context.ra = (uint64)forkret; p->context.ra = (uint64)forkret;
p->context.sp = p->kstack + PGSIZE; p->context.sp = p->kstack + PGSIZE;