Replace ps with top in collect_top_procs

- Use top -b -n 2 for accurate per-CPU sampling
- Extract second snapshot via awk, skip stale data
- Update BATS mock to emit two-iteration output
- Drop system mktemp from mock for BSD/GNU compat

Author: underhax

opt/monitoring/high-load.sh

@@ -249,7 +249,14 @@ collect_top_procs() {
   TOP_PROCS_FILE=$(mktemp /run/bash-sys-monitor/high-load-top-XXXXXX.txt)
   trap 'rm -f "${TOP_PROCS_FILE}"' EXIT
 
-  LC_ALL=C ps aux --sort=-%cpu | head -n $((TOP_PROCS_COUNT + 1)) >"${TOP_PROCS_FILE}"
+  local raw_file
+  raw_file=$(mktemp /run/bash-sys-monitor/high-load-top-raw-XXXXXX.txt)
+
+  LC_ALL=C top -b -n 2 -d 1 -c -o +%CPU -w 160 >"${raw_file}" 2>/dev/null || true
+
+  awk -v c="${TOP_PROCS_COUNT}" '/PID USER/ { m++; if (m == 2) { print; p=0; while(p < c && getline > 0) { if ($0 !~ /top -b -n 2/ && NF > 0) { print; p++ } } exit } }' "${raw_file}" >"${TOP_PROCS_FILE}" || true
+
+  rm -f "${raw_file}"
   debug "Top processes written to ${TOP_PROCS_FILE}"
 }
 

tests/high-load.bats

@@ -245,13 +245,38 @@ setup() {
 }
 
 @test "collect_top_procs creates temp file with process data" {
-  mktemp() { command mktemp "${TEST_TMPDIR}/high-load-top-XXXXXX.txt"; }
-  ps() {
-    echo "USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND"
-    echo "root         1  0.1  0.0  12345  6789 ?        Ss   00:00   0:01 /sbin/init"
-    echo "www-data   100 95.0  2.5 987654 65432 ?        R    00:01   5:30 /usr/sbin/apache2"
+  local mock_top_file="${TEST_TMPDIR}/mock_top_procs.txt"
+  local mock_raw_file="${TEST_TMPDIR}/mock_top_raw.txt"
+
+  mktemp() {
+    case "$1" in
+    *raw*) printf '%s' "${mock_raw_file}" ;;
+    *) printf '%s' "${mock_top_file}" ;;
+    esac
+  }
+
+  top() {
+    printf '%s\n' \
+      'top - 12:00:00 up 1 day,  1:00,  0 users,  load average: 4.50, 4.00, 3.50' \
+      'Tasks: 100 total,   1 running,  99 sleeping,   0 stopped,   0 zombie' \
+      '%Cpu(s): 50.0 us, 10.0 sy,  0.0 ni, 40.0 id,  0.0 wa,  0.0 hi,  0.0 si,  0.0 st' \
+      'MiB Mem :   8192.0 total,   2048.0 free,   4096.0 used,   2048.0 buff/cache' \
+      'MiB Swap:   2048.0 total,   2048.0 free,      0.0 used.   6000.0 avail Mem' \
+      '' \
+      'PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND' \
+      '  1 root      20   0   25132  14760   9156 S   0.0   0.1  20:30.11 /sbin/init' \
+      '100 www-data  20   0  987654  65432  12345 R  95.0   2.5   5:30.00 /usr/sbin/apache2' \
+      '' \
+      'top - 12:00:01 up 1 day,  1:01,  0 users,  load average: 4.45, 4.00, 3.50' \
+      'Tasks: 100 total,   1 running,  99 sleeping,   0 stopped,   0 zombie' \
+      '%Cpu(s): 50.0 us, 10.0 sy,  0.0 ni, 40.0 id,  0.0 wa,  0.0 hi,  0.0 si,  0.0 st' \
+      'MiB Mem :   8192.0 total,   2048.0 free,   4096.0 used,   2048.0 buff/cache' \
+      'MiB Swap:   2048.0 total,   2048.0 free,      0.0 used.   6000.0 avail Mem' \
+      '' \
+      'PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND' \
+      '  1 root      20   0   25132  14760   9156 S   0.0   0.1  20:30.11 /sbin/init' \
+      '100 www-data  20   0  987654  65432  12345 R  95.0   2.5   5:30.00 /usr/sbin/apache2'
   }
-  head() { command head "$@"; }
 
   collect_top_procs
   [ -f "${TOP_PROCS_FILE}" ]