fix: guard session clock logger lifecycle

This commit is contained in:
Kurt Himebauch committed 2026-11-05 14:00:30 -05:00
1 parent 5805631be5
commit ee0d8d9997
2 files changed
+23 -5

No files matched your search

@@ -16,14 +16,17 @@ import java.util.Locale
class ClockLogComponent(private val logFile: File) : SessionPart() {
@Volatile private var running = false
private var stopped = false
private var thread: Thread? = null
override fun start() {
@Synchronized override fun start() {
if (stopped || running) return
running = true
thread = Thread({ run() }, "clock-log").apply { isDaemon = true; start() }
}
override fun stop() {
@Synchronized override fun stop() {
stopped = true
running = false
thread?.interrupt()
thread = null
@@ -93,8 +96,13 @@ class ClockLogComponent(private val logFile: File) : SessionPart() {
"/sys/kernel/ged/hal/current_freqency", "/sys/kernel/ged/hal/current_frequency",
"/proc/gpufreqv2/gpufreq_status", "/proc/gpufreq/gpufreq_var_dump",
"/sys/kernel/gpu/gpu_clock", "/sys/class/misc/mali0/device/cur_freq",
"/sys/class/misc/mali0/device/clock",
"/sys/class/misc/mali0/device/clock", "/sys/class/kgsl/kgsl-3d0/clock_mhz",
"/sys/class/kgsl/kgsl-3d0/gpu_clock", "/sys/class/kgsl/kgsl-3d0/gpuclk",
"/sys/class/kgsl/kgsl-3d0/devfreq/cur_freq", "/sys/kernel/gpu/gpu_clock",
"/sys/devices/platform/soc@0/3d00000.gpu/devfreq/3d00000.gpu/cur_freq",
)
listOf("kgsl-3d0", "3d00000.qcom,kgsl-3d0", "2c00000.qcom,kgsl-3d0", "5000000.qcom,kgsl-3d0", "5900000.qcom,kgsl-3d0")
.forEach { list.add("/sys/class/devfreq/$it/cur_freq") }
File("/sys/class/devfreq").list()?.sorted()?.forEach { node ->
if (node.contains("mali", true) || node.contains("gpu", true)) list.add("/sys/class/devfreq/$node/cur_freq")
}
@@ -27,7 +27,17 @@ class ClockLogComponentTest {
clocks = ClockLogComponent(log).also { it.attach(context); it.start() }
val deadline = System.currentTimeMillis() + 5_000
while (!log.readText().contains("| battery") && System.currentTimeMillis() < deadline) Thread.sleep(20)
val sample = log.readLines().last()
assertTrue(sample, sample.endsWith("| battery 41.2 C"))
assertTrue(log.readText(), log.readText().contains("| battery 41.2 C"))
context.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).putExtra(BatteryManager.EXTRA_TEMPERATURE, 423))
val updatedDeadline = System.currentTimeMillis() + 5_000
while (!log.readText().contains("| battery 42.3 C") && System.currentTimeMillis() < updatedDeadline) Thread.sleep(20)
assertTrue(log.readText(), log.readText().contains("| battery 42.3 C"))
}
@Test fun stoppedComponentCannotStartFromAnEarlierSnapshot() {
val context = RuntimeEnvironment.getApplication()
val log = tmp.newFile("stopped-clocks.log")
clocks = ClockLogComponent(log).also { it.attach(context); it.stop(); it.start() }
assertTrue(log.readText(), log.length() == 0L)
}
}