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

Fix ThreadId implementation on targets without atomicu64 #5356

Merged
merged 1 commit into from Jan 6, 2023

Conversation

dtolnay
Copy link
Contributor

@dtolnay dtolnay commented Jan 6, 2023

The new ThreadId code from #5329 in tokio 1.24.0 assumes that StaticAtomicU64 has load and compare_exchange_weak methods, which was not always the case. This was causing the following build failure:

error[E0599]: no method named `load` found for struct `StaticAtomicU64` in the current scope
  --> tokio-1.24.0/src/runtime/thread_id.rs:12:32
   |
12 |         let mut last = NEXT_ID.load(Relaxed);
   |                                ^^^^ method not found in `StaticAtomicU64`
   |
  ::: tokio-1.24.0/src/loom/std/atomic_u64_static_once_cell.rs:5:1
   |
5  | pub(crate) struct StaticAtomicU64 {
   | --------------------------------- method `load` not found for this

error[E0599]: no method named `compare_exchange_weak` found for struct `StaticAtomicU64` in the current scope
  --> tokio-1.24.0/src/runtime/thread_id.rs:19:27
   |
19 |             match NEXT_ID.compare_exchange_weak(last, id, Relaxed, Relaxed) {
   |                           ^^^^^^^^^^^^^^^^^^^^^ method not found in `StaticAtomicU64`
   |
  ::: tokio-1.24.0/src/loom/std/atomic_u64_static_once_cell.rs:5:1
   |
5  | pub(crate) struct StaticAtomicU64 {
   | --------------------------------- method `compare_exchange_weak` not found for this

@taiki-e taiki-e added the A-tokio Area: The main tokio crate label Jan 6, 2023
Copy link
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

Thanks! I can reproduce this with the case where no_atomic_u64 & no_const_mutex_new cfgs are enabled and parking_lot feature is disabled.

RUSTFLAGS='--cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new' \
  cargo build --manifest-path tokio/Cargo.toml --features rt

@taiki-e taiki-e merged commit 8d8db27 into tokio-rs:master Jan 6, 2023
@dtolnay dtolnay deleted the staticatomicu64 branch January 6, 2023 16:05
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Jan 8, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | minor | `1.23.0` -> `1.24.1` |
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | minor | `1.23.0` -> `1.24.1` |

---

### Release Notes

<details>
<summary>tokio-rs/tokio</summary>

### [`v1.24.1`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.24.1): Tokio v1.24.1

[Compare Source](tokio-rs/tokio@tokio-1.24.0...tokio-1.24.1)

This release fixes a compilation failure on targets without `AtomicU64` when using rustc older than 1.63. ([#&#8203;5356])

[#&#8203;5356]: tokio-rs/tokio#5356

### [`v1.24.0`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.24.0): Tokio v1.24.0

[Compare Source](tokio-rs/tokio@tokio-1.23.1...tokio-1.24.0)

The highlight of this release is the reduction of lock contention for all I/O operations ([#&#8203;5300](tokio-rs/tokio#5300)). We have received reports of up to a 20% improvement in CPU utilization and increased throughput for real-world I/O heavy applications.

##### Fixed

-   rt: improve native `AtomicU64` support detection ([#&#8203;5284])

##### Added

-   rt: add configuration option for max number of I/O events polled from the OS
    per tick ([#&#8203;5186])
-   rt: add an environment variable for configuring the default number of worker
    threads per runtime instance ([#&#8203;4250])

##### Changed

-   sync: reduce MPSC channel stack usage ([#&#8203;5294])
-   io: reduce lock contention in I/O operations  ([#&#8203;5300])
-   fs: speed up `read_dir()` by chunking operations ([#&#8203;5309])
-   rt: use internal `ThreadId` implementation ([#&#8203;5329])
-   test: don't auto-advance time when a `spawn_blocking` task is running ([#&#8203;5115])

[#&#8203;5186]: tokio-rs/tokio#5186

[#&#8203;5294]: tokio-rs/tokio#5294

[#&#8203;5284]: tokio-rs/tokio#5284

[#&#8203;4250]: tokio-rs/tokio#4250

[#&#8203;5300]: tokio-rs/tokio#5300

[#&#8203;5329]: tokio-rs/tokio#5329

[#&#8203;5115]: tokio-rs/tokio#5115

[#&#8203;5309]: tokio-rs/tokio#5309

### [`v1.23.1`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.23.1): Tokio v1.23.1

[Compare Source](tokio-rs/tokio@tokio-1.23.0...tokio-1.23.1)

This release forward ports changes from 1.18.4.

##### Fixed

-   net: fix Windows named pipe server builder to maintain option when toggling
    pipe mode ([#&#8203;5336]).

[#&#8203;5336]: tokio-rs/tokio#5336

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC44NC4xIiwidXBkYXRlZEluVmVyIjoiMzQuODQuMSJ9-->

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1703
Reviewed-by: crapStone <crapstone@noreply.codeberg.org>
Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
@M1cha
Copy link

M1cha commented Jan 9, 2023

where did these functions come from on platforms that do support atomic u64? I don't see any Deref implementation or anything like that.

@taiki-e
Copy link
Member

taiki-e commented Jan 9, 2023

@M1cha This issue is unrelated to targets that support AtomicU64. (On such targets, StaticAtomicU64 is an alias of AtomicU64.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants