jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

increment version and macos performance

Browse Source
This commit is contained in:
jasonwitty 2025-08-26 12:14:32 -07:00
parent f13ea45360
commit 353c08c35e
4 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2187,7 +2187,7 @@ dependencies = [
[[package]] [[package]]
name = "socktop_agent" name = "socktop_agent"
version = "1.40.4" version = "1.40.5"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",

2
socktop_agent/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "socktop_agent" name = "socktop_agent"
version = "1.40.4" version = "1.40.5"
authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"] authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"]
description = "Remote system monitor over WebSocket, TUI like top" description = "Remote system monitor over WebSocket, TUI like top"
edition = "2021" edition = "2021"

2
socktop_agent/src/main.rs
View File

@ -29,8 +29,6 @@ fn arg_value(name: &str) -> Option<String> {
None None
} }
// (tests moved to end of file to satisfy clippy::items_after_test_module)
#[tokio::main] #[tokio::main]
async fn main() -> anyhow::Result<()> { async fn main() -> anyhow::Result<()> {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();

53
socktop_agent/src/metrics.rs
View File

@ -16,10 +16,7 @@ use std::time::{Duration, Instant};
use sysinfo::{ProcessRefreshKind, ProcessesToUpdate}; use sysinfo::{ProcessRefreshKind, ProcessesToUpdate};
use tracing::warn; use tracing::warn;
// Optional normalization: divide per-process cpu_usage by logical core count so a fully // CPU normalization only relevant for non-Linux (Linux path uses /proc deltas fixed to 0..100 per process)
// saturated multi-core process reports near 100% instead of N*100%. Disabled by default on
// non-Linux because Activity Monitor / Task Manager semantics allow per-process >100% (multi-core).
// Enable with SOCKTOP_AGENT_NORMALIZE_CPU=1 if you prefer a single-core 0..100% scale.
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
fn normalize_cpu_enabled() -> bool { fn normalize_cpu_enabled() -> bool {
static ON: OnceCell<bool> = OnceCell::new(); static ON: OnceCell<bool> = OnceCell::new();
@ -29,21 +26,6 @@ fn normalize_cpu_enabled() -> bool {
.unwrap_or(false) .unwrap_or(false)
}) })
} }
// Smoothed scaling factor cache (non-Linux) to prevent jitter when reconciling
// summed per-process CPU usage with global CPU usage.
#[cfg(not(target_os = "linux"))]
static SCALE_SMOOTH: OnceCell<Mutex<Option<f32>>> = OnceCell::new();
#[cfg(not(target_os = "linux"))]
fn smooth_scale_factor(target: f32) -> f32 {
let lock = SCALE_SMOOTH.get_or_init(|| Mutex::new(None));
let mut guard = lock.lock().unwrap();
let new = guard
.map(|prev| prev * 0.6 + target * 0.4)
.unwrap_or(target);
*guard = Some(new);
new
}
// Runtime toggles (read once) // Runtime toggles (read once)
fn gpu_enabled() -> bool { fn gpu_enabled() -> bool {
static ON: OnceCell<bool> = OnceCell::new(); static ON: OnceCell<bool> = OnceCell::new();
@ -329,7 +311,7 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
let ttl_ms: u64 = std::env::var("SOCKTOP_AGENT_PROCESSES_TTL_MS") let ttl_ms: u64 = std::env::var("SOCKTOP_AGENT_PROCESSES_TTL_MS")
.ok() .ok()
.and_then(|v| v.parse().ok()) .and_then(|v| v.parse().ok())
// Higher default (1500ms) on non-Linux to lower overhead while keeping responsiveness. // Higher default (1500ms) on non-Linux only; keep 1500 here for Linux correctness (more frequent updates).
.unwrap_or(1_500); .unwrap_or(1_500);
let ttl = StdDuration::from_millis(ttl_ms); let ttl = StdDuration::from_millis(ttl_ms);
{ {
@ -435,7 +417,7 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
let ttl_ms: u64 = std::env::var("SOCKTOP_AGENT_PROCESSES_TTL_MS") let ttl_ms: u64 = std::env::var("SOCKTOP_AGENT_PROCESSES_TTL_MS")
.ok() .ok()
.and_then(|v| v.parse().ok()) .and_then(|v| v.parse().ok())
.unwrap_or(1_000); .unwrap_or(2_000);
// Delay between the two refresh calls used to compute CPU% (ms). Smaller delay lowers // Delay between the two refresh calls used to compute CPU% (ms). Smaller delay lowers
// accuracy slightly but reduces overall CPU overhead. Default 180ms. // accuracy slightly but reduces overall CPU overhead. Default 180ms.
let delay_ms: u64 = std::env::var("SOCKTOP_AGENT_PROC_CPU_DELAY_MS") let delay_ms: u64 = std::env::var("SOCKTOP_AGENT_PROC_CPU_DELAY_MS")
@ -476,12 +458,12 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
.values() .values()
.map(|p| { .map(|p| {
let raw = p.cpu_usage(); let raw = p.cpu_usage();
// If normalization enabled: present 0..100% single-core scale. // sysinfo (non-Linux) returns aggregated CPU% fraction of total machine (0..100).
// Else keep raw (which may exceed 100 on multi-core usage) for familiarity with OS tools. // Present multi-core semantics by multiplying by logical core count unless normalized.
let cpu = if norm { let cpu = if norm {
(raw / cores).clamp(0.0, 100.0) raw.clamp(0.0, 100.0)
} else { } else {
raw (raw * cores).clamp(0.0, 100.0 * cores)
}; };
ProcessInfo { ProcessInfo {
pid: p.pid().as_u32(), pid: p.pid().as_u32(),
@ -491,26 +473,7 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
} }
}) })
.collect(); .collect();
// Global reconciliation (default ON) only when NOT using core normalization. // No scaling heuristic needed in multi-core mode; sums may exceed 100.
if !norm
&& std::env::var("SOCKTOP_AGENT_SCALE_PROC_CPU")
.map(|v| v != "0")
.unwrap_or(true)
{
let sum: f32 = list.iter().map(|p| p.cpu_usage).sum();
let global = sys.global_cpu_usage();
if sum > 0.0 && global > 0.0 {
// target scale so that sum * scale ~= global
let target_scale = (global / sum).min(1.0);
// Only scale if we're more than 10% over.
if target_scale < 0.9 {
let s = smooth_scale_factor(target_scale);
for p in &mut list {
p.cpu_usage = (p.cpu_usage * s).clamp(0.0, global.max(100.0));
}
}
}
}
(total_count, list) (total_count, list)
}; };
let payload = ProcessesPayload { let payload = ProcessesPayload {