mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-30 14:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fd: new abstraction

Browse Source
This commit is contained in:
Matheus
2022-09-18 16:21:19 -03:00
parent 73a8584a72
commit 41d6e7230e
11 changed files with 216 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/syscalls/close.c
+6 -29
View File
@@ -6,40 +6,17 @@
syscallret syscall_close(int ifd){
syscallret retv;
retv.ret = -1;
retv.ret = 0;
retv.errno = 0;
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
int err = fd_free(&proc->fdtable, ifd);
spinlock_acquire(&proc->fdlock);
if(proc->fdcount <= ifd || fd->node == NULL || (fd->flags & FD_FLAGS_READ) == 0){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
int ret = vfs_close(fd->node);
if(ret){
retv.errno = ret;
goto _ret;
if(err){
retv.errno = err;
retv.ret = -1;
}
// the fd table isn't resized on a close
// although that can be added if it becomes an issue
fd->node = NULL;
retv.ret = 0;
retv.errno = 0;
_ret:
spinlock_release(&fd->lock);
return retv;
}
src/sys/syscalls/fstat.c
+9 -13
View File
@@ -17,22 +17,18 @@ syscallret syscall_fstat(int ifd, stat* st){
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
spinlock_acquire(&proc->fdlock);
if(proc->fdcount <= ifd || fd->node == NULL || (fd->flags & FD_FLAGS_READ) == 0){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
fd_t* fd;
int err = fd_access(&proc->fdtable, &fd, ifd);
if(err){
retv.errno = err;
return retv;
}
memcpy(st, &fd->node->st, sizeof(stat)); // XXX user memcpy
spinlock_release(&fd->lock);
fd_release(fd);
retv.errno = 0;
retv.ret = 0;
src/sys/syscalls/isatty.c
+9 -13
View File
@@ -12,26 +12,22 @@ syscallret syscall_isatty(int ifd){
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
fd_t* fd;
int ret = fd_access(&proc->fdtable, &fd, ifd);
spinlock_acquire(&proc->fdlock);
if(proc->fdcount <= ifd || fd->node == NULL){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
return retv;
}
if(ret){
retv.errno = ret;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
int ret = vfs_isatty(fd->node);
ret = vfs_isatty(fd->node);
retv.errno = ret;
retv.ret = retv.errno == ENOTTY ? 0 : 1;
spinlock_release(&fd->lock);
fd_release(fd);
return retv;
src/sys/syscalls/lseek.c
+10 -14
View File
@@ -15,20 +15,16 @@ syscallret syscall_lseek(int ifd, off_t offset, int whence){
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
spinlock_acquire(&proc->fdlock);
if(proc->fdcount <= ifd || fd->node == NULL){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
fd_t* fd;
int type = GETTYPE(fd->node->st.st_mode);
int ret = fd_access(&proc->fdtable, &fd, ifd);
if(ret){
retv.errno = ret;
return retv;
}
int type = GETTYPE(fd->mode);
if(type == TYPE_SOCKET || type == TYPE_FIFO){
retv.errno = ESPIPE;
@@ -71,7 +67,7 @@ syscallret syscall_lseek(int ifd, off_t offset, int whence){
retv.ret = newoffset;
_ret:
spinlock_release(&fd->lock);
fd_release(fd);
return retv;
}
src/sys/syscalls/open.c
+11 -37
View File
@@ -29,43 +29,17 @@ syscallret syscall_open(const char* pathname, int flags, mode_t mode){
proc_t* proc = arch_getcls()->thread->proc;
spinlock_acquire(&proc->fdlock);
int ifd;
fd_t* fd;
fd_t* fd = NULL;
int err = fd_alloc(&proc->fdtable, &fd, &ifd);
// find fd to use
for(uintmax_t i = 0; i < proc->fdcount; ++i){
spinlock_acquire(&proc->fds[i].lock);
if(!proc->fds[i].node){
fd = &proc->fds[i].node;
break;
}
spinlock_release(&proc->fds[i].lock);
if(err){
retv.errno = err;
free(name);
return retv;
}
// resize table
if(!fd){
fd_t* tmp = realloc(proc->fds, sizeof(fd_t)*proc->fdcount + 1);
if(!tmp){
spinlock_release(&proc->fdlock);
retv.errno = ENOMEM;
return retv;
}
proc->fds = tmp;
fd = &proc->fds[proc->fdcount];
++proc->fdcount;
spinlock_acquire(&fd->lock);
}
spinlock_release(&proc->fdlock);
fd->flags = flags + 1; // 1 is added to make O_RDONLY etc easier to lookup
fd->offset = 0;
@@ -94,11 +68,11 @@ syscallret syscall_open(const char* pathname, int flags, mode_t mode){
fd->node = file;
spinlock_release(&fd->lock);
fd_release(fd);
free(name);
retv.errno = 0;
retv.ret = ((uintptr_t)fd - (uintptr_t)proc->fds) / sizeof(fd_t);
retv.ret = ifd;
return retv;
@@ -106,7 +80,7 @@ syscallret syscall_open(const char* pathname, int flags, mode_t mode){
if(file)
vfs_close(file);
spinlock_release(&fd->lock);
fd_release(fd);
fd->node = NULL;
free(name);
return retv;
src/sys/syscalls/read.c
+9 -14
View File
@@ -19,34 +19,29 @@ syscallret syscall_read(int ifd, void* buff, size_t count){
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
fd_t* fd;
spinlock_acquire(&proc->fdlock);
if(proc->fdcount <= ifd || fd->node == NULL || (fd->flags & FD_FLAGS_READ) == 0){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
int err = fd_access(&proc->fdtable, &fd, ifd);
if(err){
retv.errno = err;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
void* kbuff = alloc(count);
if(!kbuff){
spinlock_release(&fd->lock);
fd_release(fd);
retv.errno = ENOMEM;
return retv;
}
int err;
size_t readc = vfs_read(&err, fd->node, kbuff, count, fd->offset);
if(err){
spinlock_release(&fd->lock);
if(err){
fd_release(fd);
free(kbuff);
retv.errno = err;
return retv;
@@ -54,7 +49,7 @@ syscallret syscall_read(int ifd, void* buff, size_t count){
fd->offset += readc;
spinlock_release(&fd->lock);
fd_release(fd);
memcpy(buff, kbuff, count); // XXX user version for safety
src/sys/syscalls/write.c
+9 -13
View File
@@ -22,24 +22,20 @@ syscallret syscall_write(int ifd, void* buff, size_t count){
proc_t* proc = arch_getcls()->thread->proc;
fd_t* fd = proc->fds + ifd;
fd_t* fd;
spinlock_acquire(&proc->fdlock);
int err = fd_access(&proc->fdtable, &fd, ifd);
if(proc->fdcount <= ifd || fd->node == NULL || (fd->flags & FD_FLAGS_WRITE) == 0){
spinlock_release(&proc->fdlock);
retv.errno = EBADF;
if(err){
retv.errno = err;
return retv;
}
spinlock_acquire(&fd->lock);
spinlock_release(&proc->fdlock);
}
void* kbuff = alloc(count);
if(!kbuff){
spinlock_release(&fd->lock);
retv.errno = ENOMEM;
fd_release(fd);
retv.errno = ENOMEM;
return retv;
}
@@ -48,7 +44,7 @@ syscallret syscall_write(int ifd, void* buff, size_t count){
if(fd->flags & O_APPEND)
fd->offset = fd->node->st.st_size;
int err;
size_t writec = vfs_write(&err, fd->node, kbuff, count, fd->offset);
@@ -66,7 +62,7 @@ syscallret syscall_write(int ifd, void* buff, size_t count){
retv.ret = writec;
_ret:
spinlock_release(&fd->lock);
fd_release(fd);
free(kbuff);
return retv;
}