Move C-state name cleaning to agent for smaller JSON
All checks were successful
Build and Release / build-and-release (push) Successful in 1m32s
All checks were successful
Build and Release / build-and-release (push) Successful in 1m32s
- Agent now extracts "C" + digits pattern (C3, C10) using char parsing - Removes suffixes like "_ACPI", "_MWAIT" at source - Reduces JSON payload size over ZMQ - No regex dependency - uses fast char iteration (~1μs overhead) - Robust fallback to original name if pattern not found - Dashboard simplified to use clean names directly Bump version to v0.1.212 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
0d8284b69c
commit
5e08b34280
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.210"
|
version = "0.1.211"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.210"
|
version = "0.1.211"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -324,7 +324,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.210"
|
version = "0.1.211"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.211"
|
version = "0.1.212"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -135,10 +135,23 @@ impl CpuCollector {
|
|||||||
if let Ok(time_str) = utils::read_proc_file(&time_path) {
|
if let Ok(time_str) = utils::read_proc_file(&time_path) {
|
||||||
if let Ok(time) = utils::parse_u64(time_str.trim()) {
|
if let Ok(time) = utils::parse_u64(time_str.trim()) {
|
||||||
if let Ok(name) = utils::read_proc_file(&name_path) {
|
if let Ok(name) = utils::read_proc_file(&name_path) {
|
||||||
let state_name = name.trim().to_string();
|
let state_name = name.trim();
|
||||||
// Skip POLL state (not real idle)
|
// Skip POLL state (not real idle)
|
||||||
if state_name != "POLL" && time > 0 {
|
if state_name != "POLL" && time > 0 {
|
||||||
cstate_times.push((state_name, time));
|
// Extract "C" + digits pattern (C3, C10, etc.) to reduce JSON size
|
||||||
|
// Handles formats like "C3_ACPI", "C10_MWAIT", etc.
|
||||||
|
let clean_name = if let Some(c_pos) = state_name.find('C') {
|
||||||
|
let rest = &state_name[c_pos + 1..];
|
||||||
|
let digit_count = rest.chars().take_while(|c| c.is_ascii_digit()).count();
|
||||||
|
if digit_count > 0 {
|
||||||
|
state_name[c_pos..c_pos + 1 + digit_count].to_string()
|
||||||
|
} else {
|
||||||
|
state_name.to_string()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
state_name.to_string()
|
||||||
|
};
|
||||||
|
cstate_times.push((clean_name, time));
|
||||||
total_time += time;
|
total_time += time;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.211"
|
version = "0.1.212"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -144,13 +144,10 @@ impl SystemWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Format top 3 C-states with percentages: "C10:79% C8:10% C6:8%"
|
// Format top 3 C-states with percentages: "C10:79% C8:10% C6:8%"
|
||||||
// Strip suffixes like "_ACPI" from state names
|
// Agent already sends clean names (C3, C10, etc.)
|
||||||
self.cpu_cstates
|
self.cpu_cstates
|
||||||
.iter()
|
.iter()
|
||||||
.map(|cs| {
|
.map(|cs| format!("{}:{:.0}%", cs.name, cs.percent))
|
||||||
let clean_name = cs.name.split('_').next().unwrap_or(&cs.name);
|
|
||||||
format!("{}:{:.0}%", clean_name, cs.percent)
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join(" ")
|
.join(" ")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.211"
|
version = "0.1.212"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user