Show top 3 C-states with usage percentages
All checks were successful
Build and Release / build-and-release (push) Successful in 1m21s
All checks were successful
Build and Release / build-and-release (push) Successful in 1m21s
- Changed CpuData.cstate from String to Vec<CStateInfo> - Added CStateInfo struct with name and percent fields - Collector calculates percentage for each C-state based on accumulated time - Sorts and returns top 3 C-states by usage - Dashboard displays: "C10:79% C8:10% C6:8%" Provides better visibility into CPU idle state distribution. Bump version to v0.1.209 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
c6817537a8
commit
7c030b33d6
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.206"
|
version = "0.1.208"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.207"
|
version = "0.1.208"
|
||||||
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.207"
|
version = "0.1.208"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.208"
|
version = "0.1.209"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -119,30 +119,27 @@ impl CpuCollector {
|
|||||||
utils::parse_u64(content.trim())
|
utils::parse_u64(content.trim())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Collect CPU C-state (idle depth) and populate AgentData
|
/// Collect CPU C-state (idle depth) and populate AgentData with top 3 C-states by usage
|
||||||
async fn collect_cstate(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
|
async fn collect_cstate(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
|
||||||
// Read C-state usage from first CPU (representative of overall system)
|
// Read C-state usage from first CPU (representative of overall system)
|
||||||
// C-states indicate CPU idle depth: C1=light sleep, C6=deep sleep, C10=deepest
|
// C-states indicate CPU idle depth: C1=light sleep, C6=deep sleep, C10=deepest
|
||||||
|
|
||||||
let mut deepest_state = String::from("C0"); // Default to active
|
let mut cstate_times: Vec<(String, u64)> = Vec::new();
|
||||||
let mut max_time: u64 = 0;
|
let mut total_time: u64 = 0;
|
||||||
|
|
||||||
// Check C-states from CPU0
|
// Collect all C-state times from CPU0
|
||||||
for state_num in 0..=10 {
|
for state_num in 0..=10 {
|
||||||
let time_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/time", state_num);
|
let time_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/time", state_num);
|
||||||
let name_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/name", state_num);
|
let name_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/name", state_num);
|
||||||
|
|
||||||
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 time > max_time {
|
if let Ok(name) = utils::read_proc_file(&name_path) {
|
||||||
// This state has most accumulated time
|
let state_name = name.trim().to_string();
|
||||||
if let Ok(name) = utils::read_proc_file(&name_path) {
|
// Skip POLL state (not real idle)
|
||||||
let state_name = name.trim().to_string();
|
if state_name != "POLL" && time > 0 {
|
||||||
// Skip POLL state (not real idle)
|
cstate_times.push((state_name, time));
|
||||||
if state_name != "POLL" {
|
total_time += time;
|
||||||
max_time = time;
|
|
||||||
deepest_state = state_name;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -152,7 +149,26 @@ impl CpuCollector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
agent_data.system.cpu.cstate = deepest_state;
|
// Sort by time descending to get top 3
|
||||||
|
cstate_times.sort_by(|a, b| b.1.cmp(&a.1));
|
||||||
|
|
||||||
|
// Calculate percentages for top 3 and populate AgentData
|
||||||
|
agent_data.system.cpu.cstates = cstate_times
|
||||||
|
.iter()
|
||||||
|
.take(3)
|
||||||
|
.map(|(name, time)| {
|
||||||
|
let percent = if total_time > 0 {
|
||||||
|
(*time as f32 / total_time as f32) * 100.0
|
||||||
|
} else {
|
||||||
|
0.0
|
||||||
|
};
|
||||||
|
cm_dashboard_shared::CStateInfo {
|
||||||
|
name: name.clone(),
|
||||||
|
percent,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.208"
|
version = "0.1.209"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -26,7 +26,7 @@ pub struct SystemWidget {
|
|||||||
cpu_load_1min: Option<f32>,
|
cpu_load_1min: Option<f32>,
|
||||||
cpu_load_5min: Option<f32>,
|
cpu_load_5min: Option<f32>,
|
||||||
cpu_load_15min: Option<f32>,
|
cpu_load_15min: Option<f32>,
|
||||||
cpu_cstate: Option<String>,
|
cpu_cstates: Vec<cm_dashboard_shared::CStateInfo>,
|
||||||
cpu_status: Status,
|
cpu_status: Status,
|
||||||
|
|
||||||
// Memory metrics
|
// Memory metrics
|
||||||
@ -102,7 +102,7 @@ impl SystemWidget {
|
|||||||
cpu_load_1min: None,
|
cpu_load_1min: None,
|
||||||
cpu_load_5min: None,
|
cpu_load_5min: None,
|
||||||
cpu_load_15min: None,
|
cpu_load_15min: None,
|
||||||
cpu_cstate: None,
|
cpu_cstates: Vec::new(),
|
||||||
cpu_status: Status::Unknown,
|
cpu_status: Status::Unknown,
|
||||||
memory_usage_percent: None,
|
memory_usage_percent: None,
|
||||||
memory_used_gb: None,
|
memory_used_gb: None,
|
||||||
@ -137,12 +137,18 @@ impl SystemWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Format CPU C-state (idle depth)
|
/// Format CPU C-states (idle depth) with percentages
|
||||||
fn format_cpu_cstate(&self) -> String {
|
fn format_cpu_cstate(&self) -> String {
|
||||||
match &self.cpu_cstate {
|
if self.cpu_cstates.is_empty() {
|
||||||
Some(cstate) => cstate.clone(),
|
return "—".to_string();
|
||||||
None => "—".to_string(),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Format top 3 C-states with percentages: "C10:79% C8:10% C6:8%"
|
||||||
|
self.cpu_cstates
|
||||||
|
.iter()
|
||||||
|
.map(|cs| format!("{}:{:.0}%", cs.name, cs.percent))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(" ")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Format memory usage
|
/// Format memory usage
|
||||||
@ -188,7 +194,7 @@ impl Widget for SystemWidget {
|
|||||||
self.cpu_load_1min = Some(cpu.load_1min);
|
self.cpu_load_1min = Some(cpu.load_1min);
|
||||||
self.cpu_load_5min = Some(cpu.load_5min);
|
self.cpu_load_5min = Some(cpu.load_5min);
|
||||||
self.cpu_load_15min = Some(cpu.load_15min);
|
self.cpu_load_15min = Some(cpu.load_15min);
|
||||||
self.cpu_cstate = Some(cpu.cstate.clone());
|
self.cpu_cstates = cpu.cstates.clone();
|
||||||
self.cpu_status = Status::Ok;
|
self.cpu_status = Status::Ok;
|
||||||
|
|
||||||
// Extract memory data directly
|
// Extract memory data directly
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.208"
|
version = "0.1.209"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -40,13 +40,20 @@ pub struct NetworkInterfaceData {
|
|||||||
pub vlan_id: Option<u16>,
|
pub vlan_id: Option<u16>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// CPU C-state usage information
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct CStateInfo {
|
||||||
|
pub name: String,
|
||||||
|
pub percent: f32,
|
||||||
|
}
|
||||||
|
|
||||||
/// CPU monitoring data
|
/// CPU monitoring data
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct CpuData {
|
pub struct CpuData {
|
||||||
pub load_1min: f32,
|
pub load_1min: f32,
|
||||||
pub load_5min: f32,
|
pub load_5min: f32,
|
||||||
pub load_15min: f32,
|
pub load_15min: f32,
|
||||||
pub cstate: String, // Deepest C-state in use (C1, C6, C10, etc.) - indicates CPU idle depth
|
pub cstates: Vec<CStateInfo>, // C-state usage percentages (C1, C6, C10, etc.) - indicates CPU idle depth distribution
|
||||||
pub temperature_celsius: Option<f32>,
|
pub temperature_celsius: Option<f32>,
|
||||||
pub load_status: Status,
|
pub load_status: Status,
|
||||||
pub temperature_status: Status,
|
pub temperature_status: Status,
|
||||||
@ -204,7 +211,7 @@ impl AgentData {
|
|||||||
load_1min: 0.0,
|
load_1min: 0.0,
|
||||||
load_5min: 0.0,
|
load_5min: 0.0,
|
||||||
load_15min: 0.0,
|
load_15min: 0.0,
|
||||||
cstate: String::from("C0"),
|
cstates: Vec::new(),
|
||||||
temperature_celsius: None,
|
temperature_celsius: None,
|
||||||
load_status: Status::Unknown,
|
load_status: Status::Unknown,
|
||||||
temperature_status: Status::Unknown,
|
temperature_status: Status::Unknown,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user