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

rt: add a method to determine the flavor of the runtime. #5138

Merged
merged 1 commit into from
Oct 30, 2022

Conversation

agayev
Copy link
Member

@agayev agayev commented Oct 27, 2022

Closes: #5088

@github-actions github-actions bot added the R-loom Run loom tests on this PR label Oct 27, 2022
@Noah-Kennedy
Copy link
Contributor

I'd recommend adding test cases for new APIs like this.

@agayev agayev force-pushed the introspect-runtime branch from 1d69f96 to bb99d33 Compare October 27, 2022 22:08
@agayev
Copy link
Member Author

agayev commented Oct 27, 2022

@Noah-Kennedy added doc tests.

@Noah-Kennedy
Copy link
Contributor

Hmm. It has occurred to me that bikeshedding may regrettably be needed here.

I'm not actually sure that this is the right API for this. It may be better to have a get_runtime_flavor function which returns an enum. It isn't guaranteed that we will always have just two flavors. I wouldn't be surprised if future runtimes got added which were similar to multi_thread, but with differences in IO driver implementation, for example.

@Darksonn @carllerche thoughts?

@Darksonn Darksonn added A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime labels Oct 29, 2022
@Darksonn
Copy link
Contributor

Yes, I agree. We are likely add additional flavors in the future, so it would be better with a method that returns a flavor enum.

@agayev agayev force-pushed the introspect-runtime branch 2 times, most recently from 0b5761c to d07b842 Compare October 29, 2022 18:42
@agayev agayev changed the title rt: add a method to determine if the runtime is multi-threaded. rt: add a method to determine the flavor of the runtime. Oct 29, 2022
@agayev
Copy link
Member Author

agayev commented Oct 29, 2022

Added a new enum. To avoid repetition, I called it just Flavor and the function get_flavor, but I can rename them to RuntimeFlavor and get_runtime_flavor, respectively, if you think that's better @Noah-Kennedy @Darksonn.

tokio/src/runtime/handle.rs Outdated Show resolved Hide resolved
tokio/src/runtime/handle.rs Outdated Show resolved Hide resolved
@agayev agayev force-pushed the introspect-runtime branch from d07b842 to b551813 Compare October 29, 2022 20:22
tokio/src/runtime/mod.rs Outdated Show resolved Hide resolved
tokio/src/runtime/mod.rs Outdated Show resolved Hide resolved
tokio/src/runtime/mod.rs Outdated Show resolved Hide resolved
@agayev agayev force-pushed the introspect-runtime branch 2 times, most recently from 8bd2754 to 2cb07a2 Compare October 29, 2022 22:38
tokio/src/runtime/mod.rs Outdated Show resolved Hide resolved
@agayev agayev force-pushed the introspect-runtime branch from 2cb07a2 to e8fbc7a Compare October 30, 2022 11:44
@Darksonn
Copy link
Contributor

There's a compilation failure when compiling without the rt-multi-thread feature flag.

info: running `cargo test --no-default-features --features rt` on tests-integration (4/10)
   Compiling tokio v1.21.2 (/Users/runner/work/tokio/tokio/tokio)
error[E0599]: no variant or associated item named `MultiThread` found for enum `scheduler::Handle` in the current scope
   --> tokio/src/runtime/handle.rs:304:32
    |
304 |             scheduler::Handle::MultiThread(_) => RuntimeFlavor::MultiThread,
    |                                ^^^^^^^^^^^ variant or associated item not found in `scheduler::Handle`
    |
   ::: tokio/src/runtime/scheduler/mod.rs:14:1
    |
14  | pub(crate) enum Handle {
    | ---------------------- variant or associated item `MultiThread` not found for this enum

For more information about this error, try `rustc --explain E0599`.

@agayev agayev force-pushed the introspect-runtime branch from e8fbc7a to d39f147 Compare October 30, 2022 14:35
@agayev
Copy link
Member Author

agayev commented Oct 30, 2022

There's a compilation failure when compiling without the rt-multi-thread feature flag.

info: running `cargo test --no-default-features --features rt` on tests-integration (4/10)
   Compiling tokio v1.21.2 (/Users/runner/work/tokio/tokio/tokio)
error[E0599]: no variant or associated item named `MultiThread` found for enum `scheduler::Handle` in the current scope
   --> tokio/src/runtime/handle.rs:304:32
    |
304 |             scheduler::Handle::MultiThread(_) => RuntimeFlavor::MultiThread,
    |                                ^^^^^^^^^^^ variant or associated item not found in `scheduler::Handle`
    |
   ::: tokio/src/runtime/scheduler/mod.rs:14:1
    |
14  | pub(crate) enum Handle {
    | ---------------------- variant or associated item `MultiThread` not found for this enum

For more information about this error, try `rustc --explain E0599`.

Fixed it. I'm not sure if not(tokio_wasi) is necessary, but since all other places had it, I also added it.

tokio/src/runtime/mod.rs Outdated Show resolved Hide resolved
@agayev agayev force-pushed the introspect-runtime branch from d39f147 to cbe3338 Compare October 30, 2022 14:47
Copy link
Contributor

@Darksonn Darksonn left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@Darksonn Darksonn enabled auto-merge (squash) October 30, 2022 15:02
@Darksonn Darksonn merged commit fe1843c into tokio-rs:master Oct 30, 2022
@agayev
Copy link
Member Author

agayev commented Oct 30, 2022

Looks good to me.

Thank you!

@wimax-grapl
Copy link

Thank you for this :)

crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Nov 22, 2022
This PR contains the following updates:

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

---

### Release Notes

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

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

[Compare Source](tokio-rs/tokio@tokio-1.21.2...tokio-1.22.0)

##### Added

-   runtime: add `Handle::runtime_flavor` ([#&#8203;5138])
-   sync: add `Mutex::blocking_lock_owned` ([#&#8203;5130])
-   sync: add `Semaphore::MAX_PERMITS` ([#&#8203;5144])
-   sync: add `merge()` to semaphore permits ([#&#8203;4948])
-   sync: add `mpsc::WeakUnboundedSender` ([#&#8203;5189])

##### Added (unstable)

-   process: add `Command::process_group` ([#&#8203;5114])
-   runtime: export metrics about the blocking thread pool ([#&#8203;5161])
-   task: add `task::id()` and `task::try_id()` ([#&#8203;5171])

##### Fixed

-   macros: don't take ownership of futures in macros ([#&#8203;5087])
-   runtime: fix Stacked Borrows violation in `LocalOwnedTasks` ([#&#8203;5099])
-   runtime: mitigate ABA with 32-bit queue indices when possible ([#&#8203;5042])
-   task: wake local tasks to the local queue when woken by the same thread ([#&#8203;5095])
-   time: panic in release mode when `mark_pending` called illegally ([#&#8203;5093])
-   runtime: fix typo in expect message ([#&#8203;5169])
-   runtime: fix `unsync_load` on atomic types ([#&#8203;5175])
-   task: elaborate safety comments in task deallocation ([#&#8203;5172])
-   runtime: fix `LocalSet` drop in thread local ([#&#8203;5179])
-   net: remove libc type leakage in a public API ([#&#8203;5191])
-   runtime: update the alignment of `CachePadded` ([#&#8203;5106])

##### Changed

-   io: make `tokio::io::copy` continue filling the buffer when writer stalls ([#&#8203;5066])
-   runtime: remove `coop::budget` from `LocalSet::run_until` ([#&#8203;5155])
-   sync: make `Notify` panic safe ([#&#8203;5154])

##### Documented

-   io: fix doc for `write_i8` to use signed integers ([#&#8203;5040])
-   net: fix doc typos for TCP and UDP `set_tos` methods ([#&#8203;5073])
-   net: fix function name in `UdpSocket::recv` documentation ([#&#8203;5150])
-   sync: typo in `TryLockError` for `RwLock::try_write` ([#&#8203;5160])
-   task: document that spawned tasks execute immediately ([#&#8203;5117])
-   time: document return type of `timeout` ([#&#8203;5118])
-   time: document that `timeout` checks only before poll ([#&#8203;5126])
-   sync: specify return type of `oneshot::Receiver` in docs ([#&#8203;5198])

##### Internal changes

-   runtime: use const `Mutex::new` for globals ([#&#8203;5061])
-   runtime: remove `Option` around `mio::Events` in io driver ([#&#8203;5078])
-   runtime: remove a conditional compilation clause ([#&#8203;5104])
-   runtime: remove a reference to internal time handle ([#&#8203;5107])
-   runtime: misc time driver cleanup ([#&#8203;5120])
-   runtime: move signal driver to runtime module ([#&#8203;5121])
-   runtime: signal driver now uses I/O driver directly ([#&#8203;5125])
-   runtime: start decoupling I/O driver and I/O handle ([#&#8203;5127])
-   runtime: switch `io::handle` refs with scheduler:Handle ([#&#8203;5128])
-   runtime: remove Arc from I/O driver ([#&#8203;5134])
-   runtime: use signal driver handle via `scheduler::Handle` ([#&#8203;5135])
-   runtime: move internal clock fns out of context ([#&#8203;5139])
-   runtime: remove `runtime::context` module ([#&#8203;5140])
-   runtime: keep driver cfgs in `driver.rs` ([#&#8203;5141])
-   runtime: add `runtime::context` to unify thread-locals ([#&#8203;5143])
-   runtime: rename some confusing internal variables/fns ([#&#8203;5151])
-   runtime: move `coop` mod into `runtime` ([#&#8203;5152])
-   runtime: move budget state to context thread-local ([#&#8203;5157])
-   runtime: move park logic into runtime module ([#&#8203;5158])
-   runtime: move `Runtime` into its own file ([#&#8203;5159])
-   runtime: unify entering a runtime with `Handle::enter` ([#&#8203;5163])
-   runtime: remove handle reference from each scheduler ([#&#8203;5166])
-   runtime: move `enter` into `context` ([#&#8203;5167])
-   runtime: combine context and entered thread-locals ([#&#8203;5168])
-   runtime: fix accidental unsetting of current handle ([#&#8203;5178])
-   runtime: move `CoreStage` methods to `Core` ([#&#8203;5182])
-   sync: name mpsc semaphore types ([#&#8203;5146])

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

</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:eyJjcmVhdGVkSW5WZXIiOiIzNC4yNy4xIiwidXBkYXRlZEluVmVyIjoiMzQuMjkuMiJ9-->

Co-authored-by: cabr2-bot <[email protected]>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1651
Reviewed-by: crapStone <[email protected]>
Co-authored-by: Calciumdibromid Bot <[email protected]>
Co-committed-by: Calciumdibromid Bot <[email protected]>
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 M-runtime Module: tokio/runtime R-loom Run loom tests on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Introspect runtime flavor/configuration on Handle
5 participants