Skip to content

std::thread::available_parallelism merging linux/android/freebsd version - #120589

Open
devnexen wants to merge 1 commit into
rust-lang:mainfrom
devnexen:cpuaff_fbsd_upd
Open

std::thread::available_parallelism merging linux/android/freebsd version#120589
devnexen wants to merge 1 commit into
rust-lang:mainfrom
devnexen:cpuaff_fbsd_upd

Conversation

@devnexen

@devnexen devnexen commented Feb 2, 2024

Copy link
Copy Markdown
Contributor

View all comments

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.

@rustbot

rustbot commented Feb 2, 2024

Copy link
Copy Markdown
Collaborator

r? @m-ou-se

(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 Feb 2, 2024
@rust-log-analyzer

This comment has been minimized.

Comment thread library/std/src/sys/pal/unix/thread.rs Outdated
@m-ou-se

m-ou-se commented Feb 8, 2024

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Feb 8, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 0bfcafd has been approved by m-ou-se

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 Feb 8, 2024
@Nadrieril

Copy link
Copy Markdown
Member

@bors rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2024
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.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2024
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.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2024
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.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2024
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.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 8, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#113026 (Introduce `run-make` V2 infrastructure, a `run_make_support` library and port over 2 tests as example)
 - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version)
 - rust-lang#120590 (Remove unused args from functions)
 - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
 - rust-lang#120693 (Invert diagnostic lints.)
 - rust-lang#120704 (A drive-by rewrite of `give_region_a_name()`)
 - rust-lang#120750 (No need to take `ImplTraitContext` by ref)
 - rust-lang#120765 (Reorder diagnostics API)
 - rust-lang#120772 (Remove myself from review rotation.)
 - rust-lang#120783 (Add release note for new ambiguous_wide_pointer_comparisons lint)

Failed merges:

 - rust-lang#120782 (Fix mir pass ICE in the presence of other errors)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 9, 2024
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.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120308 (core/time: avoid divisions in Duration::new)
 - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version)
 - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
 - rust-lang#120672 (std::thread update freebsd stack guard handling.)
 - rust-lang#120693 (Invert diagnostic lints.)
 - rust-lang#120704 (A drive-by rewrite of `give_region_a_name()`)
 - rust-lang#120806 (Clippy subtree update)
 - rust-lang#120809 (Use `transmute_unchecked` in `NonZero::new`.)
 - rust-lang#120817 (Fix more `ty::Error` ICEs in MIR passes)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 9, 2024
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.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#120584 (For a rigid projection, recursively look at the self type's item bounds to fix the `associated_type_bounds` feature)
 - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version)
 - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
 - rust-lang#120629 (Move some test files)
 - rust-lang#120846 (Update jobserver-rs to 0.1.28)
 - rust-lang#120850 (ast_lowering: Fix regression in `use ::{}` imports.)
 - rust-lang#120853 (Avoid a collection and iteration on empty passes)

Failed merges:

 - rust-lang#120549 (modify alias-relate to also normalize ambiguous opaques)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors r- rollup=never
linking failure
#120861 (comment)

@rustbot

rustbot commented Dec 2, 2025

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@devnexen

devnexen commented Dec 2, 2025

Copy link
Copy Markdown
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 2, 2025
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.

a
@blyxyas

blyxyas commented Dec 2, 2025

Copy link
Copy Markdown
Member

Does Clippy have anything to do with this pull request? It has the T-clippy label but I cannot see any related changes.

@Enselic

Enselic commented Dec 5, 2025

Copy link
Copy Markdown
Member

I've done a fairly careful review of the "diff of the diff" and convinced myself of that the new commit 3ccabb4 is equivalent to the already approved commit.

@bors r=m-ou-se

Does Clippy have anything to do with this pull request? It has the T-clippy label but I cannot see any related changes.

The clippy diff was subsequently force-pushed away.

@bors

bors commented Dec 5, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 3ccabb4 has been approved by m-ou-se

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 Dec 5, 2025
@devnexen

devnexen commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

Does Clippy have anything to do with this pull request? It has the T-clippy label but I cannot see any related changes.

not at all, in fact my branch was so old I synced badly locally, that is just it :)

bors added a commit that referenced this pull request Dec 5, 2025
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.
@bors

bors commented Dec 5, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3ccabb4 with merge e3f3d59...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job dist-x86_64-freebsd failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] rustc_query_impl test:false 138.695
[RUSTC-TIMING] rustc_driver test:false 8.493
error: linking with `x86_64-unknown-freebsd12-clang` failed: exit status: 1
  |
  = note:  "x86_64-unknown-freebsd12-clang" "-m64" "/tmp/rustcDM5tt9/symbols.o" "<1 object files omitted>" "-Wl,--as-needed" "-Wl,-Bdynamic" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/deps/librustc_driver-ea6df38576632e17.so" "-Wl,-Bstatic" "<sysroot>/lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler_builtins-*.rlib" "-Wl,-Bdynamic" "-lc++" "-lc" "-lrt" "-lutil" "-lexecinfo" "-lkvm" "-lmemstat" "-lkvm" "-lutil" "-lprocstat" "-lrt" "-ldevstat" "-lexecinfo" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lrt" "-lutil" "-lexecinfo" "-lkvm" "-lmemstat" "-lkvm" "-lutil" "-lprocstat" "-lrt" "-ldevstat" "-L" "/tmp/rustcDM5tt9/raw-dylibs" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/build/psm-a2b1386b6a4c2e24/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/build/blake3-9525560521e5f270/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/build/rustc_llvm-28f0c305d9ff5368/out" "-L" "/checkout/obj/build/x86_64-unknown-freebsd/llvm/lib" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/deps/rustc_main-1ca440777a4b1988" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-Wl,-O1" "-nodefaultlibs" "-Wl,-z,origin" "-Wl,-rpath,$ORIGIN/../lib"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: /usr/local/x86_64-unknown-freebsd12/bin/ld: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-freebsd/release/deps/librustc_driver-ea6df38576632e17.so: undefined reference to `sched_getaffinity'
          clang: error: linker command failed with exit code 1 (use -v to see invocation)
          
  = note: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified

@bors

bors commented Dec 5, 2025

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 5, 2025
@devnexen

devnexen commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

oh I see, the freebsd ABI had not been updated, so yes no chance to work as is.

@Enselic

Enselic commented Dec 5, 2025

Copy link
Copy Markdown
Member

Ok, let's marked as S-blocked for now. Just ping when this can be tried again.

@Enselic Enselic added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2025
@jhpratt

jhpratt commented Jan 4, 2026

Copy link
Copy Markdown
Member

@bors r- (sync)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jan 4, 2026
@Enselic Enselic added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-clippy Relevant to the Clippy team. labels Jan 5, 2026
@rust-bors

rust-bors Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #161396) made this pull request unmergeable. Please resolve the merge conflicts by rebasing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-android Operating system: Android O-freebsd Operating system: FreeBSD O-linux Operating system: Linux O-unix Operating system: Unix-like S-blocked Status: Blocked on something else such as an RFC or other implementation work. 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.