Truncate thread names on Linux and Apple targets by cuviper · Pull Request #103379 · rust-lang/rust

cuviper · 2022-10-22T00:53:00Z

These targets have system limits on the thread names, 16 and 64 bytes
respectively, and pthread_setname_np returns an error if the name is
longer. However, we're not in a context that can propagate errors when
we call this, and we used to implicitly truncate on Linux with prctl,
so now we manually truncate these names ahead of time.

r? @thomcc

These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time.

cuviper · 2022-10-22T00:55:18Z

The loss of prctl truncation since #100287 makes that a regression, headed for 1.65. We should either backport this change or revert to prctl on beta.

@rustbot label +beta-nominated

thomcc · 2022-10-22T01:44:53Z

Looks good to me, thanks! (Kinda wild that 16 bytes is the norm on Linux, but so it goes)

@bors r+

bors · 2022-10-22T01:44:55Z

📌 Commit 12e4584 has been approved by thomcc

It is now in the queue for this repository.

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? `@thomcc`

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ``@thomcc``

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ```@thomcc```

notriddle · 2022-10-23T04:23:15Z

Failed in rollup #103419 (comment)

@bors r-

cuviper · 2022-10-23T18:48:00Z

Ah, musl added pthread_setname_np in 1.1.16, but pthread_getname_np wasn't added until 1.2.3, just this year. As that is only for a test, I think we can safely guard that for only linux-gnu.

cuviper · 2022-10-23T18:55:16Z

Added that simple test gating...

@bors r=thomcc

bors · 2022-10-23T18:55:17Z

📌 Commit 15cfeb3 has been approved by thomcc

It is now in the queue for this repository.

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? `@thomcc`

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ``@thomcc``

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ```@thomcc```

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ````@thomcc````

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? `````@thomcc`````

Rollup of 6 pull requests Successful merges: - rust-lang#98204 (Stabilize `Option::unzip()`) - rust-lang#102587 (rustc: Use `unix_sigpipe` instead of `rustc_driver::set_sigpipe_handler`) - rust-lang#103122 (Remove misc_cast and validate types when casting) - rust-lang#103379 (Truncate thread names on Linux and Apple targets) - rust-lang#103482 (Clairify Vec::capacity docs) - rust-lang#103511 (Codegen tweaks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

RalfJung · 2022-10-26T08:58:16Z

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

        unsafe {
            // Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20.
+            let name = truncate_cstr(name, TASK_COMM_LEN);
            libc::pthread_setname_np(libc::pthread_self(), name.as_ptr());


Would it make sense to at least debug_assert that no error is being returned here? Or even to assert that?

I would be fine with adding a debug_assert. I don't think it's worth a full assert though -- it could be blocked by seccomp or something, for whatever reason, but this isn't really a critical panic-worthy failure.

…mulacrum [beta] backport rollup * poll_fn and Unpin: fix pinning rust-lang#102737 * Support raw-dylib functions being used inside inlined functions rust-lang#102988 * Fix line numbers for MIR inlined code rust-lang#103071 * Add architectures to fn create_object_file rust-lang#103240 * Add eval hack in super_relate_consts back rust-lang#103279 * Mark std::os::wasi::io::AsFd etc. as stable. rust-lang#103308 * Truncate thread names on Linux and Apple targets rust-lang#103379 * Do not consider repeated lifetime params for elision. rust-lang#103450 * rustdoc: add missing URL redirect rust-lang#103588 * Remove commit_if_ok probe from NLL type relation rust-lang#103601 Also includes a copy of the release notes. r? `@ghost`

…omcc Truncate thread names on Linux and Apple targets These targets have system limits on the thread names, 16 and 64 bytes respectively, and `pthread_setname_np` returns an error if the name is longer. However, we're not in a context that can propagate errors when we call this, and we used to implicitly truncate on Linux with `prctl`, so now we manually truncate these names ahead of time. r? ``````@thomcc``````

Rollup of 6 pull requests Successful merges: - rust-lang#98204 (Stabilize `Option::unzip()`) - rust-lang#102587 (rustc: Use `unix_sigpipe` instead of `rustc_driver::set_sigpipe_handler`) - rust-lang#103122 (Remove misc_cast and validate types when casting) - rust-lang#103379 (Truncate thread names on Linux and Apple targets) - rust-lang#103482 (Clairify Vec::capacity docs) - rust-lang#103511 (Codegen tweaks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned thomcc Oct 22, 2022

rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 22, 2022

This comment was marked as resolved.

Sign in to view

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 22, 2022

rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 22, 2022

Move truncation next to other thread tests for tidy

12e4584

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 22, 2022

notriddle mentioned this pull request Oct 22, 2022

Rollup of 10 pull requests #103417

Closed

notriddle mentioned this pull request Oct 22, 2022

Rollup of 9 pull requests #103419

Closed

JohnTitor mentioned this pull request Oct 22, 2022

Rollup of 8 pull requests #103420

Closed

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-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 23, 2022

Only test pthread_getname_np on linux-gnu

15cfeb3

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2022

Dylan-DPC mentioned this pull request Oct 24, 2022

Rollup of 7 pull requests #103461

Closed

Dylan-DPC mentioned this pull request Oct 24, 2022

Rollup of 6 pull requests #103472

Closed

Dylan-DPC mentioned this pull request Oct 24, 2022

Rollup of 6 pull requests #103483

Closed

Dylan-DPC mentioned this pull request Oct 25, 2022

Rollup of 6 pull requests #103510

Closed

Dylan-DPC mentioned this pull request Oct 25, 2022

Rollup of 6 pull requests #103512

Closed

Dylan-DPC mentioned this pull request Oct 25, 2022

Rollup of 6 pull requests #103513

Merged

bors merged commit 75023d6 into rust-lang:master Oct 25, 2022

rustbot added this to the 1.66.0 milestone Oct 25, 2022

RalfJung reviewed Oct 26, 2022

View reviewed changes

m-ou-se added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 26, 2022

Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 29, 2022

Mark-Simulacrum modified the milestones: 1.66.0, 1.65.0 Oct 29, 2022

Mark-Simulacrum mentioned this pull request Oct 29, 2022

[beta] backport rollup #103739

Merged

cuviper mentioned this pull request Oct 30, 2022

linux: Use pthread_setname_np instead of prctl #100287

Merged

cuviper deleted the truncate-thread-name branch May 21, 2023 03:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Truncate thread names on Linux and Apple targets#103379

Truncate thread names on Linux and Apple targets#103379
bors merged 3 commits intorust-lang:masterfrom
cuviper:truncate-thread-name

cuviper commented Oct 22, 2022

Uh oh!

This comment was marked as resolved.

cuviper commented Oct 22, 2022

Uh oh!

thomcc commented Oct 22, 2022

Uh oh!

bors commented Oct 22, 2022

Uh oh!

notriddle commented Oct 23, 2022

Uh oh!

cuviper commented Oct 23, 2022

Uh oh!

cuviper commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

RalfJung Oct 26, 2022

Uh oh!

cuviper Oct 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

cuviper commented Oct 22, 2022

Uh oh!

This comment was marked as resolved.

cuviper commented Oct 22, 2022

Uh oh!

thomcc commented Oct 22, 2022

Uh oh!

bors commented Oct 22, 2022

Uh oh!

notriddle commented Oct 23, 2022

Uh oh!

cuviper commented Oct 23, 2022

Uh oh!

cuviper commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

RalfJung Oct 26, 2022

Choose a reason for hiding this comment

Uh oh!

cuviper Oct 26, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants