diff --git a/Cargo.lock b/Cargo.lock index 91daf313a3..16201578eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,6 +262,8 @@ dependencies = [ "stdio 0.1.0", "stdlib 0.1.0", "string 0.1.0", + "sys_time 0.1.0", + "time 0.1.0", "unistd 0.1.0", "wctype 0.1.0", ] @@ -503,6 +505,14 @@ dependencies = [ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sys_time" +version = "0.1.0" +dependencies = [ + "cbindgen 0.5.0", + "platform 0.1.0", +] + [[package]] name = "tempdir" version = "0.3.6" @@ -539,6 +549,14 @@ dependencies = [ "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "time" +version = "0.1.0" +dependencies = [ + "cbindgen 0.5.0", + "platform 0.1.0", +] + [[package]] name = "toml" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 6d7103c8f7..fd952f3902 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,8 @@ stat = { path = "src/stat" } stdio = { path = "src/stdio" } stdlib = { path = "src/stdlib" } string = { path = "src/string" } +sys_time = { path = "src/sys_time" } +time = { path = "src/time" } unistd = { path = "src/unistd" } wctype = { path = "src/wctype" } diff --git a/src/lib.rs b/src/lib.rs index cd56891d76..8becd7bd0d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,6 +14,8 @@ extern crate stat; extern crate stdio; extern crate stdlib; extern crate string; +extern crate sys_time; +extern crate time; extern crate unistd; extern crate wctype; diff --git a/src/platform/src/types.rs b/src/platform/src/types.rs index 786af774d5..e8644553bb 100644 --- a/src/platform/src/types.rs +++ b/src/platform/src/types.rs @@ -46,7 +46,7 @@ pub type wchar_t = i16; pub type wint_t = i32; pub type wctype_t = i64; -pub type off_t = c_long; +pub type off_t = i64; pub type mode_t = u16; pub type time_t = i64; pub type pid_t = usize; @@ -59,3 +59,7 @@ pub type blksize_t = isize; pub type useconds_t = i32; pub type suseconds_t = i64; + +pub type clock_t = i64; +pub type clockid_t = i32; +pub type timer_t = c_void; diff --git a/src/sys_time/Cargo.toml b/src/sys_time/Cargo.toml new file mode 100644 index 0000000000..20b3ac9c6f --- /dev/null +++ b/src/sys_time/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "sys_time" +version = "0.1.0" +authors = ["Jeremy Soller "] +build = "build.rs" + +[build-dependencies] +cbindgen = { path = "../../cbindgen" } + +[dependencies] +platform = { path = "../platform" } diff --git a/src/sys_time/build.rs b/src/sys_time/build.rs new file mode 100644 index 0000000000..9d087ef9c1 --- /dev/null +++ b/src/sys_time/build.rs @@ -0,0 +1,11 @@ +extern crate cbindgen; + +use std::{env, fs}; + +fn main() { + let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"); + fs::create_dir_all("../../target/include").expect("failed to create include directory"); + cbindgen::generate(crate_dir) + .expect("failed to generate bindings") + .write_to_file("../../target/include/sys/time.h"); +} diff --git a/src/sys_time/cbindgen.toml b/src/sys_time/cbindgen.toml new file mode 100644 index 0000000000..bc1c131526 --- /dev/null +++ b/src/sys_time/cbindgen.toml @@ -0,0 +1,6 @@ +sys_includes = ["sys/types.h"] +include_guard = "_SYS_TIME_H" +language = "C" + +[enum] +prefix_with_name = true diff --git a/src/sys_time/src/lib.rs b/src/sys_time/src/lib.rs new file mode 100644 index 0000000000..d56c5755a2 --- /dev/null +++ b/src/sys_time/src/lib.rs @@ -0,0 +1,61 @@ +//! sys/time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html + +#![no_std] + +extern crate platform; + +use platform::types::*; + +#[repr(C)] +pub struct timeval { + pub tv_sec: time_t, + pub tv_usec: suseconds_t, +} + +#[repr(C)] +pub struct itimerval { + pub it_interval: timeval, + pub it_value: timeval, +} + +#[repr(C)] +pub struct fd_set { + pub fds_bits: [c_long; 16usize], +} + +pub extern "C" fn getitimer(which: c_int, value: *mut itimerval) -> c_int { + unimplemented!(); +} + +pub extern "C" fn setitimer( + which: c_int, + value: *const itimerval, + ovalue: *mut itimerval, +) -> c_int { + unimplemented!(); +} + +pub extern "C" fn gettimeofday(tp: *mut timeval, tzp: *const c_void) -> c_int { + unimplemented!(); +} + +pub extern "C" fn select( + nfds: c_int, + readfds: *mut fd_set, + writefds: *mut fd_set, + errorfds: *mut fd_set, + timeout: *mut timeval, +) -> c_int { + unimplemented!(); +} + +pub extern "C" fn utimes(path: *const c_char, times: [timeval; 2]) -> c_int { + unimplemented!(); +} + +/* +#[no_mangle] +pub extern "C" fn func(args) -> c_int { + unimplemented!(); +} +*/ diff --git a/src/time/Cargo.toml b/src/time/Cargo.toml new file mode 100644 index 0000000000..fe104d90be --- /dev/null +++ b/src/time/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "time" +version = "0.1.0" +authors = ["Jeremy Soller "] +build = "build.rs" + +[build-dependencies] +cbindgen = { path = "../../cbindgen" } + +[dependencies] +platform = { path = "../platform" } diff --git a/src/time/build.rs b/src/time/build.rs new file mode 100644 index 0000000000..7bc136af55 --- /dev/null +++ b/src/time/build.rs @@ -0,0 +1,11 @@ +extern crate cbindgen; + +use std::{env, fs}; + +fn main() { + let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"); + fs::create_dir_all("../../target/include").expect("failed to create include directory"); + cbindgen::generate(crate_dir) + .expect("failed to generate bindings") + .write_to_file("../../target/include/time.h"); +} diff --git a/src/time/cbindgen.toml b/src/time/cbindgen.toml new file mode 100644 index 0000000000..afc1ec2138 --- /dev/null +++ b/src/time/cbindgen.toml @@ -0,0 +1,6 @@ +sys_includes = ["sys/types.h"] +include_guard = "_TIME_H" +language = "C" + +[enum] +prefix_with_name = true diff --git a/src/time/src/lib.rs b/src/time/src/lib.rs new file mode 100644 index 0000000000..b31918df1b --- /dev/null +++ b/src/time/src/lib.rs @@ -0,0 +1,183 @@ +//! time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/time.h.html + +#![no_std] + +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 tm { + pub tm_sec: c_int, + pub tm_min: c_int, + pub tm_hour: c_int, + pub tm_mday: c_int, + pub tm_mon: c_int, + pub tm_year: c_int, + pub tm_wday: c_int, + pub tm_yday: c_int, + pub tm_isdst: c_int, + pub tm_gmtoff: c_long, + pub tm_zone: *const c_char, +} + +#[repr(C)] +pub struct itimerspec { + pub it_interval: timespec, + pub it_value: timespec, +} + +pub struct sigevent; + +#[no_mangle] +pub extern "C" fn asctime(timeptr: *const tm) -> *mut c_char { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn asctime_r(tm: *const tm, buf: *mut c_char) -> *mut c_char { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn clock() -> clock_t { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn clock_getres(clock_id: clockid_t, res: *mut timespec) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn clock_gettime(clock_id: clockid_t, tp: *mut timespec) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn clock_settime(clock_id: clockid_t, tp: *const timespec) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn ctime(clock: *const time_t) -> *mut c_char { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn ctime_r(clock: *const time_t, buf: *mut c_char) -> *mut c_char { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn difftime(time1: time_t, time0: time_t) -> f64 { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn getdate(string: *const c_char) -> tm { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn gmtime(timer: *const time_t) -> *mut tm { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn gmtime_r(clock: *const time_t, result: *mut tm) -> *mut tm { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn localtime(timer: *const time_t) -> *mut tm { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn localtime_r(clock: *const time_t, result: *mut tm) -> *mut tm { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn mktime(timeptr: *mut tm) -> time_t { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn strftime( + s: *mut c_char, + maxsize: usize, + format: *const c_char, + timptr: *const tm, +) -> usize { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn strptime(buf: *const c_char, format: *const c_char, tm: *mut tm) -> *mut c_char { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn time(tloc: *mut time_t) -> time_t { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn timer_create( + clock_id: clockid_t, + evp: *mut sigevent, + timerid: *mut timer_t, +) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn timer_delete(timerid: timer_t) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn tzset() { + unimplemented!(); +} + + +#[no_mangle] +pub extern "C" fn timer_settime( + timerid: timer_t, + flags: c_int, + value: *const itimerspec, + ovalue: *mut itimerspec, +) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn timer_gettime(timerid: timer_t, value: *mut itimerspec) -> c_int { + unimplemented!(); +} + +#[no_mangle] +pub extern "C" fn timer_getoverrun(timerid: timer_t) -> c_int { + unimplemented!(); +} + +/* +#[no_mangle] +pub extern "C" fn func(args) -> c_int { + unimplemented!(); +} +*/