Fix macOS tests and bump MSRV

iddm · Nov 13, 2023 · 1f69973 · 1f69973
1 parent 6f980a9
commit 1f69973
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 env:
-  minrust: 1.46.0
+  minrust: 1.56.0
 
 jobs:
   test:

diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 license = "MIT"
 keywords = ["thread", "schedule", "priority", "pthread"]
 categories = ["concurrency", "asynchronous", "os"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 rstest = "0.13"

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ A simple library to control thread schedule policies and thread priority.
 If your operating system isn't yet supported, please, create an issue.
 
 ## Minimal Rust Compiler Version
-Is `1.46`. If you need any help making it possible to compile with `1.36` please reach out.
+Is `1.56`. If you need any help making it possible to compile with `1.36` please reach out.
 
 ## Supported platforms
 - Linux

diff --git a/src/unix.rs b/src/unix.rs
@@ -308,13 +308,25 @@ impl ThreadPriority {
                 #[cfg(any(target_os = "linux", target_os = "android"))]
                 return Ok(NICENESS_MAX as libc::c_int);
 
-                // On other systems there is no notion of using niceness
-                // for just threads but for whole processes instead.
-                #[cfg(not(any(target_os = "linux", target_os = "android")))]
-                Err(Error::Priority(
-                    "This OS doesn't support specifying this thread priority with this policy.
+                // On macOS/iOS, it is allowed to specify the priority
+                // using sched params.
+                if cfg!(any(target_os = "macos", target_os = "ios")) {
+                    let max_priority = unsafe { libc::sched_get_priority_max(policy.to_posix()) };
+                    if max_priority < 0 {
+                        Err(Error::OS(errno()))
+                    } else {
+                        Ok(max_priority)
+                    }
+                } else if cfg!(not(any(target_os = "linux", target_os = "android"))) {
+                    // On other systems there is no notion of using niceness
+                    // for just threads but for whole processes instead.
+                    return Err(Error::Priority(
+                        "This OS doesn't support specifying this thread priority with this policy.
                     Consider changing the scheduling policy.",
-                ))
+                    ));
+                } else {
+                    return Err(Error::Priority("This OS is unsupported."));
+                }
             }
             _ => {
                 let max_priority = unsafe { libc::sched_get_priority_max(policy.to_posix()) };
@@ -339,14 +351,24 @@ impl ThreadPriority {
                 {
                     Ok(NICENESS_MIN as libc::c_int)
                 }
-                // On other systems there is no notion of using niceness
-                // for just threads but for whole processes instead.
-                #[cfg(not(any(target_os = "linux", target_os = "android")))]
-                {
-                    Err(Error::Priority(
+                // On macOS/iOS, it is allowed to specify the priority
+                // using sched params.
+                if cfg!(any(target_os = "macos", target_os = "ios")) {
+                    let min_priority = unsafe { libc::sched_get_priority_min(policy.to_posix()) };
+                    if min_priority < 0 {
+                        Err(Error::OS(errno()))
+                    } else {
+                        Ok(min_priority)
+                    }
+                } else if cfg!(not(any(target_os = "linux", target_os = "android"))) {
+                    // On other systems there is no notion of using niceness
+                    // for just threads but for whole processes instead.
+                    return Err(Error::Priority(
                         "This OS doesn't support specifying this thread priority with this policy.
                     Consider changing the scheduling policy.",
-                    ))
+                    ));
+                } else {
+                    return Err(Error::Priority("This OS is unsupported."));
                 }
             }
             _ => {
@@ -412,6 +434,20 @@ impl ThreadPriority {
                 ThreadSchedulePolicy::Realtime(_) => {
                     Self::to_allowed_value_for_policy(p as i32, policy).map(|v| v as u32)
                 }
+                // XNU and the derivatives allow to change the priority
+                // for the SCHED_OTHER policy.
+                // <https://www.usenix.org/legacy/publications/library/proceedings/bsdcon02/full_papers/gerbarg/gerbarg_html/index.html>
+                #[cfg(all(
+                    any(target_os = "macos", target_os = "ios"),
+                    not(target_arch = "wasm32")
+                ))]
+                ThreadSchedulePolicy::Normal(_) => {
+                    Self::to_allowed_value_for_policy(p as i32, policy).map(|v| v as u32)
+                }
+                #[cfg(not(all(
+                    any(target_os = "macos", target_os = "ios"),
+                    not(target_arch = "wasm32")
+                )))]
                 ThreadSchedulePolicy::Normal(_) => {
                     // Mapping a [0..100] priority into niceness [-20..20] needs reversing the ratio,
                     // as the lowest nice is actually the highest priority.