From 6f9f448fe177c91ddca6803860ec17aa923be25e Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Fri, 2 Feb 2024 20:55:44 +0000
Subject: [PATCH] std::thread::available_parallelism merging
linux/android/freebsd version
FreeBSD 13.1 had introduced a sched cpu affinity compatibility layer
with Linux. 13.0 and even 13.1 being EOL, we can simplify here.
---
library/std/src/sys/pal/unix/thread.rs | 33 +++++++++-----------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs
index f657f82e6e368..a86ec1edf1409 100644
--- a/library/std/src/sys/pal/unix/thread.rs
+++ b/library/std/src/sys/pal/unix/thread.rs
@@ -353,6 +353,7 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
target_os = "hurd",
target_os = "linux",
target_os = "aix",
+ target_os = "freebsd",
target_vendor = "apple",
))] {
#[allow(unused_assignments)]
@@ -362,9 +363,17 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
#[cfg(any(target_os = "android", target_os = "linux"))]
{
quota = cgroups::quota().max(1);
- let mut set: libc::cpu_set_t = unsafe { mem::zeroed() };
+ }
+
+ #[cfg(any(target_os = "android", target_os = "linux", target_os = "freebsd"))]
+ {
+ #[cfg(not(target_os = "freebsd"))]
+ type cpuset = libc::cpu_set_t;
+ #[cfg(target_os = "freebsd")]
+ type cpuset = libc::cpuset_t;
+ let mut set: cpuset = unsafe { mem::zeroed() };
unsafe {
- if libc::sched_getaffinity(0, mem::size_of::<libc::cpu_set_t>(), &mut set) == 0 {
+ if libc::sched_getaffinity(0, mem::size_of::<cpuset>(), &mut set) == 0 {
let count = libc::CPU_COUNT(&set) as usize;
let count = count.min(quota);
@@ -389,32 +398,12 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
}
}
} else if #[cfg(any(
- target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
target_os = "netbsd",
))] {
use crate::ptr;
- #[cfg(target_os = "freebsd")]
- {
- let mut set: libc::cpuset_t = unsafe { mem::zeroed() };
- unsafe {
- if libc::cpuset_getaffinity(
- libc::CPU_LEVEL_WHICH,
- libc::CPU_WHICH_PID,
- -1,
- mem::size_of::<libc::cpuset_t>(),
- &mut set,
- ) == 0 {
- let count = libc::CPU_COUNT(&set) as usize;
- if count > 0 {
- return Ok(NonZero::new_unchecked(count));
- }
- }
- }
- }
-
#[cfg(target_os = "netbsd")]
{
unsafe {