summaryrefslogtreecommitdiff
path: root/kernel/fs
diff options
context:
space:
mode:
authorAnton Kling <anton@kling.gg>2024-03-28 10:34:00 +0100
committerAnton Kling <anton@kling.gg>2024-03-28 10:34:00 +0100
commit7eceb43433634ee253507208baf1d8298b40e377 (patch)
tree59c399d8bd9a24d9a74c52f3830125b1dd217e95 /kernel/fs
parent873c45b99fe05e43c71763c385da54b0945bf8a3 (diff)
new stuff
Diffstat (limited to 'kernel/fs')
-rw-r--r--kernel/fs/fifo.c6
-rw-r--r--kernel/fs/vfs.c18
2 files changed, 23 insertions, 1 deletions
diff --git a/kernel/fs/fifo.c b/kernel/fs/fifo.c
index 7c286db..f2ad933 100644
--- a/kernel/fs/fifo.c
+++ b/kernel/fs/fifo.c
@@ -9,11 +9,17 @@ void fifo_close(vfs_fd_t *fd) {
return;
}
+void fifo_realloc(FIFO_FILE *file) {
+ file->buffer_len += 4096;
+ file->buffer = krealloc(file->buffer, file->buffer_len);
+}
+
int fifo_object_write(u8 *buffer, u64 offset, u64 len, FIFO_FILE *file) {
(void)offset;
file->has_data = 1;
if (file->write_len + len >= file->buffer_len) {
file->can_write = 0;
+ fifo_realloc(file);
return -EAGAIN;
}
memcpy(file->buffer + file->write_len, buffer, len);
diff --git a/kernel/fs/vfs.c b/kernel/fs/vfs.c
index f2b763c..505d6ae 100644
--- a/kernel/fs/vfs.c
+++ b/kernel/fs/vfs.c
@@ -375,7 +375,23 @@ int vfs_pwrite(int fd, void *buf, u64 count, u64 offset) {
if (!(vfs_fd->flags & O_WRITE)) {
return -EBADF;
}
- return raw_vfs_pwrite(vfs_fd, buf, count, offset);
+ int rc = raw_vfs_pwrite(vfs_fd, buf, count, offset);
+ if (-EAGAIN == rc) {
+ if (!(vfs_fd->flags & O_NONBLOCK)) {
+ struct pollfd fds;
+ do {
+ fds.fd = fd;
+ fds.events = POLLOUT;
+ fds.revents = 0;
+ int rc = poll(&fds, 1, 0);
+ if (-EINTR == rc) {
+ return -EINTR;
+ }
+ } while (!(fds.revents & POLLOUT));
+ return vfs_pwrite(fd, buf, count, offset);
+ }
+ }
+ return rc;
}
vfs_vm_object_t *vfs_get_vm_object(int fd, u64 length, u64 offset) {