diff options
| author | Raphael Cohn <raphael.cohn@stormmq.com> | 2016-05-13 11:26:06 +0100 |
|---|---|---|
| committer | Raphael Cohn <raphael.cohn@stormmq.com> | 2016-05-13 11:26:06 +0100 |
| commit | 786d5056166c5fda02082a2f960a226abe598e60 (patch) | |
| tree | faaa0f6c6810d59396ea5950099cfb2c60339cce | |
| parent | a6d48051d37ca3e3283ff65eb34c310dae432770 (diff) | |
| parent | 81e3af27ea10d2e4004dc510b22b7285c0627e55 (diff) | |
| download | rust-libc-786d5056166c5fda02082a2f960a226abe598e60.tar.gz | |
Merge branch 'master' into sysctl
| -rw-r--r-- | src/unix/bsd/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 13 | ||||
| -rw-r--r-- | src/unix/solaris/mod.rs | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs index 42817bf602..d60bbc58bf 100644 --- a/src/unix/bsd/mod.rs +++ b/src/unix/bsd/mod.rs @@ -339,7 +339,6 @@ f! { pub fn WCOREDUMP(status: ::c_int) -> bool { (status & 0o200) != 0 } - } extern { @@ -357,6 +356,7 @@ extern { result: *mut *mut passwd) -> ::c_int; pub fn getprogname() -> *const ::c_char; pub fn setprogname(name: *const ::c_char); + pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int; } cfg_if! { diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 610774efb2..b8d6d0b1a6 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -612,6 +612,19 @@ extern { resource: ::c_int, new_limit: *const ::rlimit64, old_limit: *mut ::rlimit64) -> ::c_int; + pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int; + pub fn process_vm_readv(pid: ::pid_t, + local_iov: *const ::iovec, + liovcnt: ::c_ulong, + remote_iov: *const ::iovec, + riovcnt: ::c_ulong, + flags: ::c_ulong) -> isize; + pub fn process_vm_writev(pid: ::pid_t, + local_iov: *const ::iovec, + liovcnt: ::c_ulong, + remote_iov: *const ::iovec, + riovcnt: ::c_ulong, + flags: ::c_ulong) -> isize; } cfg_if! { diff --git a/src/unix/solaris/mod.rs b/src/unix/solaris/mod.rs index 740ed5add7..0cb7e54436 100644 --- a/src/unix/solaris/mod.rs +++ b/src/unix/solaris/mod.rs @@ -903,5 +903,6 @@ extern { pub fn uselocale(loc: ::locale_t) -> ::locale_t; pub fn getprogname() -> *const ::c_char; pub fn setprogname(name: *const ::c_char); + pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int; } |