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

fileincref -> filedup (consistent with idup)

Browse source
This commit is contained in:
rsc 2007-08-27 14:35:09 +00:00
parent 7895178df3
commit 1ccff18b24
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
defs.h
View file

@ -28,7 +28,7 @@ int exec(char*, char**);
// file.c // file.c
struct file* filealloc(void); struct file* filealloc(void);
void fileclose(struct file*); void fileclose(struct file*);
void fileincref(struct file*); struct file* filedup(struct file*);
void fileinit(void); void fileinit(void);
int fileread(struct file*, char*, int n); int fileread(struct file*, char*, int n);
int filestat(struct file*, struct stat*); int filestat(struct file*, struct stat*);

7
file.c
View file

@ -41,14 +41,15 @@ filealloc(void)
} }
// Increment ref count for file f. // Increment ref count for file f.
void struct file*
fileincref(struct file *f) filedup(struct file *f)
{ {
acquire(&file_table_lock); acquire(&file_table_lock);
if(f->ref < 1 || f->type == FD_CLOSED) if(f->ref < 1 || f->type == FD_CLOSED)
panic("fileincref"); panic("filedup");
f->ref++; f->ref++;
release(&file_table_lock); release(&file_table_lock);
return f;
} }
// Read from file f. Addr is kernel address. // Read from file f. Addr is kernel address.

7
proc.c
View file

@ -129,10 +129,9 @@ copyproc(struct proc *p)
} }
memmove(np->mem, p->mem, np->sz); memmove(np->mem, p->mem, np->sz);
for(i = 0; i < NOFILE; i++){ for(i = 0; i < NOFILE; i++)
if((np->ofile[i] = p->ofile[i]) != 0) if(p->ofile[i])
fileincref(np->ofile[i]); np->ofile[i] = filedup(p->ofile[i]);
}
np->cwd = idup(p->cwd); np->cwd = idup(p->cwd);
} }

2
sysfile.c
View file

@ -83,7 +83,7 @@ sys_dup(void)
return -1; return -1;
if((fd=fdalloc(f)) < 0) if((fd=fdalloc(f)) < 0)
return -1; return -1;
fileincref(f); filedup(f);
return fd; return fd;
} }