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

haiku thread affinity build fix #89462

Merged
merged 1 commit into from
Oct 5, 2021
Merged

haiku thread affinity build fix #89462

merged 1 commit into from
Oct 5, 2021

Conversation

devnexen
Copy link
Contributor

@devnexen devnexen commented Oct 2, 2021

No description provided.

@rust-highfive
Copy link
Collaborator

Updates src/tools/cargo.

cc @ehuss

@rust-highfive
Copy link
Collaborator

r? @dtolnay

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2021
@devnexen devnexen mentioned this pull request Oct 2, 2021
Merged
@nagisa
Copy link
Member

nagisa commented Oct 2, 2021 •
edited
Loading

Please rebase/adjust to remove the updates to submodules.

Just to make sure, since Haiku is not covered by the CI, has this been verified to build locally?

nagisa
nagisa reviewed Oct 2, 2021
View reviewed changes
library/std/src/sys/unix/thread.rs

Ok(unsafe { NonZeroUsize::new_unchecked(sinfo.cpu_count as usize) })
Ok(NonZeroUsize::new_unchecked(sinfo.cpu_count as usize))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This escaped my attention last time, but calls of unsafe functions in new code should be annotated with comments describing why a call like this is safe. In particular I'm having trouble finding haiku documentation for get_system_info that would guarantee that the returned cpu_count will be non-zero. A reference here would be great.

See e.g.

rust/library/core/src/ptr/unique.rs

Line 88 in 673d0db

// SAFETY: the caller must guarantee that `ptr` is non-null.
for an example of what I mean

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or you could use a checked constructor instead, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cpu_count field is filled with the number of cpus at boot time set here https://github.com/haiku/haiku/blob/04be20a75a6e09d9c2f801fc0e6ffd4e5b486950/src/system/kernel/main.cpp#L114 and taken here afterwards https://github.com/haiku/haiku/blob/8f16317a5b6db5c672f331814273e5857555020f/src/system/kernel/smp.cpp#L1481

@nagisa
Copy link
Member

nagisa commented Oct 2, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 2, 2021

📌 Commit 27e29b2e3a35b0280d51678583203a60f57b7509 has been approved by nagisa

@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 Oct 2, 2021
@nagisa nagisa assigned nagisa and unassigned dtolnay Oct 2, 2021
@nagisa
Copy link
Member

nagisa commented Oct 2, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 2, 2021

📌 Commit 98dde56 has been approved by nagisa

Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 3, 2021
@Manishearth
Rollup merge of rust-lang#89462 - devnexen:haiku_thread_aff_build_fix…
2cb53ab 
…, r=nagisa

haiku thread affinity build fix
@Manishearth Manishearth mentioned this pull request Oct 3, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 5, 2021
@Manishearth
Rollup merge of rust-lang#89462 - devnexen:haiku_thread_aff_build_fix…
c81173c 
…, r=nagisa

haiku thread affinity build fix
@Manishearth Manishearth mentioned this pull request Oct 5, 2021
Closed
@Manishearth Manishearth mentioned this pull request Oct 5, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 5, 2021
@bors
Auto merge of rust-lang#89549 - Manishearth:rollup-mhkyc16, r=Manishe…
074f636 
…arth

Rollup of 12 pull requests

Successful merges:

 - rust-lang#87631 (os current_exe using same approach as linux to get always the full ab…)
 - rust-lang#88234 (rustdoc-json: Don't ignore impls for primitive types)
 - rust-lang#88651 (Use the 64b inner:monotonize() implementation not the 128b one for aarch64)
 - rust-lang#88816 (Rustdoc migrate to table so the gui can handle >2k constants)
 - rust-lang#89244 (refactor: VecDeques PairSlices fields to private)
 - rust-lang#89364 (rustdoc-json: Encode json files with UTF-8)
 - rust-lang#89423 (Fix ICE caused by non_exaustive_omitted_patterns struct lint)
 - rust-lang#89426 (bootstrap: add config option for nix patching)
 - rust-lang#89462 (haiku thread affinity build fix)
 - rust-lang#89482 (Follow the diagnostic output style guide)
 - rust-lang#89504 (Don't suggest replacing region with 'static in NLL)
 - rust-lang#89535 (fix busted JavaScript in error index generator)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a23d7f0 into rust-lang:master Oct 5, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 5, 2021
@workingjubilee workingjubilee added the O-haiku Target: Be extant; from mouldering old leaves; spring arrives again label Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nagisa nagisa nagisa left review comments

Assignees

@nagisa nagisa

Labels
O-haiku Target: Be extant; from mouldering old leaves; spring arrives again S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.
7 participants
@devnexen @rust-highfive @nagisa @bors @dtolnay @workingjubilee @rustbot