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.

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

Fall back to _SC_NPROCESSORS_ONLN if sched_getaffinity returns an empty mask #116038

Merged
merged 1 commit into from Sep 22, 2023

Conversation

the8472
Copy link
Member

@the8472 the8472 commented Sep 21, 2023

Followup to #115946
A gentler fix for #115868, one that doesn't panic, suggested on zulip

In that situation - on the buggy kernel versions - a zero-mask means no affinities have been set so _SC_NPROCESSORS_ONLN provides the right value.

@rustbot
Copy link
Collaborator

rustbot commented Sep 21, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added O-unix Operating system: Unix-like 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 Sep 21, 2023
@rust-log-analyzer

This comment has been minimized.

@the8472 the8472 force-pushed the panic-on-sched_getaffinity-bug branch from ad47c23 to 31cfa4a Compare September 21, 2023 18:05
@cuviper
Copy link
Member

cuviper commented Sep 22, 2023

r? cuviper

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 22, 2023

📌 Commit 31cfa4a has been approved by cuviper

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 Sep 22, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 22, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#114379 (Command: also print removed env vars)
 - rust-lang#116034 (add UI test for delimiter errors)
 - rust-lang#116036 (tests/ui: Split large_moves.rs and move to lint/large_assignments)
 - rust-lang#116038 (Fall back to _SC_NPROCESSORS_ONLN if sched_getaffinity returns an empty mask)
 - rust-lang#116039 (Account for nested `impl Trait` in TAIT)
 - rust-lang#116041 (Add note to `is_known_rigid`)
 - rust-lang#116049 (give FutureIncompatibilityReason variants more explicit names)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit faf13dd into rust-lang:master Sep 22, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 22, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 22, 2023
Rollup merge of rust-lang#116038 - the8472:panic-on-sched_getaffinity-bug, r=cuviper

Fall back to _SC_NPROCESSORS_ONLN if sched_getaffinity returns an empty mask

Followup to rust-lang#115946
A gentler fix for rust-lang#115868, one that doesn't panic, [suggested on zulip](https://rust-lang.zulipchat.com/#narrow/stream/259402-t-libs.2Fmeetings/topic/Meeting.202023-09-19/near/391942927)

In that situation - on the buggy kernel versions - a zero-mask means no affinities have been set so `_SC_NPROCESSORS_ONLN` provides the right value.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-unix Operating system: Unix-like 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants