syscall::fs: add epoll_pwait stub

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,18 +1,18 @@
-From 5d484b1a17191d7ce795a2d773e4a72d8fc7490e Mon Sep 17 00:00:00 2001
+From a649d90c5073ef1f8a9eadb4773fe5f832a3e87c Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 10 Feb 2022 19:12:25 +1100
 Subject: [PATCH] yes
 
 Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
- .gitignore                          |  3 ++
+ .gitignore                          |  3 +
  options/rtdl/generic/linker.cpp     |  2 +-
- sysdeps/aero/generic/aero.cpp       | 12 ++++-
- sysdeps/aero/generic/filesystem.cpp | 79 ++++++++++++++++++++++++++---
+ sysdeps/aero/generic/aero.cpp       | 12 +++-
+ sysdeps/aero/generic/filesystem.cpp | 97 ++++++++++++++++++++++++++---
  sysdeps/aero/generic/signals.cpp    |  8 ++-
- sysdeps/aero/generic/sockets.cpp    | 48 ++++++++++++++++++
- sysdeps/aero/include/aero/syscall.h | 12 +++++
- 7 files changed, 151 insertions(+), 13 deletions(-)
+ sysdeps/aero/generic/sockets.cpp    | 48 ++++++++++++++
+ sysdeps/aero/include/aero/syscall.h | 11 ++++
+ 7 files changed, 168 insertions(+), 13 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dbb35e8b..20c8d4c3 100644
@@ -69,7 +69,7 @@ index 7de909f5..4281beb9 100644
  #endif
  } // namespace mlibc
 diff --git a/sysdeps/aero/generic/filesystem.cpp b/sysdeps/aero/generic/filesystem.cpp
-index 6a13f19c..d34dfce3 100644
+index 6a13f19c..8f700a38 100644
 --- a/sysdeps/aero/generic/filesystem.cpp
 +++ b/sysdeps/aero/generic/filesystem.cpp
 @@ -1,3 +1,4 @@
@@ -151,7 +151,7 @@ index 6a13f19c..d34dfce3 100644
      return 0;
  }
 
-@@ -267,4 +297,37 @@ int sys_pipe(int *fds, int flags) {
+@@ -267,4 +297,55 @@ int sys_pipe(int *fds, int flags) {
 
      return 0;
  }
@@ -178,6 +178,24 @@ index 6a13f19c..d34dfce3 100644
 +    return 0;
 +}
 +
++int sys_epoll_pwait(
++    int epfd, 
++    struct epoll_event *ev, 
++    int n,
++    int timeout, 
++    const sigset_t *sigmask, 
++    int *raised
++) {
++    auto result = syscall(SYS_EPOLL_PWAIT, epfd, ev, n, timeout, sigmask);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    *raised = result;
++    return 0;
++}
++
 +int sys_eventfd_create(unsigned int initval, int flags, int *fd) {
 +    auto result = syscall(SYS_EVENT_FD, initval, flags);
 +
@@ -263,10 +281,10 @@ index e69de29b..4e6bd608 100644
 +}
 +} // namespace mlibc
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
-index 07b1b51b..ef797e40 100644
+index 07b1b51b..6487cd85 100644
 --- a/sysdeps/aero/include/aero/syscall.h
 +++ b/sysdeps/aero/include/aero/syscall.h
-@@ -49,6 +49,18 @@
+@@ -49,6 +49,17 @@
  #define SYS_DUP 42
  #define SYS_FCNTL 43
  #define SYS_DUP2 44
@@ -280,8 +298,7 @@ index 07b1b51b..ef797e40 100644
 +#define SYS_EPOLL_CREATE 52
 +#define SYS_EPOLL_PWAIT 53
 +#define SYS_EPOLL_CTL 54
-+#define SYS_EPOLL_WAIT 55
-+#define SYS_EVENT_FD 56
++#define SYS_EVENT_FD 55
 
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.

src/aero_kernel/src/syscall/fs.rs

@@ -414,8 +414,8 @@ pub fn epoll_ctl(
     fd: usize,
     event: &mut EPollEvent,
 ) -> Result<usize, AeroSyscallError> {
-    let current_task = scheduler::get_scheduler().current_task();
-    let epfd = current_task
+    let epfd = scheduler::get_scheduler()
+        .current_task()
         .file_table
         .get_handle(epfd)
         .ok_or(AeroSyscallError::EBADFD)?;
@@ -433,6 +433,23 @@ pub fn epoll_ctl(
     }
 }
 
+#[syscall]
+pub fn epoll_pwait(
+    epfd: usize,
+    _event: &mut EPollEvent,
+    _max_events: usize,
+    _timeout: usize,
+    _sigmask: usize,
+) -> Result<usize, AeroSyscallError> {
+    let _epfd = scheduler::get_scheduler()
+        .current_task()
+        .file_table
+        .get_handle(epfd)
+        .ok_or(AeroSyscallError::EBADFD)?;
+
+    Ok(0)
+}
+
 #[syscall]
 pub fn event_fd(_initval: usize, flags: usize) -> Result<usize, AeroSyscallError> {
     let flags = EventFdFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;

src/aero_kernel/src/syscall/mod.rs

@@ -207,6 +207,7 @@ pub fn generic_do_syscall(
         // epoll calls:
         SYS_EPOLL_CREATE => fs::epoll_create(b),
         SYS_EPOLL_CTL => fs::epoll_ctl(b, c, d, e),
+        SYS_EPOLL_PWAIT => fs::epoll_pwait(b, c, d, e, f),
 
         SYS_SOCKET => net::socket(b, c, d),
         SYS_BIND => net::bind(b, c, d),

src/aero_syscall/src/consts.rs

@@ -75,8 +75,7 @@ pub const SYS_READ_LINK: usize = 51;
 pub const SYS_EPOLL_CREATE: usize = 52;
 pub const SYS_EPOLL_PWAIT: usize = 53;
 pub const SYS_EPOLL_CTL: usize = 54;
-pub const SYS_EPOLL_WAIT: usize = 55;
-pub const SYS_EVENT_FD: usize = 56;
+pub const SYS_EVENT_FD: usize = 55;
 
 // constants for fcntl()'s command argument:
 pub const F_DUPFD: usize = 1;

src/aero_syscall/src/lib.rs

@@ -224,7 +224,6 @@ pub fn syscall_as_str(syscall: usize) -> &'static str {
         prelude::SYS_EPOLL_CREATE => "epoll_create",
         prelude::SYS_EPOLL_PWAIT => "epoll_pwait",
         prelude::SYS_EPOLL_CTL => "epoll_ctl",
-        prelude::SYS_EPOLL_WAIT => "epoll_wait",
         prelude::SYS_EVENT_FD => "event_fd",
 
         _ => unreachable!("unknown syscall {syscall}"),