Use the OS thread name by default if `THREAD_INFO` has not been initialized by ChrisDenton · Pull Request #121666 · rust-lang/rust

ChrisDenton · 2024-02-27T04:09:53Z

Currently if THREAD_INFO hasn't been initialized then the name will be set to None. This PR changes it to use the OS thread name by default. This mostly affects foreign threads at the moment but we could expand this to make more use of the OS thread name in the future.

Note: I've only implemented Thread::get_name for windows, linux and macos (and macos adjacent) targets. The rest just return None.

library/std/src/sys/pal/windows/thread.rs

library/std/src/sys/pal/unix/thread.rs

cuviper · 2024-03-01T20:24:06Z

@bors r+

bors · 2024-03-01T20:24:08Z

📌 Commit 6cb0c40 has been approved by cuviper

It is now in the queue for this repository.

Use the OS thread name by default if `THREAD_INFO` has not been initialized Currently if `THREAD_INFO` hasn't been initialized then the name will be set to `None`. This PR changes it to use the OS thread name by default. This mostly affects foreign threads at the moment but we could expand this to make more use of the OS thread name in the future. Note: I've only implemented `Thread::get_name` for windows, linux and macos (and macos adjacent) targets. The rest just return `None`.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#121194 (Refactor pre-getopts command line argument handling) - rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) - rust-lang#121758 (Move thread local implementation to `sys`) - rust-lang#121759 (attempt to further clarify addr_of docs) - rust-lang#121888 (style library/core/src/error.rs) - rust-lang#121892 (The ordinary lowering of `thir::ExprKind::Let` is unreachable) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) - rust-lang#121758 (Move thread local implementation to `sys`) - rust-lang#121759 (attempt to further clarify addr_of docs) - rust-lang#121855 (Correctly generate item info of trait items) - rust-lang#121888 (style library/core/src/error.rs) - rust-lang#121892 (The ordinary lowering of `thir::ExprKind::Let` is unreachable) - rust-lang#121895 (avoid collecting into vecs in some places) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#121666 - ChrisDenton:thread-name, r=cuviper Use the OS thread name by default if `THREAD_INFO` has not been initialized Currently if `THREAD_INFO` hasn't been initialized then the name will be set to `None`. This PR changes it to use the OS thread name by default. This mostly affects foreign threads at the moment but we could expand this to make more use of the OS thread name in the future. Note: I've only implemented `Thread::get_name` for windows, linux and macos (and macos adjacent) targets. The rest just return `None`.

RalfJung · 2024-03-03T07:41:54Z

library/std/src/thread/tests.rs

+        Thread::set_name(name);
+        assert_eq!(name, Thread::get_name().unwrap().as_c_str());
+    });
+    handler.join().unwrap();


Is there a particular reason why this test runs in a new thread, rather than the main thread?

I was worried about affecting the thread name for all tests.

Ah, makes sense. A comment explaining that would have avoided some surprise and confusion here. :)

rust-lang/rust#121666 caused regression on hexagon linux-musl: ``` ld.lld: error: undefined symbol: pthread_getname_np ```

This reverts rust-lang#121666 due to rust-lang#123495

…ngjubilee Revert "Use OS thread name by default" This reverts rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) due to rust-lang#123495 (Thread names are not always valid UTF-8). It's not a direct revert because there have been other changes since that PR.

Rollup merge of rust-lang#123505 - ChrisDenton:revert-121666, r=workingjubilee Revert "Use OS thread name by default" This reverts rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) due to rust-lang#123495 (Thread names are not always valid UTF-8). It's not a direct revert because there have been other changes since that PR.

This reverts rust-lang#121666 due to rust-lang#123495 This has already been done on master but beta needs something that will backport cleanly.

This reverts rust-lang#121666 due to rust-lang#123495 This has already been done on master but beta needs something that will backport cleanly. (cherry picked from commit 081ad85)

rustbot assigned cuviper Feb 27, 2024

rustbot added O-unix Operating system: Unix-like O-windows Operating system: Windows 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 27, 2024

ChrisDenton changed the title ~~Use the OS thread name by default if ThreadInfo has not been initialized~~ Use the OS thread name by default if THREAD_INFO has not been initialized Feb 27, 2024

ollie27 reviewed Feb 27, 2024

View reviewed changes

library/std/src/sys/pal/windows/thread.rs Outdated Show resolved Hide resolved

ChrisDenton force-pushed the thread-name branch from 9b7e102 to f3546a2 Compare February 27, 2024 14:26

ChrisDenton added 2 commits February 27, 2024 11:28

Use the OS thread name by default for the current thread

7c41af2

Test getting the OS thread name

c84ba23

ChrisDenton force-pushed the thread-name branch from f3546a2 to c84ba23 Compare February 27, 2024 14:28

cuviper reviewed Mar 1, 2024

View reviewed changes

library/std/src/sys/pal/unix/thread.rs Show resolved Hide resolved

Add get_name placeholder to other targets

6cb0c40

rustbot added O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-wasi Operating system: Wasi, Webassembly System Interface labels Mar 1, 2024

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 Mar 1, 2024

matthiaskrgr mentioned this pull request Mar 2, 2024

Rollup of 6 pull requests #121897

Closed

matthiaskrgr mentioned this pull request Mar 2, 2024

Rollup of 7 pull requests #121904

Merged

bors merged commit 0f544f2 into rust-lang:master Mar 2, 2024

rustbot added this to the 1.78.0 milestone Mar 2, 2024

ChrisDenton deleted the thread-name branch March 3, 2024 01:52

RalfJung reviewed Mar 3, 2024

View reviewed changes

taiki-e added a commit to taiki-e/rust-cross-toolchain that referenced this pull request Mar 3, 2024

linux-musl: Add patch to fix build error on hexagon

f4527d8

rust-lang/rust#121666 caused regression on hexagon linux-musl: ``` ld.lld: error: undefined symbol: pthread_getname_np ```

taiki-e added a commit to taiki-e/atomic-maybe-uninit that referenced this pull request Mar 3, 2024

ci: Pin nightly toolchain for hexagon test

73a786f

rust-lang/rust#121666 caused regression on hexagon linux-musl: ``` ld.lld: error: undefined symbol: pthread_getname_np ```

ehuss mentioned this pull request Mar 4, 2024

Cargo error after installing last nightly on aarch64-unknown-linux-musl (Alpine 3.15 based docker container) #121980

Closed

joboet mentioned this pull request Apr 5, 2024

Thread names are not always valid UTF-8 #123495

Closed

ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Apr 5, 2024

Revert rust-lang#121666

7d00826

This reverts rust-lang#121666 due to rust-lang#123495

ChrisDenton mentioned this pull request Apr 5, 2024

Revert "Use OS thread name by default" #123505

Merged

ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Apr 6, 2024

Beta revert "Use OS thread name by default"

081ad85

This reverts rust-lang#121666 due to rust-lang#123495 This has already been done on master but beta needs something that will backport cleanly.

ChrisDenton mentioned this pull request Apr 6, 2024

Beta revert "Use OS thread name by default" #123533

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Use the OS thread name by default if `THREAD_INFO` has not been initialized#121666

Use the OS thread name by default if `THREAD_INFO` has not been initialized#121666
bors merged 3 commits intorust-lang:masterfrom
ChrisDenton:thread-name

ChrisDenton commented Feb 27, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

cuviper commented Mar 1, 2024

Uh oh!

bors commented Mar 1, 2024

Uh oh!

RalfJung Mar 3, 2024

Uh oh!

ChrisDenton Mar 3, 2024

Uh oh!

RalfJung Mar 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

ChrisDenton commented Feb 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cuviper commented Mar 1, 2024

Uh oh!

bors commented Mar 1, 2024

Uh oh!

RalfJung Mar 3, 2024

Choose a reason for hiding this comment

Uh oh!

ChrisDenton Mar 3, 2024

Choose a reason for hiding this comment

Uh oh!

RalfJung Mar 3, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ChrisDenton commented Feb 27, 2024 •

edited

Loading