setitimer: stub

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

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,4 +1,4 @@
-From 2167f1570f20a986de9b3c81636d78e4ef1cedb8 Mon Sep 17 00:00:00 2001
+From 0eb5403c389aaa7144d6bea297aac57d442bc9f6 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Fri, 8 Jul 2022 12:32:32 +1000
 Subject: [PATCH] yes
@@ -12,8 +12,11 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
  sysdeps/aero/generic/aero.cpp         |  38 +++----
  sysdeps/aero/generic/filesystem.cpp   |  25 ++++-
  sysdeps/aero/generic/sockets.cpp      |  77 +++++++++++++-
- sysdeps/aero/include/aero/syscall.h   |   4 +
- 8 files changed, 241 insertions(+), 54 deletions(-)
+ sysdeps/aero/generic/time.cpp         |  24 +++++
+ sysdeps/aero/include/aero/syscall.h   |   6 ++
+ sysdeps/aero/meson.build              |   1 +
+ 10 files changed, 268 insertions(+), 54 deletions(-)
+ create mode 100644 sysdeps/aero/generic/time.cpp
 
 diff --git a/.gitignore b/.gitignore
 index fdd60a00..9f811f47 100644
@@ -425,21 +428,66 @@ index b6b18fe7..e03c634b 100644
 +	}
 +}
  } // namespace mlibc
+diff --git a/sysdeps/aero/generic/time.cpp b/sysdeps/aero/generic/time.cpp
+new file mode 100644
+index 00000000..460412d0
+--- /dev/null
++++ b/sysdeps/aero/generic/time.cpp
+@@ -0,0 +1,24 @@
++#include <mlibc/all-sysdeps.hpp>
++#include <aero/syscall.h>
++
++namespace mlibc {
++int sys_setitimer(int which, const struct itimerval *new_value, struct itimerval *old_value) {
++    auto result = syscall(SYS_SETITIMER, which, new_value, old_value);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    return 0;
++}
++
++int sys_getitimer(int which, struct itimerval *curr_value) {
++    auto result = syscall(SYS_GETITIMER, which, curr_value);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    return 0;
++}
++}
+\ No newline at end of file
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
-index 12f8dc61..50f8cfa7 100644
+index 12f8dc61..03001c46 100644
 --- a/sysdeps/aero/include/aero/syscall.h
 +++ b/sysdeps/aero/include/aero/syscall.h
-@@ -64,6 +64,10 @@
+@@ -64,6 +64,12 @@
  #define SYS_FUTEX_WAIT 57
  #define SYS_FUTEX_WAKE 58
  #define SYS_LINK 59
 +#define SYS_BACKTRACE 60
 +#define SYS_POLL 61
 +#define SYS_EXIT_THREAD 62
 +#define SYS_SOCK_RECV 63
++#define SYS_SETITIMER 64
++#define SYS_GETITIMER 65
 
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.
+diff --git a/sysdeps/aero/meson.build b/sysdeps/aero/meson.build
+index 3ca8463e..f1d80139 100644
+--- a/sysdeps/aero/meson.build
++++ b/sysdeps/aero/meson.build
+@@ -11,6 +11,7 @@ libc_sources += files(
+ 	'generic/filesystem.cpp',
+ 	'generic/sockets.cpp',
+ 	'generic/signals.cpp',
++	'generic/time.cpp',
+ )
+ 
+ if not no_headers
 -- 
 2.25.1
 

src/aero_kernel/src/fs/pipe.rs

@@ -73,8 +73,8 @@ impl INodeInterface for Pipe {
         Ok(read)
     }
 
-    fn write_at(&self, offset: usize, buf: &[u8]) -> super::Result<usize> {
-        let res = offset + self.queue.lock_irq().write_data(buf);
+    fn write_at(&self, _offset: usize, buf: &[u8]) -> super::Result<usize> {
+        let res = self.queue.lock_irq().write_data(buf);
         self.readers.notify_complete();
 
         Ok(res)

src/aero_kernel/src/syscall/mod.rs

@@ -288,6 +288,9 @@ pub fn generic_do_syscall(
         SYS_GETTIME => time::gettime(b, c),
         SYS_SLEEP => time::sleep(b),
 
+        SYS_SETITIMER => time::setitimer(b, c, d),
+        SYS_GETITIMER => time::getitimer(b, c),
+
         SYS_IPC_SEND => ipc::send(b, c, d),
         SYS_IPC_RECV => ipc::recv(b, c, d, e),
         SYS_IPC_DISCOVER_ROOT => ipc::discover_root(),

src/aero_kernel/src/syscall/time.rs

@@ -17,6 +17,7 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
+use aero_syscall::time::ITimerVal;
 use aero_syscall::{SyscallError, TimeSpec};
 
 use crate::userland::scheduler;
@@ -59,3 +60,21 @@ pub fn gettime(clock: usize, timespec: &mut TimeSpec) -> Result<usize, SyscallEr
         _ => Err(SyscallError::EINVAL),
     }
 }
+
+#[syscall]
+pub fn setitimer(
+    _which: usize,
+    _new_value: &ITimerVal,
+    _old_value: &mut ITimerVal,
+) -> Result<usize, SyscallError> {
+    let scheduler = scheduler::get_scheduler();
+    scheduler
+        .current_task()
+        .signal(aero_syscall::signal::SIGALRM);
+    Ok(0)
+}
+
+#[syscall]
+pub fn getitimer(_which: usize, _curr_value: &mut ITimerVal) -> Result<usize, SyscallError> {
+    Ok(0)
+}

src/aero_kernel/src/userland/signals.rs

@@ -57,7 +57,7 @@ mod default {
         Action::Handle(terminate),        // SIGSEGV
         Action::Ignore,                   // UNUSED
         Action::Handle(terminate),        // SIGPIPE
-        Action::Ignore,                   // UNUSED
+        Action::Ignore,                   // SIGALRM
         Action::Handle(terminate),        // SIGTERM
         Action::Ignore,                   // UNUSED
         Action::Ignore,                   // SIGCHLD

src/aero_kernel/src/utils/buffer.rs

@@ -34,11 +34,6 @@ impl Buffer {
         !self.data.is_empty()
     }
 
-    /// Returns the size of the buffer.
-    pub fn len(&self) -> usize {
-        self.data.len()
-    }
-
     pub fn read_data(&mut self, buffer: &mut [u8]) -> usize {
         // nothing to read
         if self.data.is_empty() {

src/aero_syscall/src/consts.rs

@@ -84,6 +84,8 @@ pub const SYS_BACKTRACE: usize = 60;
 pub const SYS_POLL: usize = 61;
 pub const SYS_EXIT_THREAD: usize = 62;
 pub const SYS_SOCK_RECV: usize = 63;
+pub const SYS_SETITIMER: usize = 64;
+pub const SYS_GETITIMER: usize = 65;
 
 // constants for fcntl()'s command argument:
 pub const F_DUPFD: usize = 1;

src/aero_syscall/src/lib.rs

@@ -24,6 +24,7 @@ pub mod consts;
 pub mod signal;
 pub mod socket;
 pub mod syscall;
+pub mod time;
 
 pub use crate::syscall::*;
 

src/aero_syscall/src/signal.rs

@@ -2,16 +2,37 @@ pub const SIGHUP: usize = 1;
 pub const SIGINT: usize = 2;
 pub const SIGQUIT: usize = 3;
 pub const SIGILL: usize = 4;
+pub const SIGTRAP: usize = 5;
+pub const SIGABRT: usize = 6;
 pub const SIGBUS: usize = 7;
 pub const SIGFPE: usize = 8;
 pub const SIGKILL: usize = 9;
+pub const SIGUSR1: usize = 10;
 pub const SIGSEGV: usize = 11;
+pub const SIGUSR2: usize = 12;
 pub const SIGPIPE: usize = 13;
+pub const SIGALRM: usize = 14;
 pub const SIGTERM: usize = 15;
+pub const SIGSTKFLT: usize = 16;
 pub const SIGCHLD: usize = 17;
 pub const SIGCONT: usize = 18;
 pub const SIGSTOP: usize = 19;
 pub const SIGTSTP: usize = 20;
+pub const SIGTTIN: usize = 21;
+pub const SIGTTOU: usize = 22;
+pub const SIGURG: usize = 23;
+pub const SIGXCPU: usize = 24;
+pub const SIGXFSZ: usize = 25;
+pub const SIGVTALRM: usize = 26;
+pub const SIGPROF: usize = 27;
+pub const SIGWINCH: usize = 28;
+pub const SIGIO: usize = 29;
+pub const SIGPOLL: usize = SIGIO;
+pub const SIGPWR: usize = 30;
+pub const SIGSYS: usize = 31;
+pub const SIGRTMIN: usize = 32;
+pub const SIGRTMAX: usize = 33;
+pub const SIGCANCEL: usize = 34;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum SignalHandler {

src/aero_syscall/src/time.rs

@@ -0,0 +1,11 @@
+#[repr(C)]
+pub struct TimeVal {
+    pub tv_sec: i64,
+    pub tv_usec: i64,
+}
+
+#[repr(C)]
+pub struct ITimerVal {
+    pub it_interval: TimeVal, // Interval for periodic timer
+    pub it_value: TimeVal,    // Time until next expiration
+}