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

refactor(agent): remove unused background sampler infrastructure (request-driven only)

Browse Source
This commit is contained in:
jasonwitty 2025-08-24 12:29:23 -07:00
parent 8de5943f34
commit b2468a5936
3 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -66,7 +66,7 @@ sudo apt-get install libdrm-dev libdrm-amdgpu1
Two components: Two components:
1) Agent (remote): small Rust WS server using sysinfo + /proc. It collects on demand when the client asks (fast metrics ~500 ms, processes ~2 s, disks ~5 s). No background loop when nobody is connected. 1) Agent (remote): small Rust WS server using sysinfo + /proc. It collects metrics only when the client requests them over the WebSocket (request-driven). No background sampling loop.
2) Client (local): TUI that connects to ws://HOST:PORT/ws (or wss://HOST:PORT/ws when TLS is enabled) and renders updates. 2) Client (local): TUI that connects to ws://HOST:PORT/ws (or wss://HOST:PORT/ws when TLS is enabled) and renders updates.

14
socktop_agent/src/main.rs
View File

@ -1,10 +1,9 @@
//! socktop agent entrypoint: sets up sysinfo handles, launches a sampler, //! socktop agent entrypoint: sets up sysinfo handles and serves a WebSocket endpoint at /ws.
//! and serves a WebSocket endpoint at /ws.
mod gpu; mod gpu;
mod metrics; mod metrics;
mod proto; mod proto;
mod sampler; // sampler module removed (metrics now purely request-driven)
mod state; mod state;
mod types; mod types;
mod ws; mod ws;
@ -15,7 +14,6 @@ use std::str::FromStr;
mod tls; mod tls;
use crate::sampler::{spawn_disks_sampler, spawn_process_sampler, spawn_sampler};
use state::AppState; use state::AppState;
fn arg_flag(name: &str) -> bool { fn arg_flag(name: &str) -> bool {
@ -45,13 +43,7 @@ async fn main() -> anyhow::Result<()> {
let state = AppState::new(); let state = AppState::new();
// Start background sampler (adjust cadence as needed) // No background samplers: metrics collected on-demand per websocket request.
// 500ms fast metrics
let _h_fast = spawn_sampler(state.clone(), std::time::Duration::from_millis(500));
// 2s processes (top 50)
let _h_procs = spawn_process_sampler(state.clone(), std::time::Duration::from_secs(2), 50);
// 5s disks
let _h_disks = spawn_disks_sampler(state.clone(), std::time::Duration::from_secs(5));
// Web app: route /ws to the websocket handler // Web app: route /ws to the websocket handler
async fn healthz() -> StatusCode { async fn healthz() -> StatusCode {

34
socktop_agent/src/sampler.rs
View File

@ -1,34 +0,0 @@
//! Background sampler: periodically collects metrics and updates precompressed caches,
//! so WS replies just read and send cached bytes.
use crate::state::AppState;
use tokio::task::JoinHandle;
use tokio::time::{sleep, Duration};
// 500ms: fast path (cpu/mem/net/temp/gpu)
pub fn spawn_sampler(_state: AppState, _period: Duration) -> JoinHandle<()> {
tokio::spawn(async move {
// no-op background sampler (request-driven collection elsewhere)
loop {
sleep(Duration::from_secs(3600)).await;
}
})
}
// 2s: processes top-k
pub fn spawn_process_sampler(_state: AppState, _period: Duration, _top_k: usize) -> JoinHandle<()> {
tokio::spawn(async move {
loop {
sleep(Duration::from_secs(3600)).await;
}
})
}
// 5s: disks
pub fn spawn_disks_sampler(_state: AppState, _period: Duration) -> JoinHandle<()> {
tokio::spawn(async move {
loop {
sleep(Duration::from_secs(3600)).await;
}
})
}