A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(qemu): spawn QEMU on a dedicated thread to avoid spurious SIGKILL
ExTvefab388c3528
diff --git a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt b/app/src/main/java/com/excp/podroid/engine/QemuEngine.ktindex 249a73f..c2338ac 100644--- a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt+++ b/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt@@ -43,6 +43,7 @@ import java.io.FileOutputStreamimport java.nio.ByteBufferimport java.nio.CharBufferimport java.nio.charset.CodingErrorAction+import java.util.concurrent.Executorsimport java.util.concurrent.TimeUnitimport java.util.concurrent.atomic.AtomicBooleanimport javax.inject.Inject@@ -88,6 +89,19 @@ class QemuEngine @Inject constructor(private var ioScope: CoroutineScope? = null+ /**+ * Single dedicated thread that BOTH fork/exec's QEMU and blocks in+ * waitFor(). libpodroid-launcher sets PR_SET_PDEATHSIG(SIGKILL), which is+ * THREAD-scoped: the kernel SIGKILLs QEMU when the thread that spawned it+ * dies — not when the app process dies. Forking from a Dispatchers.IO pool+ * thread let that thread be recycled (~60s idle keep-alive) once the start()+ * coroutine migrated off it at a delay(), which SIGKILL'd a healthy VM and+ * surfaced as "QEMU crashed (SIGKILL)". A private single-thread executor's+ * thread is never reaped on idle, so it lives exactly as long as QEMU.+ * Shut down in cleanup(), after QEMU has already exited.+ */+ private var qemuDispatcher: ExecutorCoroutineDispatcher? = null+private var bootStartTime: Long = 0Lprivate val consoleBuilder = StringBuilder()@@ -256,7 +270,16 @@ class QemuEngine @Inject constructor(val pb = ProcessBuilder(cmd).directory(context.filesDir)pb.environment()["LD_LIBRARY_PATH"] = "$nativeDir:${context.filesDir.absolutePath}"- val proc = pb.start()+ // Fork QEMU on a private, long-lived thread (see qemuDispatcher).+ // PR_SET_PDEATHSIG (set by libpodroid-launcher) is thread-scoped, so+ // the spawning thread must outlive QEMU — a Dispatchers.IO pool+ // thread does not. waitFor() below runs on this same thread.+ val dispatcher = Executors.newSingleThreadExecutor { r ->+ Thread(r, "podroid-qemu").apply { isDaemon = true }+ }.asCoroutineDispatcher()+ qemuDispatcher = dispatcher++ val proc = withContext(dispatcher) { pb.start() }process = proc_bootStage.value = "Booting kernel..."@@ -315,8 +338,9 @@ class QemuEngine @Inject constructor(}}- // Block until QEMU exits (keeps the calling service coroutine alive)- val exitCode = proc.waitFor()+ // Block until QEMU exits, ON THE SAME dedicated thread that fork'd+ // it, so PR_SET_PDEATHSIG never fires while QEMU is healthy.+ val exitCode = withContext(dispatcher) { proc.waitFor() }Log.d(TAG, "QEMU exited: $exitCode")cleanup()_state.value = if (exitCode == 0) VmState.Stopped@@ -461,6 +485,10 @@ class QemuEngine @Inject constructor(releaseSerial()ioScope?.cancel()ioScope = null+ // QEMU has already exited by the time cleanup() runs, so retiring its+ // spawning thread here cannot trip PR_SET_PDEATHSIG against a live VM.+ qemuDispatcher?.close()+ qemuDispatcher = nullprocess = null_terminalSession?.finishIfRunning()_terminalSession = null