Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

test: make VmLoadSampler CPU sampling deterministic

ExTv94ce598a9426
diff --git a/app/src/main/java/com/excp/podroid/util/VmLoadSampler.kt b/app/src/main/java/com/excp/podroid/util/VmLoadSampler.kt
index 7e0cdc2..14b2dff 100644
--- a/app/src/main/java/com/excp/podroid/util/VmLoadSampler.kt
+++ b/app/src/main/java/com/excp/podroid/util/VmLoadSampler.kt
@@ -15,6 +15,9 @@ import java.io.File
*/
class VmLoadSampler(
private val clockHz: Long = 100L,
+ // Injected for tests; production reads the real monotonic clock and /proc.
+ private val nowMs: () -> Long = { SystemClock.elapsedRealtime() },
+ private val ticksReader: (Int) -> Long? = { readProcessCpuTicks(it) },
) {
private var lastTicks: Long? = null
private var lastTimeMs: Long? = null
@@ -28,8 +31,8 @@ class VmLoadSampler(
* CPU load as 0–100% of the VM's allocated vCPU count (QEMU process on Android).
*/
fun sampleCpuPercent(pid: Int, vmCpus: Int): Float? {
- val ticks = readProcessCpuTicks(pid) ?: return null
- val now = SystemClock.elapsedRealtime()
+ val ticks = ticksReader(pid) ?: return null
+ val now = nowMs()
val prevTicks = lastTicks
val prevTime = lastTimeMs
lastTicks = ticks
diff --git a/app/src/test/java/com/excp/podroid/util/VmLoadSamplerTest.kt b/app/src/test/java/com/excp/podroid/util/VmLoadSamplerTest.kt
index c919634..7703847 100644
--- a/app/src/test/java/com/excp/podroid/util/VmLoadSamplerTest.kt
+++ b/app/src/test/java/com/excp/podroid/util/VmLoadSamplerTest.kt
@@ -6,28 +6,81 @@ import org.junit.Test
class VmLoadSamplerTest {
+ /** Sampler with injected clock/tick sources so the math is deterministic off-device. */
+ private fun sampler(
+ clockHz: Long = 100L,
+ now: () -> Long,
+ ticks: (Int) -> Long?,
+ ) = VmLoadSampler(clockHz = clockHz, nowMs = now, ticksReader = ticks)
+
@Test
fun sampleCpuPercent_returnsNullOnFirstSample() {
- val sampler = VmLoadSampler()
- assertNull(sampler.sampleCpuPercent(pid = 1, vmCpus = 2))
+ val s = sampler(now = { 1_000L }, ticks = { 500L })
+ assertNull(s.sampleCpuPercent(pid = 42, vmCpus = 2))
+ }
+
+ @Test
+ fun sampleCpuPercent_returnsNullWhenProcUnreadable() {
+ val s = sampler(now = { 1_000L }, ticks = { null })
+ assertNull(s.sampleCpuPercent(pid = 42, vmCpus = 2))
}
@Test
fun sampleCpuPercent_computesNormalizedLoad() {
- val sampler = VmLoadSampler(clockHz = 100L)
- // Seed first sample
- sampler.sampleCpuPercent(pid = 1, vmCpus = 2)
- // Manually set state by second call with same pid - won't work without real /proc
+ var now = 1_000L
+ var ticks = 100L
+ val s = sampler(now = { now }, ticks = { ticks })
- // Test math via readProcessCpuTicks on invalid pid
- assertNull(VmLoadSampler.readProcessCpuTicks(-1))
+ assertNull(s.sampleCpuPercent(pid = 42, vmCpus = 2)) // warm-up sample
+
+ // +200 ticks over 1.0s at 100Hz = 2.0 cores used; on 2 vCPUs -> 100%.
+ now = 2_000L
+ ticks = 300L
+ assertEquals(100f, s.sampleCpuPercent(pid = 42, vmCpus = 2)!!, 0.01f)
+ }
+
+ @Test
+ fun sampleCpuPercent_halfLoadOnOneOfTwoCores() {
+ var now = 0L
+ var ticks = 0L
+ val s = sampler(now = { now }, ticks = { ticks })
+
+ assertNull(s.sampleCpuPercent(pid = 1, vmCpus = 2)) // warm-up
+
+ // +100 ticks over 1.0s = 1.0 core used; on 2 vCPUs -> 50%.
+ now = 1_000L
+ ticks = 100L
+ assertEquals(50f, s.sampleCpuPercent(pid = 1, vmCpus = 2)!!, 0.01f)
+ }
+
+ @Test
+ fun sampleCpuPercent_clampsAboveFullLoad() {
+ var now = 0L
+ var ticks = 0L
+ val s = sampler(now = { now }, ticks = { ticks })
+
+ assertNull(s.sampleCpuPercent(pid = 1, vmCpus = 1)) // warm-up
+
+ // 4 cores of work reported on a single vCPU still clamps to 100%.
+ now = 1_000L
+ ticks = 400L
+ assertEquals(100f, s.sampleCpuPercent(pid = 1, vmCpus = 1)!!, 0.01f)
}
@Test
fun reset_clearsWarmup() {
- val sampler = VmLoadSampler()
- sampler.sampleCpuPercent(1, 2)
- sampler.reset()
- assertNull(sampler.sampleCpuPercent(1, 2))
+ var now = 0L
+ val s = sampler(now = { now }, ticks = { 100L })
+
+ assertNull(s.sampleCpuPercent(1, 2)) // warm-up
+ now = 1_000L
+ s.reset()
+ // After reset the next sample is a warm-up again, so it returns null.
+ assertNull(s.sampleCpuPercent(1, 2))
+ }
+
+ @Test
+ fun readProcessCpuTicks_returnsNullForInvalidPid() {
+ assertNull(VmLoadSampler.readProcessCpuTicks(-1))
}
}