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

bors · bors · commit eb637d277356 · 2016-06-01T23:22:37.000-07:00
Adding sched_getcpu() for Android and Linux

None
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! {

Original file line number	Diff line number	Diff line change
`@@ -560,6 +560,7 @@ extern {`
`560`	`560`	`pub fn __sched_cpualloc(count: ::size_t) -> *mut ::cpu_set_t;`
`561`	`561`	`pub fn __sched_cpufree(set: *mut ::cpu_set_t);`
`562`	`562`	`pub fn __sched_cpucount(setsize: ::size_t, set: *mut cpu_set_t) -> ::c_int;`
	`563`	`+ pub fn sched_getcpu() -> ::c_int;`
`563`	`564`	`}`
`564`	`565`
`565`	`566`	`cfg_if! {`
Original file line number	Diff line number	Diff line change
`@@ -506,6 +506,7 @@ extern {`
`506`	`506`	`pub fn pthread_setaffinity_np(thread: ::pthread_t,`
`507`	`507`	`cpusetsize: ::size_t,`
`508`	`508`	`cpuset: *const ::cpu_set_t) -> ::c_int;`
	`509`	`+ pub fn sched_getcpu() -> ::c_int;`
`509`	`510`	`}`
`510`	`511`
`511`	`512`	`cfg_if! {`