Skip to content

Revert "Rollup merge of #120589 - devnexen:cpuaff_fbsd_upd, r=clarfonthey" #163498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Sep 30, 2026
Merged

Revert "Rollup merge of #120589 - devnexen:cpuaff_fbsd_upd, r=clarfonthey" #163498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions library/std/src/sys/thread/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
target_os = "hurd",
target_os = "linux",
target_os = "aix",
target_os = "freebsd",
target_vendor = "apple",
target_os = "cygwin",
target_os = "redox",
Expand All @@ -175,17 +174,9 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
#[cfg(any(target_os = "android", target_os = "linux"))]
{
quota = cgroups::quota().max(1);
}

#[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() };
let mut set: libc::cpu_set_t = unsafe { mem::zeroed() };
unsafe {
if libc::sched_getaffinity(0, size_of::<Cpuset>(), &mut set) == 0 {
if libc::sched_getaffinity(0, size_of::<libc::cpu_set_t>(), &mut set) == 0 {
let count = libc::CPU_COUNT(&set) as usize;
let count = count.min(quota);

Expand All @@ -210,9 +201,34 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
}
}
}
any(target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd") => {
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,
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 {
Expand Down
Loading