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

feat(console): add large future lint #587

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,12 @@ Options:

* `never-yielded` -- Warns when a task has never yielded.

[default: self-wakes lost-waker never-yielded]
[possible values: self-wakes, lost-waker, never-yielded]
* `large-future` -- Warnings when the future driving a task
occupies a large amount of stack space.

[default: self-wakes lost-waker never-yielded large-future]
[possible values: self-wakes, lost-waker, never-yielded,
large-future]

-A, --allow <ALLOW_WARNINGS>...
Allow lint warnings.
Expand All @@ -243,9 +247,13 @@ Options:

* `never-yielded` -- Warns when a task has never yielded.

* `large-future` -- Warnings when the future driving a task
occupies a large amount of stack space.

If this is set to `all`, all warnings are allowed.

[possible values: all, self-wakes, lost-waker, never-yielded]
[possible values: all, self-wakes, lost-waker, never-yielded,
large-future]

--log-dir <LOG_DIRECTORY>
Path to a directory to write the console's internal logs to.
Expand Down
21 changes: 21 additions & 0 deletions console-subscriber/examples/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
.spawn(spawn_blocking(5))
.unwrap();
}
"huge" => {
tokio::task::Builder::new()
.name("huge")
.spawn(huge::<1000>())
.unwrap();
}
"help" | "-h" => {
eprintln!("{}", HELP);
return Ok(());
Expand Down Expand Up @@ -152,6 +158,21 @@ async fn spawn_blocking(seconds: u64) {
}
}

#[tracing::instrument]
async fn huge<const N: usize>() {
let mut numbers = [0_usize; N];

loop {
for idx in 0..N {
numbers[idx] = idx;
tokio::time::sleep(Duration::from_millis(100)).await;
(0..=idx).for_each(|jdx| {
assert_eq!(numbers[jdx], jdx);
});
}
}
}

