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

Avoid heap allocation when truncating thread names #105239

Merged
merged 1 commit into from
Dec 10, 2022

Conversation

gh2o
Copy link
Contributor

@gh2o gh2o commented Dec 4, 2022

Ensure that heap allocation does not occur in a thread until std::thread is ready. This fixes issues with custom allocators that call std::thread::current(), since doing so prematurely initializes THREAD_INFO and causes the following thread_info::set() to fail.

@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2022

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

Please see the contribution instructions for more information.

@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 Dec 4, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2022

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

@gh2o
Copy link
Contributor Author

gh2o commented Dec 4, 2022

r? @cuviper

@rustbot rustbot assigned cuviper and unassigned m-ou-se Dec 4, 2022
@gh2o gh2o force-pushed the no-heap-alloc-on-thread-start branch from 7b2d28d to 900ef70 Compare December 4, 2022 06:17
library/std/src/sys/unix/thread.rs Outdated Show resolved Hide resolved
library/std/src/sys/unix/thread.rs Outdated Show resolved Hide resolved
@gh2o gh2o force-pushed the no-heap-alloc-on-thread-start branch from fd35f66 to 497eabf Compare December 5, 2022 21:14
@gh2o gh2o requested review from CryZe and cuviper and removed request for CryZe and cuviper December 5, 2022 23:51
Ensure that heap allocation does not occur in a thread until std::thread
is ready. This fixes issues with custom allocators that call
std::thread::current(), since doing so prematurely initializes
THREAD_INFO and causes the following thread_info::set() to fail.
@gh2o gh2o force-pushed the no-heap-alloc-on-thread-start branch from 497eabf to 3c55af5 Compare December 7, 2022 21:12
@gh2o gh2o requested a review from cuviper December 7, 2022 22:20
@cuviper
Copy link
Member

cuviper commented Dec 7, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 7, 2022

📌 Commit 3c55af5 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 Dec 7, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#104460 (Migrate parts of `rustc_expand` to session diagnostics)
 - rust-lang#105192 (Point at LHS on binop type err if relevant)
 - rust-lang#105234 (Remove unneeded field from `SwitchTargets`)
 - rust-lang#105239 (Avoid heap allocation when truncating thread names)
 - rust-lang#105410 (Consider `parent_count` for const param defaults)
 - rust-lang#105482 (Fix invalid codegen during debuginfo lowering)

Failed merges:

 - rust-lang#105411 (Introduce `with_forced_trimmed_paths`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 43bee03 into rust-lang:master Dec 10, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants