Feat: Introduce resource profiling and monitoring APIs

This change introduces a comprehensive profiling system, allowing for periodic resource usage monitoring (CPU, I/O, memory) via a background thread. It also exposes new public APIs for budget management, locking, NUMA partitioning, and progress tracking.

src/Cargo.lock

@@ -1480,7 +1480,7 @@ dependencies = [
 
 [[package]]
 name = "obikmer"
-version = "1.3.2"
+version = "1.3.4"
 dependencies = [
  "clap",
  "csv",

src/obikmer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "obikmer"
-version = "1.3.2"
+version = "1.3.4"
 edition = "2024"
 
 [[bin]]

src/obikmer/src/main.rs

@@ -73,6 +73,10 @@ fn main() {
         warn!("could not configure the global rayon pool: {e}");
     }
 
+    // Always-on, near-zero-cost when disabled: RUST_LOG=obisys::profiler=trace
+    // to see periodic CPU/IO/memory snapshots on a production run.
+    obisys::start_profiler(std::time::Duration::from_secs(5));
+
     match cli.command {
         Commands::Index(args) => cmd::index::run(args),
         Commands::Superkmer(args) => cmd::superkmer::run(args),

src/obisys/src/lib.rs

@@ -4,6 +4,7 @@
 mod budget;
 mod lock;
 mod numa;
+mod profiler;
 mod progress;
 mod resources;
 mod stage;
@@ -11,6 +12,7 @@ mod stage;
 pub use budget::MemoryBudget;
 pub use lock::DirLock;
 pub use numa::PartitionRunner;
+pub use profiler::start as start_profiler;
 pub use progress::{Progress, TracedBar, progress_bar, spinner};
 pub use resources::{
     CpuSample, IoSample, available_memory_bytes, cpu_budget, effective_parallelism, peak_rss_bytes,

src/obisys/src/numa/runner.rs

@@ -41,9 +41,10 @@ struct NodeConfig {
 /// growth always targets a specific node rather than whichever dormant
 /// worker happens to wake up first on a shared channel. Growth (both the
 /// initial count and each subsequent step) is expressed as a fraction of
-/// `workers_per_node`, applied identically to every node, so the pace of
-/// ramp-up depends on node size rather than node count — a single-NUMA-node
-/// (UMA) machine ramps just as fast as an 8-node one.
+/// each node's own worker cap, applied per node, so the pace of ramp-up
+/// depends on that node's size rather than the node count — a
+/// single-NUMA-node (UMA) machine ramps just as fast as an 8-node one, and a
+/// `--cpu-max`-emptied node simply never ramps.
 ///
 /// # Termination
 ///
@@ -63,22 +64,27 @@ impl PartitionRunner {
     }
 
     /// Detect topology and build. Always succeeds.
+    ///
+    /// Each node's worker count is its own (`--cpu-max`-budgeted) CPU count,
+    /// not a single value shared across nodes — `build()` can leave some
+    /// nodes with fewer cores than others (or none at all) once the process
+    /// CPU budget is smaller than the raw hardware topology, and spawning a
+    /// uniform worker count per node regardless would silently exceed that
+    /// budget on the emptied-out nodes.
     pub fn new() -> Self {
         let ns = build();
-        let wpn = ns.workers_per_node();
         debug!(
-            "PartitionRunner: {} node(s) × {} worker(s)/node max",
+            "PartitionRunner: {} node(s), {:?} core(s)/node",
             ns.pools.len(),
-            wpn,
+            ns.cpus_per_node.iter().map(Vec::len).collect::<Vec<_>>(),
         );
         let nodes = ns
             .pools
             .into_iter()
             .zip(ns.cpus_per_node)
-            .map(|(pool, cpu_ids)| NodeConfig {
-                pool,
-                cpu_ids,
-                max_workers: wpn,
+            .map(|(pool, cpu_ids)| {
+                let max_workers = cpu_ids.len();
+                NodeConfig { pool, cpu_ids, max_workers }
             })
             .collect();
         Self { nodes }
@@ -113,9 +119,9 @@ impl PartitionRunner {
     /// Run `f(i)` for every index in `order`.
     ///
     /// Workers are pre-spawned dormant and activated adaptively, per node:
-    /// `(workers_per_node / INITIAL_DIVISOR).max(1)` are woken immediately on
-    /// every node, then `(workers_per_node / GROWTH_DIVISOR).max(1)` more per
-    /// node each time the check below fires. A timer thread fires that check
+    /// `(node's max_workers / INITIAL_DIVISOR).max(1)` are woken immediately
+    /// on every node, then `(node's max_workers / GROWTH_DIVISOR).max(1)`
+    /// more per node each time the check below fires. A timer thread fires that check
     /// every `TIMER_SECS` seconds; each completed partition resets that timer
     /// (forcing an immediate check) and also triggers its own inline check. A
     /// growth step happens whenever CPU efficiency grows by at least

src/obisys/src/numa/topology.rs

@@ -19,22 +19,22 @@ pub struct NumaSetup {
     pub cpus_per_node: Vec<Vec<usize>>,
 }
 
-impl NumaSetup {
-    /// Maximum worker slots per node (one per physical core in the node).
-    pub fn workers_per_node(&self) -> usize {
-        self.cpus_per_node
-            .first()
-            .map(|c| c.len().max(1))
-            .unwrap_or(1)
-    }
-}
-
 /// Detect NUMA topology and build per-node Rayon pools.
 /// Always succeeds: falls back to a single synthetic UMA node on failure.
+///
+/// Every node's CPU list — and therefore its Rayon pool's thread count — is
+/// capped against [`crate::cpu_budget`] (the process-wide ceiling set by
+/// `--cpu-max`, or the cgroup/host default when unset) via
+/// [`cap_to_budget`]. Sizing the pool itself, not just the outer worker
+/// count layered on top in [`super::runner::PartitionRunner`], matters
+/// because callers query `rayon::current_num_threads()` from *inside* a
+/// pool-installed closure to size further internal parallelism — that call
+/// only sees the requested budget if the pool itself was built that small.
 #[cfg(feature = "numa")]
 pub fn build() -> NumaSetup {
+    let budget = crate::cpu_budget();
     if let Ok(topology) = Topology::new() {
-        let nodes: Vec<Vec<usize>> = topology
+        let mut nodes: Vec<Vec<usize>> = topology
             .objects_with_type(ObjectType::NUMANode)
             .filter_map(|obj| obj.cpuset())
             .map(|cpuset| {
@@ -47,15 +47,23 @@ pub fn build() -> NumaSetup {
             .collect();
 
         if nodes.len() > 1 {
+            cap_to_budget(&mut nodes, budget);
             if let Some(pools) = nodes
                 .iter()
-                .map(|cpus| build_pool(cpus).map(|p| Some(Arc::new(p))))
+                .map(|cpus| {
+                    if cpus.is_empty() {
+                        Some(None)
+                    } else {
+                        build_pool(cpus).map(|p| Some(Arc::new(p)))
+                    }
+                })
                 .collect::<Option<Vec<_>>>()
             {
                 debug!(
-                    "NUMA topology: {} node(s), {} core(s)/node",
+                    "NUMA topology: {} node(s), {} core(s)/node, budget {}",
                     nodes.len(),
                     nodes.first().map_or(0, |v| v.len()),
+                    budget,
                 );
                 return NumaSetup {
                     pools,
@@ -65,8 +73,17 @@ pub fn build() -> NumaSetup {
         }
     }
 
-    // UMA fallback: single synthetic node, all cores, no pool, no pinning.
-    let n_cores = crate::effective_parallelism();
+    // UMA fallback: single synthetic node, budget-capped cores, no pool, no pinning.
+    debug!("UMA: single synthetic node, {} core(s)", budget);
+    NumaSetup {
+        pools: vec![None],
+        cpus_per_node: vec![(0..budget).collect()],
+    }
+}
+
+#[cfg(not(feature = "numa"))]
+pub fn build() -> NumaSetup {
+    let n_cores = crate::cpu_budget();
     debug!("UMA: single synthetic node, {} core(s)", n_cores);
     NumaSetup {
         pools: vec![None],
@@ -74,13 +91,29 @@ pub fn build() -> NumaSetup {
     }
 }
 
-#[cfg(not(feature = "numa"))]
-pub fn build() -> NumaSetup {
-    let n_cores = crate::effective_parallelism();
-    debug!("UMA: single synthetic node, {} core(s)", n_cores);
-    NumaSetup {
-        pools: vec![None],
-        cpus_per_node: vec![(0..n_cores).collect()],
+/// Trims each NUMA node's CPU list, in place, so the total across all nodes
+/// never exceeds `budget` — floor-split evenly across nodes. No-op when the
+/// topology already fits within `budget`. When `budget` is smaller than the
+/// number of nodes, the trailing nodes are emptied entirely (one core each
+/// to as many leading nodes as `budget` allows) rather than every node
+/// keeping a token core that would collectively blow the budget.
+#[cfg(feature = "numa")]
+fn cap_to_budget(nodes: &mut [Vec<usize>], budget: usize) {
+    let total: usize = nodes.iter().map(Vec::len).sum();
+    if budget >= total || nodes.is_empty() {
+        return;
+    }
+    let per_node = (budget / nodes.len()).max(1);
+    for cpus in nodes.iter_mut() {
+        cpus.truncate(per_node);
+    }
+    let mut used = 0;
+    for cpus in nodes.iter_mut() {
+        if used >= budget {
+            cpus.clear();
+        } else {
+            used += cpus.len();
+        }
     }
 }
 

src/obisys/src/profiler.rs

@@ -0,0 +1,50 @@
+use std::thread;
+use std::time::Duration;
+
+use tracing::{Level, trace};
+
+use crate::{CpuSample, IoSample, available_memory_bytes, cpu_budget, peak_rss_bytes};
+
+/// Spawn a detached background thread that logs a periodic snapshot of
+/// process-wide resource usage — CPU cores used (and as a % of the process's
+/// `--cpu-max` budget), I/O throughput, peak RSS, and remaining host/cgroup
+/// memory — at `trace!` level, every `interval`.
+///
+/// Meant to run for the whole process lifetime as always-on instrumentation
+/// installed once at startup (no stop handle). The sampling itself (a
+/// `getrusage` call and a `/proc/self/io` read) is cheap, but
+/// `available_memory_bytes()` builds a fresh `sysinfo::System` snapshot each
+/// time, so the whole body is skipped unless the `obisys::profiler` target
+/// is actually enabled at `TRACE`.
+///
+/// Enable with `RUST_LOG=obisys::profiler=trace` (combine with
+/// `RUST_LOG=debug,obisys::profiler=trace` to also get the per-partition
+/// `debug!` logs that already exist elsewhere) to profile a run directly on
+/// production hardware without attaching a separate profiler.
+pub fn start(interval: Duration) {
+    let budget = cpu_budget().max(1) as f64;
+    thread::Builder::new()
+        .name("obisys-profiler".into())
+        .spawn(move || {
+            let mut cpu = CpuSample::now();
+            let mut io = IoSample::now();
+            loop {
+                thread::sleep(interval);
+                if !tracing::enabled!(target: "obisys::profiler", Level::TRACE) {
+                    continue;
+                }
+                let cores = cpu.sample_cores().unwrap_or(0.0);
+                let io_mb_s = io.sample_rate().unwrap_or(0.0) / 1_000_000.0;
+                trace!(
+                    target: "obisys::profiler",
+                    cpu_pct = format_args!("{:.0}%", cores / budget * 100.0),
+                    cpu_cores = format_args!("{cores:.1}"),
+                    io_mb_s = format_args!("{io_mb_s:.1}"),
+                    rss_peak_mb = peak_rss_bytes() / 1_000_000,
+                    mem_avail_mb = available_memory_bytes() / 1_000_000,
+                    "profiler snapshot",
+                );
+            }
+        })
+        .expect("failed to spawn profiler thread");
+}

src/obisys/src/resources.rs

@@ -264,18 +264,31 @@ impl CpuSample {
         cpu / (wall * n_cores as f64)
     }
 
-    pub fn do_i_activate(&mut self, threshold: f64) -> bool {
+    /// Cores of CPU time consumed per wall-clock second since the last call
+    /// (or since [`now`](Self::now) for the first call) — an absolute core
+    /// count, unlike [`cpu_efficiency`](Self::cpu_efficiency) which
+    /// normalizes to `n_cores` and never resets its baseline. Resets the
+    /// window on every call that returns `Some`; returns `None` (state left
+    /// untouched, so the window keeps accumulating) when less than 100 ms
+    /// have elapsed — too short to be meaningful.
+    pub fn sample_cores(&mut self) -> Option<f64> {
         let delta_wall = self.wall.elapsed().as_secs_f64();
         if delta_wall < 0.1 {
-            // Window too short to be meaningful — leave state untouched so it
-            // keeps accumulating until a real sample can be taken.
-            return false;
+            return None;
         }
-
         let n = CpuSample::now();
         let delta_ru = (n.user_secs - self.user_secs) + (n.sys_secs - self.sys_secs);
+        self.user_secs = n.user_secs;
+        self.sys_secs = n.sys_secs;
+        self.wall = n.wall;
+        Some(delta_ru / delta_wall)
+    }
+
+    pub fn do_i_activate(&mut self, threshold: f64) -> bool {
+        let Some(efficiency) = self.sample_cores() else {
+            return false;
+        };
 
-        let efficiency = delta_ru / delta_wall;
         let activate = 0f64.max(efficiency - self.previous) >= threshold;
 
         debug!(
@@ -286,9 +299,6 @@ impl CpuSample {
             activate
         );
         self.previous = efficiency;
-        self.user_secs = n.user_secs;
-        self.sys_secs = n.sys_secs;
-        self.wall = n.wall;
 
         activate
     }
@@ -351,18 +361,32 @@ impl IoSample {
         0
     }
 
+    /// Bytes/second submitted to the block layer since the last call (or
+    /// since [`now`](Self::now) for the first call). Resets the window on
+    /// every call that returns `Some`; returns `None` (state left
+    /// untouched) when less than 100 ms have elapsed — too short to be
+    /// meaningful.
+    pub fn sample_rate(&mut self) -> Option<f64> {
+        let elapsed = self.wall.elapsed().as_secs_f64();
+        if elapsed < 0.1 {
+            return None;
+        }
+        let n = Self::read_bytes();
+        let rate = n.saturating_sub(self.bytes) as f64 / elapsed;
+        self.bytes = n;
+        self.wall = Instant::now();
+        Some(rate)
+    }
+
     /// Same protocol as [`CpuSample::do_i_activate`] (0.1 s minimum window,
     /// state untouched on early return), but growth is measured relative to
     /// the previous rate. `threshold` is a fraction, e.g. `0.2` for a 20 %
     /// increase in throughput since the last real sample.
     pub fn do_i_activate(&mut self, threshold: f64) -> bool {
-        let elapsed = self.wall.elapsed().as_secs_f64();
-        if elapsed < 0.1 {
+        let Some(rate) = self.sample_rate() else {
             return false;
-        }
+        };
 
-        let n = Self::read_bytes();
-        let rate = n.saturating_sub(self.bytes) as f64 / elapsed;
         let activate = if self.previous_rate == 0.0 {
             rate > 0.0 // bootstrap: any measured throughput is signal enough
         } else {
@@ -374,8 +398,6 @@ impl IoSample {
             self.previous_rate, rate, activate
         );
         self.previous_rate = rate;
-        self.bytes = n;
-        self.wall = Instant::now();
 
         activate
     }