diff --git a/src/header/mod.rs b/src/header/mod.rs index e910f577d9a3aca6695d3f149053211080ec1c5c..80da6f421406b244fccab553137a650777e2328a 100644 --- a/src/header/mod.rs +++ b/src/header/mod.rs @@ -38,7 +38,7 @@ pub mod sys_file; pub mod sys_ioctl; pub mod sys_mman; pub mod sys_ptrace; -//pub mod sys_resource; +pub mod sys_resource; pub mod sys_select; pub mod sys_socket; pub mod sys_stat; diff --git a/src/header/sys_resource/linux.rs b/src/header/sys_resource/linux.rs deleted file mode 100644 index 8e57657b27057ee61495bb15534970d16f89b129..0000000000000000000000000000000000000000 --- a/src/header/sys_resource/linux.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[no_mangle] -pub unsafe extern "C" fn getrlimit(resource: c_int, rlp: *mut rlimit) -> c_int { - Sys::getrlimit(resource, rlp) -} diff --git a/src/header/sys_resource/mod.rs b/src/header/sys_resource/mod.rs index 0a34600764ea0ee5f4dab886e8193922f215dbd5..6e4f1ad2d521a38841c269f63f050bba777d3b2a 100644 --- a/src/header/sys_resource/mod.rs +++ b/src/header/sys_resource/mod.rs @@ -1,10 +1,10 @@ //! sys/resource.h implementation for Redox, following //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysresource.h.html -use header::sys_time::timeval; -use platform; -use platform::types::*; -use platform::{Pal, Sys}; +use crate::header::sys_time::timeval; +use crate::platform; +use crate::platform::types::*; +use crate::platform::{Pal, Sys}; // Exported in bits file // const RUSAGE_SELF: c_int = 0; @@ -33,16 +33,6 @@ pub const RLIMIT_NICE: u64 = 13; pub const RLIMIT_RTPRIO: u64 = 14; pub const RLIMIT_NLIMITS: u64 = 15; -#[cfg(target_os = "linux")] -mod linux; -#[cfg(target_os = "redox")] -mod redox; - -#[cfg(target_os = "linux")] -pub use linux::*; -#[cfg(target_os = "redox")] -pub use redox::*; - type rlim_t = u64; #[repr(C)] @@ -72,22 +62,27 @@ pub struct rusage { } // #[no_mangle] -pub unsafe extern "C" fn getpriority(which: c_int, who: id_t) -> c_int { - unimplemented!(); -} - +// pub unsafe extern "C" fn getpriority(which: c_int, who: id_t) -> c_int { +// unimplemented!(); +// } +// // #[no_mangle] -pub unsafe extern "C" fn getrusage(who: c_int, r_usage: *mut rusage) -> c_int { - // Sys::getrusage(who, r_usage) - unimplemented!(); -} - +// pub unsafe extern "C" fn getrlimit(resource: c_int, rlp: *mut rlimit) -> c_int { +// Sys::getrlimit(resource, rlp) +// } +// // #[no_mangle] -pub unsafe extern "C" fn setpriority(which: c_int, who: id_t, nice: c_int) -> c_int { - unimplemented!(); -} - +// pub unsafe extern "C" fn getrusage(who: c_int, r_usage: *mut rusage) -> c_int { +// // Sys::getrusage(who, r_usage) +// unimplemented!(); +// } +// // #[no_mangle] -pub unsafe extern "C" fn setrlimit(resource: c_int, rlp: *const rlimit) -> c_int { - unimplemented!(); -} +// pub unsafe extern "C" fn setpriority(which: c_int, who: id_t, nice: c_int) -> c_int { +// unimplemented!(); +// } +// +// #[no_mangle] +// pub unsafe extern "C" fn setrlimit(resource: c_int, rlp: *const rlimit) -> c_int { +// unimplemented!(); +// } diff --git a/src/header/sys_resource/redox.rs b/src/header/sys_resource/redox.rs deleted file mode 100644 index feaf9c772e9cf84b068717ea197967243f43f140..0000000000000000000000000000000000000000 --- a/src/header/sys_resource/redox.rs +++ /dev/null @@ -1,5 +0,0 @@ -#[no_mangle] -pub unsafe extern "C" fn getrlimit(resource: c_int, rlp: *mut rlimit) -> c_int { - // TODO - RLIM_INFINITY -}