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.

Sign up for GitHub

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

Jump to bottom

Remove futures dependency from console-subscriber #460

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Remove futures dependency from console-subscriber #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion console-subscriber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tonic = { version = "0.9", features = ["transport"] }
tracing-core = "0.1.24"
tracing = "0.1.26"
tracing-subscriber = { version = "0.3.11", default-features = false, features = ["fmt", "registry"] }
futures = { version = "0.3", default-features = false }
futures-task = { version = "0.3", default-features = false }
hdrhistogram = { version = "7.3.0", default-features = false, features = ["serialization"] }
# The parking_lot dependency is renamed, because we want our `parking_lot`
# feature to also enable `tracing-subscriber`'s parking_lot feature flag.
Expand Down
13 changes: 11 additions & 2 deletions console-subscriber/src/aggregator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use console_api as proto;
use proto::resources::resource;
use tokio::sync::{mpsc, Notify};

use futures::FutureExt;
use std::{
sync::{
atomic::{AtomicBool, Ordering::*},
Expand Down Expand Up @@ -221,7 +220,7 @@ impl Aggregator {
// to be woken when the flush interval has elapsed, or when the
// channel is almost full.
let mut drained = false;
while let Some(event) = self.events.recv().now_or_never() {
while let Some(event) = recv_now_or_never(&mut self.events) {
match event {
Some(event) => {
self.update_state(event);
Expand Down Expand Up @@ -500,6 +499,16 @@ impl Aggregator {
}
}

fn recv_now_or_never<T>(receiver: &mut mpsc::Receiver<T>) -> Option<Option<T>> {
let waker = futures_task::noop_waker();
let mut cx = std::task::Context::from_waker(&waker);

match receiver.poll_recv(&mut cx) {
std::task::Poll::Ready(opt) => Some(opt),
std::task::Poll::Pending => None,
}
}

// ==== impl Flush ===

impl Flush {
Expand Down