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

melpo: add Tokio Console support #9

Merged
merged 2 commits into from
Jul 10, 2022
Merged

melpo: add Tokio Console support #9

merged 2 commits into from
Jul 10, 2022

Conversation

hawkw
Copy link
Contributor

@hawkw hawkw commented Jul 9, 2022

Upstream PR hawkw/mycelium#249 updates the tracing diagnostics emitted
by maitake to support the Tokio Console. This branch updates Melpomene
to add the console-subscriber crate's tracing layer, so that the
console CLI can be used to track tasks running in the simulator.

Check it out:
image
image

hawkw added 2 commits July 9, 2022 10:06
Currently, mnemOS depends on a fork of `maitake`, in order to use
changes to the `WaitCell` API that hadn't been merged upstream. However,
now that hawkw/mycelium#223 has merged, we can point these dependencies
back at the main branch.

This commit changes the `maitake` and `cordyceps` git deps to
hawkw/maitake@eb9974e22bb2e822a0ddad3c0488e331a494dea5

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
Upstream PR hawkw/mycelium#249 updates the `tracing` diagnostics emitted
by `maitake` to support the Tokio Console. This commit updates Melpomene
to add the `console-subscriber` crate's `tracing` layer, so that the
console CLI can be used to track tasks running in the simulator.

Check it out:
![image](https://user-images.githubusercontent.com/2796466/178116157-577dd381-a2da-4b18-a9c1-73d62117ac4c.png)
![image](https://user-images.githubusercontent.com/2796466/178116169-293610a3-0240-4be1-8077-3fcfca7028d6.png)
@jamesmunns
Copy link
Contributor

love love love it

@jamesmunns jamesmunns merged commit 86d847c into main Jul 10, 2022
@jamesmunns jamesmunns deleted the eliza/console branch July 17, 2022 00:01
jamesmunns added a commit that referenced this pull request Jun 4, 2023
This commit was missed when I merged from the upstream
repo:

commit 3b1b16d7c04f312a27befb1f1f7691f5f63cfb47
Author: Eliza Weisman <eliza@buoyant.io>
Date:   Thu Jun 1 08:15:12 2023 -0700

  add missing `Send` impl for `AHeap` (#9)

  Currently, any Future that awaits one of the AHeap allocate,
  allocate_arc, allocate_array_with, or allocate_fixed_vec methods
  is !Send. This is because these methods return a Future which
  contains a &self receiver, and the AHeap type itself is !Send.
  This is sad and not very great.

  This branch adds a missing Send impl to AHeap. This should be safe
  for the same reason that the existing unsafe impl Sync for AHeap is
  safe.

  * add test asserting heap futures are Send
  * add missing Send impl for AHeap
@jamesmunns jamesmunns added area: kernel Related to the cross-platform kernel area: tools & build Related to host developer tools, including tracing, Crowtty and build processes area: protocols Related to communication protocols, including SerMux and Traceproto. platform: melpomene Specific to the Melpomene simulator platform labels Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: kernel Related to the cross-platform kernel area: protocols Related to communication protocols, including SerMux and Traceproto. area: tools & build Related to host developer tools, including tracing, Crowtty and build processes platform: melpomene Specific to the Melpomene simulator platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants