diff --git a/src/platform/src/linux/mod.rs b/src/platform/src/linux/mod.rs index aa7eef7c00bdd2bdd4f323eb190e28a757fb3be6..bd57335563f91a3a9b7be0ee60c6da8c668de0a5 100644 --- a/src/platform/src/linux/mod.rs +++ b/src/platform/src/linux/mod.rs @@ -123,6 +123,10 @@ pub fn mkdir(path: *const c_char, mode: mode_t) -> c_int { e(unsafe { syscall!(MKDIRAT, AT_FDCWD, path, mode) }) as c_int } +pub fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> c_int { + e(unsafe { syscall!(NANOSLEEP, rqtp, rmtp) }) as c_int +} + pub fn open(path: *const c_char, oflag: c_int, mode: mode_t) -> c_int { e(unsafe { syscall!(OPENAT, AT_FDCWD, path, oflag, mode) }) as c_int } diff --git a/src/platform/src/redox/mod.rs b/src/platform/src/redox/mod.rs index 264042d79ce12f965c363cd3b9cc7d9208a3fa71..faa3bc1f82844da1563a7930fb44ad06455689b3 100644 --- a/src/platform/src/redox/mod.rs +++ b/src/platform/src/redox/mod.rs @@ -1,7 +1,9 @@ use core::ptr; use core::slice; +use core::mem; use syscall; use syscall::flag::*; +use syscall::data::TimeSpec as redox_timespec; use c_str; use errno; @@ -135,6 +137,14 @@ pub fn mkdir(path: *const c_char, mode: mode_t) -> c_int { } } +pub fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> c_int { + unsafe { + let rqtp = mem::transmute::<*const timespec, &redox_timespec>(rqtp); + let rmtp = mem::transmute::<*mut timespec, &mut redox_timespec>(rmtp); + e(syscall::nanosleep(rqtp, rmtp)) as c_int + } +} + pub fn open(path: *const c_char, oflag: c_int, mode: mode_t) -> c_int { let path = unsafe { c_str(path) }; e(syscall::open(path, (oflag as usize) | (mode as usize))) as c_int diff --git a/src/platform/src/types.rs b/src/platform/src/types.rs index e8644553bb31bda9a89b2362c28a3d16df837b79..45ae64499d508ff2d7c5307a623ca10624751a99 100644 --- a/src/platform/src/types.rs +++ b/src/platform/src/types.rs @@ -63,3 +63,9 @@ pub type suseconds_t = i64; pub type clock_t = i64; pub type clockid_t = i32; pub type timer_t = c_void; + +#[repr(C)] +pub struct timespec { + pub tv_sec: time_t, + pub tv_nsec: c_long, +} diff --git a/src/time/src/lib.rs b/src/time/src/lib.rs index b7817a2b54731649fe72b8e389400db1c25fd24a..5b90e86f7482758341965c01524964cb4af57da7 100644 --- a/src/time/src/lib.rs +++ b/src/time/src/lib.rs @@ -6,11 +6,13 @@ extern crate platform; use platform::types::*; -#[repr(C)] -pub struct timespec { - pub tv_sec: time_t, - pub tv_nsec: c_long, -} +/* + *#[repr(C)] + *pub struct timespec { + * pub tv_sec: time_t, + * pub tv_nsec: c_long, + *} + */ #[repr(C)] pub struct tm { @@ -112,7 +114,7 @@ pub extern "C" fn mktime(timeptr: *mut tm) -> time_t { #[no_mangle] pub extern "C" fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> c_int { - unimplemented!(); + platform::nanosleep(rqtp, rmtp) } #[no_mangle]