greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more name cleanup

Browse source
This commit is contained in:
rsc 2006-07-16 02:04:58 +00:00
parent 6f2b626d28
commit 4ed974f5ea
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fd.c
View file

@ -37,7 +37,7 @@ fd_alloc()
for(i = 0; i < NFD; i++){ for(i = 0; i < NFD; i++){
if(fds[i].type == FD_CLOSED){ if(fds[i].type == FD_CLOSED){
fds[i].type = FD_NONE; fds[i].type = FD_NONE;
fds[i].count = 1; fds[i].ref = 1;
release(&fd_table_lock); release(&fd_table_lock);
return fds + i; return fds + i;
} }
@ -80,18 +80,16 @@ fd_close(struct fd *fd)
{ {
acquire(&fd_table_lock); acquire(&fd_table_lock);
if(fd->count < 1 || fd->type == FD_CLOSED) if(fd->ref < 1 || fd->type == FD_CLOSED)
panic("fd_close"); panic("fd_close");
fd->count -= 1; if(--fd->ref == 0){
if(fd->count == 0){
if(fd->type == FD_PIPE){ if(fd->type == FD_PIPE){
pipe_close(fd->pipe, fd->writeable); pipe_close(fd->pipe, fd->writeable);
} else { } else {
panic("fd_close"); panic("fd_close");
} }
fd->count = 0; fd->ref = 0;
fd->type = FD_CLOSED; fd->type = FD_CLOSED;
} }
@ -102,8 +100,8 @@ void
fd_incref(struct fd *fd) fd_incref(struct fd *fd)
{ {
acquire(&fd_table_lock); acquire(&fd_table_lock);
if(fd->count < 1 || fd->type == FD_CLOSED) if(fd->ref < 1 || fd->type == FD_CLOSED)
panic("fd_reference"); panic("fd_incref");
fd->count++; fd->ref++;
release(&fd_table_lock); release(&fd_table_lock);
} }

2
fd.h
View file

@ -1,6 +1,6 @@
struct fd { struct fd {
enum { FD_CLOSED, FD_NONE, FD_PIPE } type; enum { FD_CLOSED, FD_NONE, FD_PIPE } type;
int count; // reference count int ref; // reference count
char readable; char readable;
char writeable; char writeable;
struct pipe *pipe; struct pipe *pipe;