clear killed flag in exit

idecref cwd in exit
This commit is contained in:
rtm 2006-08-29 19:59:52 +00:00
parent dfcc5b997c
commit 7a37578e9e
6 changed files with 12 additions and 12 deletions

View file

@ -150,7 +150,7 @@ createdelete()
}
if(pid)
wait();
exit();
else
exit();
@ -160,8 +160,10 @@ createdelete()
fd = open(name, 0);
if((i == 0 || i >= n/2) && fd < 0){
printf(1, "oops createdelete %s didn't exist\n", name);
exit();
} else if((i >= 1 && i < n/2) && fd >= 0){
printf(1, "oops createdelete %s did exist\n", name);
exit();
}
if(fd >= 0)
close(fd);
@ -171,8 +173,10 @@ createdelete()
fd = open(name, 0);
if((i == 0 || i >= n/2) && fd < 0){
printf(1, "oops createdelete %s didn't exist\n", name);
exit();
} else if((i >= 1 && i < n/2) && fd >= 0){
printf(1, "oops createdelete %s did exist\n", name);
exit();
}
if(fd >= 0)
close(fd);

4
proc.c
View file

@ -338,6 +338,9 @@ proc_exit(void)
}
}
idecref(cp->cwd);
cp->cwd = 0;
acquire(&proc_table_lock);
// Wake up our parent.
@ -351,6 +354,7 @@ proc_exit(void)
p->ppid = 1;
// Jump into the scheduler, never to return.
cp->killed = 0;
cp->state = ZOMBIE;
sched();
panic("zombie exit");

5
proc.h
View file

@ -46,12 +46,7 @@ struct proc{
int killed;
struct fd *fds[NOFILE];
struct inode *cwd;
uint esp; // kernel stack pointer
uint ebp; // kernel frame pointer
struct jmpbuf jmpbuf;
struct trapframe *tf; // points into kstack, used to find user regs
};

2
sh.c
View file

@ -22,7 +22,7 @@ char *argv[MAXARGS];
char argv0buf[BUFSIZ];
int argc;
int debug = 1;
int debug = 0;
int parse(char *s);
void runcmd(void);

View file

@ -113,7 +113,6 @@ sys_pipe(void)
return 0;
oops:
cprintf("sys_pipe failed\n");
if(rfd)
fd_close(rfd);
if(wfd)
@ -602,14 +601,12 @@ sys_exec(void)
return 0;
bad:
cprintf("exec failed early\n");
if(mem)
kfree(mem, sz);
iput(ip);
return -1;
bad2:
cprintf("exec failed late\n");
iput(ip);
proc_exit();
return 0;