fn self_wake() -> impl Future<Output = ()> {
struct SelfWake {
yielded: bool,
Expand Down
1 change: 1 addition & 0 deletions tokio-console/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ hyper-util = { version = "0.1.6", features = ["tokio"] }

[dev-dependencies]
trycmd = "0.15.4"

1 change: 1 addition & 0 deletions tokio-console/console.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ warnings = [
'self-wakes',
'lost-waker',
'never-yielded',
'large-future',
]
log_directory = '/tmp/tokio-console/logs'
retention = '6s'
Expand Down
13 changes: 12 additions & 1 deletion tokio-console/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ pub struct Config {
/// * `lost-waker` -- Warns when a task is dropped without being woken.
///
/// * `never-yielded` -- Warns when a task has never yielded.
///
/// * `large-future` -- Warnings when the future driving a task occupies a large amount of
/// stack space.
#[clap(long = "warn", short = 'W', value_delimiter = ',', num_args = 1..)]
#[clap(default_values_t = KnownWarnings::default_enabled_warnings())]
pub(crate) warnings: Vec<KnownWarnings>,
Expand All @@ -80,9 +83,12 @@ pub struct Config {
///
/// * `never-yielded` -- Warns when a task has never yielded.
///
/// * `large-future` -- Warnings when the future driving a task occupies a large amount of
/// stack space.
///
/// If this is set to `all`, all warnings are allowed.
///
/// [possible values: all, self-wakes, lost-waker, never-yielded]
/// [possible values: all, self-wakes, lost-waker, never-yielded, large-future]
#[clap(long = "allow", short = 'A', num_args = 1..)]
pub(crate) allow_warnings: Option<AllowedWarnings>,

Expand Down Expand Up @@ -143,6 +149,7 @@ pub(crate) enum KnownWarnings {
SelfWakes,
LostWaker,
NeverYielded,
LargeFuture,
}

impl FromStr for KnownWarnings {
Expand All @@ -153,6 +160,7 @@ impl FromStr for KnownWarnings {
"self-wakes" => Ok(KnownWarnings::SelfWakes),
"lost-waker" => Ok(KnownWarnings::LostWaker),
"never-yielded" => Ok(KnownWarnings::NeverYielded),
"large-future" => Ok(KnownWarnings::LargeFuture),
_ => Err(format!("unknown warning: {}", s)),
}
}
Expand All @@ -164,6 +172,7 @@ impl From<&KnownWarnings> for warnings::Linter<Task> {
KnownWarnings::SelfWakes => warnings::Linter::new(warnings::SelfWakePercent::default()),
KnownWarnings::LostWaker => warnings::Linter::new(warnings::LostWaker),
KnownWarnings::NeverYielded => warnings::Linter::new(warnings::NeverYielded::default()),
KnownWarnings::LargeFuture => warnings::Linter::new(warnings::LargeFuture::default()),
}
}
}
Expand All @@ -174,6 +183,7 @@ impl fmt::Display for KnownWarnings {
KnownWarnings::SelfWakes => write!(f, "self-wakes"),
KnownWarnings::LostWaker => write!(f, "lost-waker"),
KnownWarnings::NeverYielded => write!(f, "never-yielded"),
KnownWarnings::LargeFuture => write!(f, "large-future"),
}
}
}
Expand All @@ -184,6 +194,7 @@ impl KnownWarnings {
KnownWarnings::SelfWakes,
KnownWarnings::LostWaker,
KnownWarnings::NeverYielded,
KnownWarnings::LargeFuture,
]
}
}
Expand Down
1 change: 1 addition & 0 deletions tokio-console/src/state/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ impl Field {
const KIND: &'static str = "kind";
const NAME: &'static str = "task.name";
const TASK_ID: &'static str = "task.id";
const SIZE_BYTES: &'static str = "size.bytes";

/// Creates a new Field with a pre-interned `name` and a `FieldValue`.
fn new(name: InternedStr, value: FieldValue) -> Self {
Expand Down
16 changes: 16 additions & 0 deletions tokio-console/src/state/tasks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ pub(crate) struct Task {
location: String,
/// The kind of task, currently one of task, blocking, block_on, local
kind: InternedStr,
/// The size of the future driving the task
size_bytes: Option<usize>,
}

#[derive(Debug)]
Expand Down Expand Up @@ -184,6 +186,7 @@ impl TasksState {
let mut name = None;
let mut task_id = None;
let mut kind = strings.string(String::new());
let mut size_bytes = None;
let target_field = Field::new(
strings.string_ref("target"),
FieldValue::Str(meta.target.to_string()),
Expand All @@ -210,6 +213,14 @@ impl TasksState {
kind = strings.string(field.value.to_string());
None
}
Field::SIZE_BYTES => {
size_bytes = match field.value {
FieldValue::U64(size_bytes) => Some(size_bytes as usize),
_ => None,
};
// Include size in pre-formatted fields
Some(field)
}
_ => Some(field),
}
})
Expand Down Expand Up @@ -245,6 +256,7 @@ impl TasksState {
warnings: Vec::new(),
location,
kind,
size_bytes,
};
if let TaskLintResult::RequiresRecheck = task.lint(linters) {
next_pending_lint.insert(task.id);
Expand Down Expand Up @@ -506,6 +518,10 @@ impl Task {
pub(crate) fn location(&self) -> &str {
&self.location
}

pub(crate) fn size_bytes(&self) -> Option<usize> {
self.size_bytes
}
}

enum TaskLintResult {
Expand Down
50 changes: 50 additions & 0 deletions tokio-console/src/warnings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,53 @@ impl Warn<Task> for NeverYielded {
)
}
}

/// Warning for if a task's driving future if very large
#[derive(Clone, Debug)]
pub(crate) struct LargeFuture {
min_size: usize,
description: String,
}
impl LargeFuture {
pub(crate) const DEFAULT_SIZE_BYTES: usize = 2048;
pub(crate) fn new(min_size: usize) -> Self {
Self {
min_size,
description: format!("tasks are very large (threshold {} bytes)", min_size),
}
}
}

impl Default for LargeFuture {
fn default() -> Self {
Self::new(Self::DEFAULT_SIZE_BYTES)
}
}

impl Warn<Task> for LargeFuture {
fn summary(&self) -> &str {
self.description.as_str()
}

fn check(&self, task: &Task) -> Warning {
// Don't fire warning for tasks that are not async
if task.is_blocking() {
return Warning::Ok;
}

if let Some(size_bytes) = task.size_bytes() {
if size_bytes >= self.min_size {
return Warning::Warn;
}
}
Warning::Ok
}

fn format(&self, task: &Task) -> String {
format!(
"This task occupies a large amount of stack space ({} bytes)",
task.size_bytes()
.expect("warning should not trigger if size is None"),
)
}
}
14 changes: 11 additions & 3 deletions tokio-console/tests/cli-ui.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ Options:

* `never-yielded` -- Warns when a task has never yielded.

[default: self-wakes lost-waker never-yielded]
[possible values: self-wakes, lost-waker, never-yielded]
* `large-future` -- Warnings when the future driving a task
occupies a large amount of stack space.

[default: self-wakes lost-waker never-yielded large-future]
[possible values: self-wakes, lost-waker, never-yielded,
large-future]

-A, --allow <ALLOW_WARNINGS>...
Allow lint warnings.
Expand All @@ -72,9 +76,13 @@ Options:

* `never-yielded` -- Warns when a task has never yielded.

* `large-future` -- Warnings when the future driving a task
occupies a large amount of stack space.

If this is set to `all`, all warnings are allowed.

[possible values: all, self-wakes, lost-waker, never-yielded]
[possible values: all, self-wakes, lost-waker, never-yielded,
large-future]

--log-dir <LOG_DIRECTORY>
Path to a directory to write the console's internal logs to.
Expand Down
Loading