apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

kernel: Make the poll() system call actually work

Browse Source
This commit is contained in:
apio 2023-08-02 17:18:38 +02:00
parent f8cb6e03df
commit df4227eab8
Signed by: apio
GPG Key ID: B8A7D06E42258954
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/src/sys/poll.cpp
View File

@ -1,3 +1,4 @@
#include "Log.h"
#include "fs/VFS.h" #include "fs/VFS.h"
#include "memory/MemoryManager.h" #include "memory/MemoryManager.h"
#include "sys/Syscall.h" #include "sys/Syscall.h"
@ -24,6 +25,7 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
auto maybe_inode = current->resolve_fd(fd); auto maybe_inode = current->resolve_fd(fd);
if (maybe_inode.has_error()) if (maybe_inode.has_error())
{ {
kwarnln("poll: fd %lu (%d) is not valid, storing POLLNVAL", i, fd);
kfds[i].revents |= POLLNVAL; kfds[i].revents |= POLLNVAL;
TRY(inodes.try_append({})); TRY(inodes.try_append({}));
} }
@ -32,7 +34,7 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
} }
bool infinite = timeout < 0; bool infinite = timeout < 0;
int fds_with_events; nfds_t fds_with_events;
do { do {
fds_with_events = 0; fds_with_events = 0;
@ -51,7 +53,7 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
if (!fds_with_events && (timeout > 0 || infinite)) if (!fds_with_events && (timeout > 0 || infinite))
{ {
kernel_sleep(10); kernel_sleep(10);
timeout -= (int)current->sleep_ticks_left; timeout -= (10 - (int)current->sleep_ticks_left);
if (current->interrupted) if (current->interrupted)
{ {
guard.deactivate(); guard.deactivate();
@ -62,7 +64,9 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
} }
continue; continue;
} }
} while (false);
break;
} while (1);
MemoryManager::copy_to_user(fds, kfds, nfds * sizeof(pollfd)); MemoryManager::copy_to_user(fds, kfds, nfds * sizeof(pollfd));

6
libc/include/bits/poll.h
View File

@ -5,9 +5,9 @@
#include <bits/fixed-size-types.h> #include <bits/fixed-size-types.h>
#define POLLIN 0 #define POLLIN (1 << 0)
#define POLLERR 1 #define POLLERR (1 << 1)
#define POLLNVAL 2 #define POLLNVAL (1 << 2)
typedef __u64_t nfds_t; typedef __u64_t nfds_t;