Auto merge of #2184 - devnexen:dflybsd_affinity, r=JohnTitor

dragonflybsd cpu affinity api
rust-lang · May 23, 2021 · 40c502b · 40c502b
2 parents 335b919 + 677a1b4
commit 40c502b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -1146,6 +1146,7 @@ fn test_dragonflybsd(target: &str) {
         "sys/ptrace.h",
         "sys/resource.h",
         "sys/rtprio.h",
+        "sys/sched.h",
         "sys/socket.h",
         "sys/stat.h",
         "sys/statvfs.h",

diff --git a/libc-test/semver/dragonfly.txt b/libc-test/semver/dragonfly.txt
@@ -137,6 +137,10 @@ CMSG_LEN
 CMSG_NXTHDR
 CMSG_SPACE
 CODESET
+CPU_CLR
+CPU_ISSET
+CPU_SET
+CPU_ZERO
 CRNCYSTR
 CRTSCTS
 CRTS_IFLOW

diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -22,6 +22,9 @@ pub type idtype_t = ::c_uint;
 pub type mqd_t = ::c_int;
 pub type sem_t = *mut sem;
 
+pub type cpuset_t = cpumask_t;
+pub type cpu_set_t = cpumask_t;
+
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum sem {}
 impl ::Copy for sem {}
@@ -184,6 +187,10 @@ s! {
         pub ss_size: ::size_t,
         pub ss_flags: ::c_int,
     }
+
+    pub struct cpumask_t {
+        ary: [u64; 4],
+    }
 }
 
 s_no_extra_traits! {
@@ -1056,6 +1063,29 @@ f! {
         (_CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) +
             _CMSG_ALIGN(length as usize)) as ::c_uint
     }
+
+    pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
+        for slot in cpuset.ary.iter_mut() {
+            *slot = 0;
+        }
+    }
+
+    pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        cpuset.ary[idx] |= 1 << offset;
+        ()
+    }
+
+    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        cpuset.ary[idx] &= !(1 << offset);
+        ()
+    }
+
+    pub fn CPU_ISSET(cpu: usize, cpuset: &mut cpu_set_t) -> bool {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        0 != cpuset.ary[idx] & (1 << offset)
+    }
 }
 
 safe_f! {
@@ -1098,6 +1128,9 @@ extern "C" {
         needle: *const ::c_void,
         needlelen: ::size_t,
     ) -> *mut ::c_void;
+    pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *mut cpu_set_t) -> ::c_int;
+    pub fn sched_setaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *const cpu_set_t)
+        -> ::c_int;
 }
 
 #[link(name = "rt")]