diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt index a1bab5dbb4..efa6a7956f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt @@ -16,12 +16,15 @@ import java.io.File * counts, where the policy allows it; * - else KGSL's own accounting of each of the session's processes * (`/sys/class/kgsl/kgsl/proc//gpumem_mapped` and `gpumem_unmapped`); - * - else the size of the KGSL mappings in each of the session's processes' `smaps` - only the + * - else the size of the KGSL mappings in each of the session's processes' `maps` - only the * buffers the CPU has mapped, so less than the GPU holds (about 40 % of KGSL's own count in a * game on an AYN Thor), but always readable: every process the app can see in `/proc` is one of - * its own. + * its own. `maps` rather than `smaps`, which gives the same sizes but walks page tables to do it: + * in a game, 180,000 lines and most of a second of CPU a pass. + * + * Sampled only while the overlay shows (OverlayShown). */ -class GpuMemComponent(private val file: File) : SessionPart() { +class GpuMemComponent(private val file: File, private val root: File) : SessionPart() { @Volatile private var running = false private var thread: Thread? = null private var source = "" @@ -39,7 +42,7 @@ class GpuMemComponent(private val file: File) : SessionPart() { thread = Thread({ while (running) { try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } - if (running) sample()?.let { write(it) } + if (running && OverlayShown.check(root)) sample()?.let { write(it) } } }, "gpu-mem").apply { isDaemon = true; start() } } @@ -69,7 +72,7 @@ class GpuMemComponent(private val file: File) : SessionPart() { mappedKb += kb anyMap = true } - if (anyMap) { source = "/proc//smaps (KGSL mappings)"; return mappedKb * 1024 } + if (anyMap) { source = "/proc//maps (KGSL mappings)"; return mappedKb * 1024 } return null } @@ -77,18 +80,19 @@ class GpuMemComponent(private val file: File) : SessionPart() { private fun sessionPids(): List = File("/proc").list()?.filter { it.isNotEmpty() && it.all(Char::isDigit) }.orEmpty() - /** Size of a process's mappings of the KGSL device, in kB; null where its smaps cannot be read. */ + /** Size of a process's mappings of the KGSL device, in kB; null where its maps cannot be read. */ private fun kgslMappedKb(pid: String): Long? = runCatching { - var total = 0L - var inKgsl = false - File("/proc/$pid/smaps").forEachLine { line -> - if (MAPPING.containsMatchIn(line)) { - inKgsl = line.contains("kgsl-3d0") || line.contains("/dev/dri/renderD") - } else if (inKgsl && line.startsWith("Size:")) { - total += line.substring(5).trim().removeSuffix("kB").trim().toLongOrNull() ?: 0L + var bytes = 0L + File("/proc/$pid/maps").forEachLine { line -> + if (line.endsWith("kgsl-3d0") || line.contains("/dev/dri/renderD")) { + val dash = line.indexOf('-') + val space = line.indexOf(' ') + if (dash > 0 && space > dash) { + bytes += line.substring(dash + 1, space).toLong(16) - line.substring(0, dash).toLong(16) + } } } - total + bytes / 1024 }.getOrNull() /** Whole, renamed into place: the reader opens either the last value or this one. */ @@ -105,9 +109,8 @@ class GpuMemComponent(private val file: File) : SessionPart() { companion object { private const val TAG = "SessionService" private const val KGSL_ROOT = "/sys/class/kgsl/kgsl" - private const val PERIOD_MS = 2_000L - /** A mapping's header in smaps: its address range first, then its fields and path. */ - private val MAPPING = Regex("^[0-9a-f]+-[0-9a-f]+ ") + /** GPU memory moves slowly; a pass over every process's maps is ~40 ms of CPU in a game. */ + private const val PERIOD_MS = 5_000L private fun readLong(path: String): Long? = runCatching { File(path).readText().trim().toLong() }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt index e325b49dea..fb00489335 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt @@ -27,7 +27,7 @@ import java.io.RandomAccessFile * * Nothing in a phone's own hwmon is read by the overlay, so standing in for it loses nothing. */ -class HwmonComponent(val dir: File) : SessionPart() { +class HwmonComponent(val dir: File, private val root: File) : SessionPart() { @Volatile private var running = false private var thread: Thread? = null private var fanSource: String? = null @@ -65,7 +65,8 @@ class HwmonComponent(val dir: File) : SessionPart() { thread = Thread({ while (running) { try { Thread.sleep(FAN_PERIOD_MS) } catch (e: InterruptedException) { break } - if (running) writeFan(sampleFan()) + // A tachometer read busy-waits 100 ms in the kernel: only while the overlay shows. + if (running && OverlayShown.check(root)) writeFan(sampleFan()) } }, "hwmon-fan").apply { isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt new file mode 100644 index 0000000000..6c1c447009 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.session + +import java.io.File + +/** + * Whether Deck mode's performance overlay is on screen. The client sets its level by rewriting + * mangoapp's config (bannerlator-session makes it, `/tmp/mangohud.*`), and `no_display` is the + * level that hides it. The feeds whose reads cost something - the fan's tachometer busy-waits in + * the kernel, GPU memory walks every process's mappings - only run while it shows. + */ +object OverlayShown { + fun check(root: File): Boolean { + val config = File(root, "tmp").listFiles { f -> f.name.startsWith("mangohud.") } + ?.maxByOrNull { it.lastModified() } ?: return false + return runCatching { !config.readText().contains("no_display") }.getOrDefault(false) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 0993af357d..f0197bf9b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -689,7 +689,7 @@ class SessionService : Service() { components.add(battery) binds.add(battery.dir.path + ":/sys/class/power_supply") // The overlay's CPU and GPU temperatures and the fan, as hwmon sensors it knows by name. - val hwmon = HwmonComponent(File(filesDir, "session/sys/hwmon")) + val hwmon = HwmonComponent(File(filesDir, "session/sys/hwmon"), LinuxRuntime.rootDir(this)) if (hwmon.prepare()) { hwmon.attach(this) components.add(hwmon) @@ -703,7 +703,7 @@ class SessionService : Service() { binds.add(cpuStat.file.path + ":/proc/stat") } // The GPU memory in use for the overlay's VRAM lines, which it would read from tracefs. - val gpuMem = GpuMemComponent(File(LinuxRuntime.rootDir(this), "run/droiddeck-hud/gpu-mem")) + val gpuMem = GpuMemComponent(File(LinuxRuntime.rootDir(this), "run/droiddeck-hud/gpu-mem"), LinuxRuntime.rootDir(this)) if (gpuMem.prepare()) { gpuMem.attach(this) components.add(gpuMem)