mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-20 04:59:34 +01:00
fix(header): the CPU reading shows CPU use, not the load average per core
The header's CPU figure was the 1-minute load average divided by the core count, capped at 100. Load counts runnable tasks, not busy time, so a host with bursty processes, or a VM whose vCPU threads count as runnable, read 100% while most cores were idle. It is now busy time across all cores since the previous reading, from os.cpus(), with a one-second minimum window on the monotonic clock. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e99b42c387
commit
9304f98efb
4 files changed
+141
-3
No files matched your search
@@ -14,6 +14,7 @@ import { execSync, spawn } from 'node:child_process';
|
||||
import { randomBytes } from 'node:crypto';
|
||||
import { dataPath } from '../../config/instance.js';
|
||||
import { readHostSensors } from '../../host-sensors.js';
|
||||
import { createCpuUsageMeter } from '../../cpu-usage.js';
|
||||
import { ApiErrorCode, createErrorResponse, getErrorMessage, type NiceConfig } from '../../types.js';
|
||||
import { isExplicitlyEnabled, isUnauthenticatedTunnelAcknowledged } from '../network-auth-policy.js';
|
||||
import { isMultiUserMode } from '../../config/multiuser.js';
|
||||
@@ -93,6 +94,11 @@ const SCREENSHOTS_DIR = dataPath('screenshots');
|
||||
/** Cached CPU count — doesn't change at runtime */
|
||||
const CPU_COUNT = cpus().length;
|
||||
|
||||
/** Header CPU use; the 1-minute load average per core only when the platform reports no core times. */
|
||||
const cpuUsagePercent = createCpuUsageMeter(cpus, () => performance.now(), () =>
|
||||
Math.min(100, Math.round((loadavg()[0] / CPU_COUNT) * 100))
|
||||
);
|
||||
|
||||
function parseOptionalNumber(value: string | undefined): number | undefined {
|
||||
if (value === undefined || value.trim() === '') return undefined;
|
||||
const parsed = Number(value);
|
||||
@@ -125,9 +131,7 @@ function getSystemStats(): {
|
||||
usedMem = totalMem - freemem();
|
||||
}
|
||||
|
||||
// CPU load average (1 min) as percentage (rough approximation)
|
||||
const load = loadavg()[0];
|
||||
const cpuPercent = Math.min(100, Math.round((load / CPU_COUNT) * 100));
|
||||
const cpuPercent = cpuUsagePercent();
|
||||
|
||||
return {
|
||||
cpu: cpuPercent,
|
||||
|
||||
Reference in new issue
Block a user