Auto merge of rust-lang#299 - lemonrock:sched_getcpu, r=alexcrichton

Adding sched_getcpu() for Android and Linux None
keeperofdakeys · Jun 2, 2016 · eb637d2 · eb637d2
2 parents 45d8589 + ae664ff
commit eb637d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
@@ -560,6 +560,7 @@ extern {
     pub fn __sched_cpualloc(count: ::size_t) -> *mut ::cpu_set_t;
     pub fn __sched_cpufree(set: *mut ::cpu_set_t);
     pub fn __sched_cpucount(setsize: ::size_t, set: *mut cpu_set_t) -> ::c_int;
+    pub fn sched_getcpu() -> ::c_int;
 }
 
 cfg_if! {

diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
@@ -506,6 +506,7 @@ extern {
     pub fn pthread_setaffinity_np(thread: ::pthread_t,
                                   cpusetsize: ::size_t,
                                   cpuset: *const ::cpu_set_t) -> ::c_int;
+    pub fn sched_getcpu() -> ::c_int;
 }
 
 cfg_if! {