From 3918b4ca0829f7abeab74eed31adeb859438372f Mon Sep 17 00:00:00 2001 From: David Carlier Date: Thu, 30 Jan 2025 06:32:20 +0000 Subject: [PATCH] reducing code noise and probes data heap allocation. --- tools/scxtop/src/app.rs | 3 +-- tools/scxtop/src/main.rs | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/scxtop/src/app.rs b/tools/scxtop/src/app.rs index 76e87c23b..5ba5ad971 100644 --- a/tools/scxtop/src/app.rs +++ b/tools/scxtop/src/app.rs @@ -211,7 +211,7 @@ impl<'a> App<'a> { non_hw_event_active: false, prev_bpf_sample_rate: sample_rate, trace_tick: 0, - trace_tick_warmup: trace_tick_warmup, + trace_tick_warmup, max_trace_ticks: trace_ticks, trace_manager: PerfettoTraceManager::new(&trace_file_prefix, None), }; @@ -1981,7 +1981,6 @@ impl<'a> App<'a> { Action::SchedWakeup { .. } => { if self.state == AppState::Tracing { self.trace_manager.on_sched_wakeup(action); - return; } } _ => { diff --git a/tools/scxtop/src/main.rs b/tools/scxtop/src/main.rs index 697b6f403..61209ee89 100644 --- a/tools/scxtop/src/main.rs +++ b/tools/scxtop/src/main.rs @@ -85,12 +85,11 @@ async fn run() -> Result<()> { let open_skel = builder.open(&mut open_object)?; let skel = open_skel.load()?; - let mut links = Vec::new(); // Attach probes - links.push(skel.progs.on_sched_cpu_perf.attach()?); - links.push(skel.progs.scx_sched_reg.attach()?); - links.push(skel.progs.scx_sched_unreg.attach()?); - links.push(skel.progs.on_sched_switch.attach()?); + let mut links = vec![skel.progs.on_sched_cpu_perf.attach()? + , skel.progs.scx_sched_reg.attach()? + , skel.progs.scx_sched_unreg.attach()? + , skel.progs.on_sched_switch.attach()?]; // 6.13 compatability if let Ok(link) = skel.progs.scx_insert_vtime.attach() {