Merge branch 'timer-fn' into 'master'

Implement POSIX timer functions

See merge request redox-os/relibc!747

src/header/_aio/mod.rs

@@ -1,5 +1,5 @@
 use crate::{
-    header::time::{sigevent, timespec},
+    header::{signal::sigevent, time::timespec},
     platform::types::*,
 };
 

src/header/signal/mod.rs

@@ -37,6 +37,10 @@ pub const SIG_SETMASK: c_int = 2;
 pub const SI_QUEUE: c_int = -1;
 pub const SI_USER: c_int = 0;
 
+pub const SIGEV_SIGNAL: c_int = 0;
+pub const SIGEV_NONE: c_int = 1;
+pub const SIGEV_THREAD: c_int = 2;
+
 #[repr(C)]
 #[derive(Clone, Debug)]
 /// cbindgen:ignore
@@ -55,6 +59,16 @@ pub struct sigaltstack {
     pub ss_size: size_t,
 }
 
+#[repr(C)]
+#[derive(Clone)]
+pub struct sigevent {
+    pub sigev_value: sigval,
+    pub sigev_signo: c_int,
+    pub sigev_notify: c_int,
+    pub sigev_notify_function: Option<extern "C" fn(sigval)>,
+    pub sigev_notify_attributes: *mut pthread_attr_t,
+}
+
 // FIXME: This struct is wrong on Linux
 #[repr(C)]
 #[derive(Clone, Copy)]
@@ -525,3 +539,6 @@ pub unsafe extern "C" fn psiginfo(info: *const siginfo_t, prefix: *const c_char)
         string.as_bytes().len(),
     );
 }
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_struct_sigevent_for_timer(a: sigevent) {}

src/header/time/cbindgen.toml

@@ -1,4 +1,4 @@
-sys_includes = ["sys/types.h", "stdint.h", "stddef.h", "features.h"]
+sys_includes = ["sys/types.h", "signal.h", "stdint.h", "stddef.h", "features.h"]
 include_guard = "_RELIBC_TIME_H"
 language = "C"
 style = "Tag"
@@ -7,3 +7,6 @@ cpp_compat = true
 
 [enum]
 prefix_with_name = true
+
+[export.rename]
+"sigevent" = "struct sigevent"

src/header/time/mod.rs

@@ -6,7 +6,9 @@ use crate::{
     c_str::{CStr, CString},
     error::ResultExt,
     fs::File,
-    header::{errno::EOVERFLOW, fcntl::O_RDONLY, stdlib::getenv, unistd::readlink},
+    header::{
+        errno::EOVERFLOW, fcntl::O_RDONLY, signal::sigevent, stdlib::getenv, unistd::readlink,
+    },
     io::Read,
     out::Out,
     platform::{self, Pal, Sys, types::*},
@@ -46,13 +48,29 @@ pub struct timespec {
 }
 
 impl timespec {
+    // TODO: Write test
+    pub fn add(base: timespec, interval: timespec) -> Option<timespec> {
+        let base_nsec = c_ulong::try_from(base.tv_nsec).ok()?;
+        let interval_nsec = c_ulong::try_from(interval.tv_nsec).ok()?;
+
+        Some(if base_nsec.checked_add(interval_nsec)? < 1_000_000_000 {
+            timespec {
+                tv_sec: base.tv_sec.checked_add(interval.tv_sec)?,
+                tv_nsec: (base_nsec + interval_nsec) as _,
+            }
+        } else {
+            timespec {
+                tv_sec: base.tv_sec.checked_add(interval.tv_sec)?.checked_add(1)?,
+                tv_nsec: ((interval_nsec + base_nsec) - 1_000_000_000) as c_long,
+            }
+        })
+    }
     // TODO: Write test
     pub fn subtract(later: timespec, earlier: timespec) -> Option<timespec> {
-        // TODO: Can tv_nsec be negative?
         let later_nsec = c_ulong::try_from(later.tv_nsec).ok()?;
         let earlier_nsec = c_ulong::try_from(earlier.tv_nsec).ok()?;
 
-        Some(if later_nsec > earlier_nsec {
+        let time = if later_nsec > earlier_nsec {
             timespec {
                 tv_sec: later.tv_sec.checked_sub(earlier.tv_sec)?,
                 tv_nsec: (later_nsec - earlier_nsec) as _,
@@ -62,7 +80,18 @@ impl timespec {
                 tv_sec: later.tv_sec.checked_sub(earlier.tv_sec)?.checked_sub(1)?,
                 tv_nsec: 1_000_000_000 - (earlier_nsec - later_nsec) as c_long,
             }
-        })
+        };
+
+        if time.tv_sec < 0 {
+            // https://man7.org/linux/man-pages/man2/settimeofday.2.html
+            // caller should return EINVAL
+            return None;
+        }
+
+        Some(time)
+    }
+    pub fn is_default(&self) -> bool {
+        return self.tv_nsec == 0 && self.tv_sec == 0;
     }
 }
 
@@ -76,6 +105,20 @@ impl<'a> From<&'a timespec> for syscall::TimeSpec {
     }
 }
 
+/// timer_t internal data, ABI unstable
+#[repr(C)]
+#[derive(Clone)]
+#[cfg(target_os = "redox")]
+pub(crate) struct timer_internal_t {
+    pub clockid: clockid_t,
+    pub timerfd: usize,
+    pub eventfd: usize,
+    pub evp: sigevent,
+    pub thread: pthread_t,
+    // relibc handles it_interval, not the kernel
+    pub next_wake_time: itimerspec,
+}
+
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
 #[repr(C)]
 pub struct tm {
@@ -132,14 +175,12 @@ pub static mut getdate_err: c_int = 0;
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
 #[repr(C)]
+#[derive(Clone, Default)]
 pub struct itimerspec {
     pub it_interval: timespec,
     pub it_value: timespec,
 }
 
-/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
-pub struct sigevent;
-
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asctime.html>.
 ///
 /// # Deprecation
@@ -493,19 +534,21 @@ pub unsafe extern "C" fn timelocal(tm: *mut tm) -> time_t {
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_create.html>.
-// #[unsafe(no_mangle)]
+#[unsafe(no_mangle)]
 pub extern "C" fn timer_create(
     clock_id: clockid_t,
     evp: *mut sigevent,
     timerid: *mut timer_t,
 ) -> c_int {
-    unimplemented!();
+    Sys::timer_create(clock_id, evp, timerid)
+        .map(|()| 0)
+        .or_minus_one_errno()
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_delete.html>.
-// #[unsafe(no_mangle)]
+#[unsafe(no_mangle)]
 pub extern "C" fn timer_delete(timerid: timer_t) -> c_int {
-    unimplemented!();
+    Sys::timer_delete(timerid).map(|()| 0).or_minus_one_errno()
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
@@ -515,20 +558,24 @@ pub extern "C" fn timer_getoverrun(timerid: timer_t) -> c_int {
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
-// #[unsafe(no_mangle)]
+#[unsafe(no_mangle)]
 pub extern "C" fn timer_gettime(timerid: timer_t, value: *mut itimerspec) -> c_int {
-    unimplemented!();
+    Sys::timer_gettime(timerid, value)
+        .map(|()| 0)
+        .or_minus_one_errno()
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
-// #[unsafe(no_mangle)]
+#[unsafe(no_mangle)]
 pub extern "C" fn timer_settime(
     timerid: timer_t,
     flags: c_int,
     value: *const itimerspec,
     ovalue: *mut itimerspec,
 ) -> c_int {
-    unimplemented!();
+    Sys::timer_settime(timerid, flags, value, ovalue)
+        .map(|()| 0)
+        .or_minus_one_errno()
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timespec_get.html>.