diff options
Diffstat (limited to 'desktop/modules')
| -rw-r--r-- | desktop/modules/perf/Perf.js | 14 | ||||
| -rw-r--r-- | desktop/modules/perf/Perf.qml | 2 | ||||
| -rw-r--r-- | desktop/modules/perf/PerfModule.qml | 8 | ||||
| -rw-r--r-- | desktop/modules/perf/PerfPanel.qml | 153 | ||||
| -rw-r--r-- | desktop/modules/perf/README.md | 36 | ||||
| -rw-r--r-- | desktop/modules/perf/test_perf.js | 10 |
6 files changed, 161 insertions, 62 deletions
diff --git a/desktop/modules/perf/Perf.js b/desktop/modules/perf/Perf.js index b853f50..d84c694 100644 --- a/desktop/modules/perf/Perf.js +++ b/desktop/modules/perf/Perf.js @@ -72,6 +72,20 @@ function df(text) { return out; } +// `du -B1 -d1 <dir>`: {total, items} with items largest first by basename, +// or null when du printed nothing. du prints the directory itself last, and +// it is also the largest line, so the total is the maximum. +function du(text) { + const rows = []; + for (const line of text.split("\n")) { + const m = /^(\d+)\t(.*)$/.exec(line); + if (m) rows.push({ name: m[2].replace(/.*\//, ""), bytes: Number(m[1]) }); + } + if (!rows.length) return null; + rows.sort((x, y) => y.bytes - x.bytes); + return { total: rows[0].bytes, items: rows.slice(1) }; +} + // VRAM in bytes from the fdinfo scan: drm-resident-vram0 of every xe fd, // counted once per drm-client-id because a client holds several fds. function vram(text) { diff --git a/desktop/modules/perf/Perf.qml b/desktop/modules/perf/Perf.qml index 53d8670..6216959 100644 --- a/desktop/modules/perf/Perf.qml +++ b/desktop/modules/perf/Perf.qml @@ -21,7 +21,7 @@ import "Perf.js" as P // The numbers behind the performance panel and the status pill's icon. CPU, // RAM, temperatures and disks are sampled always, so the icon can warn while // the panel is closed; per-core load, the network rate, VRAM and the fan only -// while `detailed`, which is any PerfPanel existing (island or drawer). +// while `detailed`, which is any PerfPanel existing (the drawer page). // /proc and /sys are FileViews reloaded on a timer, no subprocess; df, the // fdinfo scan, ip and curl are Processes. Singleton { diff --git a/desktop/modules/perf/PerfModule.qml b/desktop/modules/perf/PerfModule.qml index d0ddf35..e596f9a 100644 --- a/desktop/modules/perf/PerfModule.qml +++ b/desktop/modules/perf/PerfModule.qml @@ -11,11 +11,9 @@ import QtQuick import "../.." -import "../../island/perf" -// The island's performance panel at drawer size. Perf.qml stays in -// island/perf and is shared: its always-on sampling already runs for the -// island's warning dot, so this module adds no service of its own. +// The figures the conky dashboard used to show, as a scrolling page. Perf.qml +// samples them; the tile's dot is its severity. Module { id: mod @@ -38,7 +36,7 @@ Module { + " · RAM " + (Perf.mem ? Math.round(100 * Perf.mem.used / Perf.mem.total) + "%" : "--") } - // The same dot as the island icon. Never the accent (AGENTS.md). + // The worst severity. Never the accent (AGENTS.md). Rectangle { anchors.verticalCenter: parent.verticalCenter width: 8 diff --git a/desktop/modules/perf/PerfPanel.qml b/desktop/modules/perf/PerfPanel.qml index f149d82..de9021b 100644 --- a/desktop/modules/perf/PerfPanel.qml +++ b/desktop/modules/perf/PerfPanel.qml @@ -10,24 +10,21 @@ // GNU General Public License for more details. import Quickshell +import Quickshell.Io import QtQuick -import QtQuick.Layouts import "../.." import "Perf.js" as P -// CPU, GPU, network and disks as cards in three columns: CPU down the left, -// GPU and network beside it, disks under those two. Numbers come from Perf; -// colours follow conky's bands, so they read as they did there. -GridLayout { +// CPU, temperatures, GPU, network, disks and ~/.cache as cards, one per row: +// the drawer page scrolls, so nothing has to share a line. Numbers come from +// Perf; colours follow conky's bands, so they read as they did there. +Column { id: panel - columns: 3 - columnSpacing: 8 - rowSpacing: 8 + spacing: 12 - readonly property real col: (width - 2 * columnSpacing) / 3 + readonly property int fs: Theme.fontSize - 2 readonly property var gpuTemp: sensor("GPU") - readonly property var vramTemp: sensor("VRAM") function tone(v, warn, crit) { const b = P.band(v, warn, crit); @@ -37,10 +34,8 @@ GridLayout { function sensor(label) { return Perf.temps.find(t => t.label === label) || { value: null, warn: 0, crit: 0 }; } - // Detailed sampling (per-core, network, VRAM, fan) runs while any panel - // exists. The island loads one only while open and the drawer page only - // while shown, so counting instances is the whole gate, and two of them - // never clear it under each other. + // Detailed sampling (per-core, network, VRAM, fan) runs while the panel + // exists, which is while the drawer page is shown. Component.onCompleted: Perf.viewers++ Component.onDestruction: Perf.viewers-- @@ -53,7 +48,7 @@ GridLayout { } component Label: Text { - font { family: Theme.fontFamily; pixelSize: Theme.fontSize - 4 } + font { family: Theme.fontFamily; pixelSize: panel.fs } color: Theme.text } @@ -72,7 +67,7 @@ GridLayout { Text { visible: text !== "" text: parent.parent.glyph - font { family: Theme.iconFamily; pixelSize: Theme.fontSize - 2 } + font { family: Theme.iconFamily; pixelSize: panel.fs + 2 } color: parent.parent.labelColor } Label { text: parent.parent.label; color: parent.parent.labelColor } @@ -89,7 +84,7 @@ GridLayout { property real frac: 0 property color fill: Theme.green width: parent ? parent.width : 0 - height: 5 + height: 6 radius: 3 color: Theme.surfaceAlt Rectangle { @@ -105,17 +100,17 @@ GridLayout { property string title: "" property string headline: "" property color headlineColor: Theme.text + width: panel.width radius: 10 color: Qt.alpha(Theme.surface, 0.6) - implicitHeight: body.implicitHeight + 20 - Layout.fillHeight: true + implicitHeight: body.implicitHeight + 28 Column { id: body - x: 10 - y: 10 - width: parent.width - 20 - spacing: 5 + x: 14 + y: 14 + width: parent.width - 28 + spacing: 8 Item { width: parent.width @@ -124,7 +119,7 @@ GridLayout { id: titleText anchors.verticalCenter: parent.verticalCenter text: parent.parent.parent.title - font { family: Theme.fontFamily; pixelSize: Theme.fontSize - 4; bold: true } + font { family: Theme.fontFamily; pixelSize: panel.fs; bold: true } color: Theme.subtext } Text { @@ -141,10 +136,6 @@ GridLayout { // --- CPU ---------------------------------------------------------------- Card { - Layout.row: 0 - Layout.column: 0 - Layout.rowSpan: 2 - Layout.preferredWidth: panel.col title: "CPU" headline: Perf.load === null ? "--" : Math.round(Perf.load) + "%" headlineColor: panel.tone(Perf.load, 25, 75) @@ -160,7 +151,7 @@ GridLayout { Row { id: eq width: parent.width - height: 40 + height: 64 spacing: 2 Repeater { model: Perf.cores @@ -187,14 +178,42 @@ GridLayout { frac: Perf.mem ? Perf.mem.used / Perf.mem.total : 0 fill: panel.tone(panel.pct(Perf.mem ? Perf.mem.used : null, Perf.mem ? Perf.mem.total : 0), 25, 75) } + } - Repeater { - model: Perf.temps.filter(t => t.label !== "GPU" && t.label !== "VRAM") - delegate: Pair { - required property var modelData - label: modelData.label - value: panel.deg(modelData.value) - valueColor: panel.tone(modelData.value, modelData.warn, modelData.crit) + // --- temperatures ------------------------------------------------------- + + Card { + title: "TEMPERATURES" + + Flow { + id: temps + width: parent.width + spacing: 8 + Repeater { + model: Perf.temps + delegate: Rectangle { + required property var modelData + width: (temps.width - 3 * temps.spacing) / 4 + height: tempCol.implicitHeight + 16 + radius: 8 + color: Qt.alpha(Theme.surfaceAlt, 0.5) + Column { + id: tempCol + anchors.centerIn: parent + spacing: 2 + Label { + anchors.horizontalCenter: parent.horizontalCenter + text: modelData.label + color: Theme.subtext + } + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: panel.deg(modelData.value) + font { family: Theme.fontFamily; pixelSize: panel.fs + 6; bold: true } + color: panel.tone(modelData.value, modelData.warn, modelData.crit) + } + } + } } } } @@ -203,9 +222,6 @@ GridLayout { // No utilisation: xe exposes no busy percentage. Card { - Layout.row: 0 - Layout.column: 1 - Layout.preferredWidth: panel.col title: "GPU · " + Perf.gpuName headline: panel.deg(panel.gpuTemp.value) headlineColor: panel.tone(panel.gpuTemp.value, panel.gpuTemp.warn, panel.gpuTemp.crit) @@ -219,11 +235,6 @@ GridLayout { fill: panel.tone(panel.pct(Perf.vram, Perf.vramTotal), 25, 75) } Pair { - label: "VRAM temp" - value: panel.deg(panel.vramTemp.value) - valueColor: panel.tone(panel.vramTemp.value, panel.vramTemp.warn, panel.vramTemp.crit) - } - Pair { label: "Fan" value: Perf.fan === null ? "--" : Perf.fan + " rpm" } @@ -232,15 +243,12 @@ GridLayout { // --- network ------------------------------------------------------------ Card { - Layout.row: 0 - Layout.column: 2 - Layout.preferredWidth: panel.col title: "NET · " + Perf.iface Canvas { id: graph width: parent.width - height: 44 + height: 80 onPaint: { const ctx = getContext("2d"); ctx.reset(); @@ -291,7 +299,7 @@ GridLayout { id: pin anchors { right: parent.right; verticalCenter: pubText.verticalCenter } text: String.fromCodePoint(0xF0403) - font { family: Theme.iconFamily; pixelSize: Theme.fontSize - 2 } + font { family: Theme.iconFamily; pixelSize: panel.fs + 2 } color: Perf.ip.ip !== "" && Perf.ip.ip === Prefs.pinnedIp ? Theme.text : Theme.overlay MouseArea { @@ -308,10 +316,6 @@ GridLayout { // --- disks -------------------------------------------------------------- Card { - Layout.row: 1 - Layout.column: 1 - Layout.columnSpan: 2 - Layout.preferredWidth: 2 * panel.col + panel.columnSpacing title: "DISKS" Repeater { @@ -319,7 +323,7 @@ GridLayout { delegate: Column { required property var modelData width: parent.width - spacing: 2 + spacing: 4 Pair { glyph: panel.glyph(modelData) label: modelData.host || modelData.mount @@ -333,4 +337,45 @@ GridLayout { } } } + + // --- cache -------------------------------------------------------------- + + // ~/.cache and its five largest children, measured once per page open: + // du over the tree took 28ms, so conky's 15-minute sampler file is not + // needed. The largest is coloured by its share of the total, as conky + // did, so the eye lands on the one worth deleting. + property var cache: null // {total, items: [{name, bytes}]} + + Process { + running: true + command: ["du", "-B1", "-d1", (Quickshell.env("XDG_CACHE_HOME") || Quickshell.env("HOME") + "/.cache")] + stdout: StdioCollector { + onStreamFinished: panel.cache = P.du(text) + } + } + + Card { + title: "CACHE" + headline: panel.cache ? P.bytes(panel.cache.total) : "--" + + Repeater { + model: panel.cache ? panel.cache.items.slice(0, 5) : [] + delegate: Column { + required property var modelData + required property int index + readonly property real share: modelData.bytes / panel.cache.total + width: parent.width + spacing: 4 + Pair { + label: modelData.name + value: P.bytes(modelData.bytes) + valueColor: index === 0 ? (share > 0.5 ? Theme.red : Theme.yellow) : Theme.text + } + Bar { + frac: share + fill: index === 0 ? (share > 0.5 ? Theme.red : Theme.yellow) : Theme.overlay + } + } + } + } } diff --git a/desktop/modules/perf/README.md b/desktop/modules/perf/README.md new file mode 100644 index 0000000..dea5a7e --- /dev/null +++ b/desktop/modules/perf/README.md @@ -0,0 +1,36 @@ +# perf + +The figures the conky dashboard used to show, as a drawer page of cards, one +per row; the page scrolls. CPU load with a bar per core, the CPU model and +RAM; every temperature as a tile; the Arc B580's VRAM and fan (no +utilisation, xe exposes none); download and upload over the last minute, the +LAN address and the public IP; the five mounts with their usage; and +`~/.cache` with its five largest children. `Perf.qml` reads them; `Perf.js` +holds the parsing, tested by `node desktop/modules/perf/test_perf.js`. + +The tile shows CPU and RAM, and a dot for the worst of these, yellow or red: + +| Input | Yellow | Red | +| --- | --- | --- | +| each temperature | its warn | its crit | +| RAM | 85% | 95% | +| each disk | 90% | 95% | +| public IP | | differs from the pinned one | + +CPU load is left out, since spikes would flicker it. There is no hysteresis, +so a sensor sitting on its threshold can toggle the dot. The pin beside the +public IP stores the address shown as `perf.pinnedIp` in +`$XDG_STATE_HOME/quickshell/desktop.json`; the check exists because the VPN +into the LAN depends on the ISP's fixed address. The fetch is +`curl -4 https://ipinfo.io/ip` every 30 minutes from the last attempt, into +`~/.cache/udt/pubip.txt`, the file conky's sampler used. A failed fetch is +never a mismatch: the old value goes stale after 4 hours and shows as a dash. + +CPU, RAM, temperatures and disks are sampled always. Per-core load, the +network rate, VRAM (a scan of every fdinfo, ~14ms) and the fan run only while +the page is open. The mount list, `br0`, the GPU name and the 12 GiB VRAM +size are constants in `Perf.qml`. + +The cache card runs `du -B1 -d1` once each time the page opens, 28ms over +2 GiB, instead of reading conky's 15-minute `cachesize.txt`. The largest +child is yellow, red when it holds over half the total, as conky had it. diff --git a/desktop/modules/perf/test_perf.js b/desktop/modules/perf/test_perf.js index 5f39f5d..ac5859d 100644 --- a/desktop/modules/perf/test_perf.js +++ b/desktop/modules/perf/test_perf.js @@ -9,7 +9,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// Run: node desktop/island/perf/test_perf.js +// Run: node desktop/modules/perf/test_perf.js // Perf.js is a QML library, so its .pragma line is stripped before node // evaluates it, as test_controls.js does for Controls.js. @@ -19,7 +19,7 @@ const assert = require("assert"); const src = fs.readFileSync(__dirname + "/Perf.js", "utf8") .replace(/^\.pragma library$/m, ""); const P = new Function(src + "\nreturn { cpuTimes, load, meminfo, df, vram, rate, " + - "hwmonMap, lanAddr, cpuModel, band, worst, isIPv4, parsePubip, formatPubip, " + + "hwmonMap, lanAddr, cpuModel, du, band, worst, isIPv4, parsePubip, formatPubip, " + "ipCheck, due, push, bytes, speed };")(); // cpuTimes: aggregate first, then cores; idle is idle + iowait. @@ -150,4 +150,10 @@ assert.strictEqual(P.bytes(null), "--"); assert.strictEqual(P.speed(1024 * 1024 * 1.2), "1.2M/s"); assert.strictEqual(P.speed(null), "--"); +// du: total is the directory's own (largest) line; children largest first. +const cache = P.du("5\t/c/b\n9\t/c/a b\n20\t/c\n"); +assert.strictEqual(cache.total, 20); +assert.deepStrictEqual(cache.items, [{ name: "a b", bytes: 9 }, { name: "b", bytes: 5 }]); +assert.strictEqual(P.du(""), null); + console.log("test_perf: ok"); |