Skip to content
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

Jump to bottom

Add FreeBSD cpuset support to std::thread::available_concurrency #110830

Merged
merged 1 commit into from
May 6, 2023
Merged

Add FreeBSD cpuset support to std::thread::available_concurrency #110830

merged 1 commit into from
May 6, 2023

Conversation

Freaky
Copy link
Contributor

@Freaky Freaky commented Apr 25, 2023

Use libc::cpuset_getaffinity to determine the CPUs available to the current process.

The existing sysconf and sysctl paths are left as fallback.

@Freaky
Add FreeBSD cpuset support to std::thread::available_concurrency
e5e640c 
Use libc::cpuset_getaffinity to determine the CPUs available to the current process.

The existing sysconf and sysctl paths are left as fallback.
@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @thomcc (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 25, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@Freaky
Copy link
Contributor Author

Freaky commented Apr 25, 2023

A similar change is in progress with num_cpus: seanmonstar/num_cpus#133

@Freaky Freaky changed the title Add FreeBSD cpuset support to std::thread::available_concurrency Add FreeBSD cpuset support to std::thread::available_concurrency Apr 25, 2023
@thomcc
Copy link
Member

thomcc commented May 5, 2023

Based on the documentation here https://man.freebsd.org/cgi/man.cgi?query=cpuset&sektion=2&apropos=0&manpath=FreeBSD+13.2-RELEASE+and+Ports (which indicates that it's supported in all versions we support) and a brief smoke-test of this function in a VM, this seems fine to me.

Just to check: there's no non-obvious downside to this, is there?

@thomcc
Copy link
Member

thomcc commented May 5, 2023

Taking a closer look, the old code still exist as fallback (even in cases of a concrete error), and these functions seem to be guaranteed present in freebsd's libc from 7.1 and up. So I think this is fine.

@bors r+

@bors
Copy link
Contributor

bors commented May 5, 2023

📌 Commit e5e640c has been approved by thomcc

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 5, 2023
@JohnTitor JohnTitor mentioned this pull request May 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2023
@bors
Auto merge of rust-lang#111271 - JohnTitor:rollup-t07qk1c, r=JohnTitor
6d140d5 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#109677 (Stabilize raw-dylib, link_ordinal, import_name_type and -Cdlltool)
 - rust-lang#110780 (rustdoc-search: add slices and arrays to index)
 - rust-lang#110830 (Add FreeBSD cpuset support to `std::thread::available_concurrency`)
 - rust-lang#111139 (Fix MXCSR configuration dependent timing)
 - rust-lang#111239 (Remove unnecessary attribute from a diagnostic)
 - rust-lang#111246 (forbid escaping bound vars in combine)
 - rust-lang#111251 (Issue 109502 follow up, remove unnecessary Vec::new() from compile_test())
 - rust-lang#111261 (Mark `ErrorGuaranteed` constructor as deprecated so people don't use it)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3d9a1de into rust-lang:master May 6, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@thomcc thomcc

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
4 participants
@Freaky @rustbot @thomcc @bors