Skip to content

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

perf(data,x11): distinctUntilChanged, monotonic clock, smaller audio buf, no per-row alloc, fb race fix

ExTvaf4c8515b93c
diff --git a/app/src/main/java/com/excp/podroid/data/repository/PortForwardRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/PortForwardRepository.kt
index 522803c..b81c78e 100644
--- a/app/src/main/java/com/excp/podroid/data/repository/PortForwardRepository.kt
+++ b/app/src/main/java/com/excp/podroid/data/repository/PortForwardRepository.kt
@@ -11,6 +11,7 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringSetPreferencesKey
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import javax.inject.Inject
@@ -55,6 +56,7 @@ class PortForwardRepository @Inject constructor(
?.mapNotNull { PortForwardRule.deserialize(it) }
?: emptyList()
}
+ .distinctUntilChanged()
suspend fun addRule(rule: PortForwardRule) {
context.dataStore.edit { prefs ->
diff --git a/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt
index 5a55a52..6761454 100644
--- a/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt
+++ b/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt
@@ -1,6 +1,7 @@
package com.excp.podroid.data.repository
import android.content.Context
+import android.os.SystemClock
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.longPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
@@ -28,7 +29,9 @@ class UpdateRepository @Inject constructor(
suspend fun checkForUpdate(currentVersion: String): UpdateInfo? = withContext(Dispatchers.IO) {
try {
- val now = System.currentTimeMillis()
+ // Monotonic clock — immune to NTP jumps and manual user clock changes,
+ // both of which can leave the cache effectively pinned or instantly stale.
+ val now = SystemClock.uptimeMillis()
val lastCheck = context.dataStore.data.first()[lastCheckKey] ?: 0L
if (now - lastCheck < cacheValidityMs) {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
index 3bf82fb..a79dbb8 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
@@ -278,12 +278,18 @@ fun X11Screen(
update = { sv ->
@Suppress("UNUSED_EXPRESSION")
frameCount
- bitmap.setPixels(
- viewModel.framebuffer, 0,
- X11Constants.FB_WIDTH,
- 0, 0,
- X11Constants.FB_WIDTH, X11Constants.FB_HEIGHT,
- )
+ // Lock the IntArray for the copy into Bitmap pixels so
+ // we never observe a half-written frame from the RFB
+ // decoder thread (paired with synchronized(framebuffer)
+ // in X11ViewModel.connect).
+ synchronized(viewModel.framebuffer) {
+ bitmap.setPixels(
+ viewModel.framebuffer, 0,
+ X11Constants.FB_WIDTH,
+ 0, 0,
+ X11Constants.FB_WIDTH, X11Constants.FB_HEIGHT,
+ )
+ }
val holder = sv.holder
val canvas = holder.lockCanvas() ?: return@AndroidView
try {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11ViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11ViewModel.kt
index e6c0f6b..0de1035 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11ViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11ViewModel.kt
@@ -41,7 +41,14 @@ class X11ViewModel @Inject constructor(
private val _connection = MutableStateFlow<X11ConnectionState>(X11ConnectionState.Disconnected)
val connection: StateFlow<X11ConnectionState> = _connection.asStateFlow()
- /** Backing pixel buffer the SurfaceView blits to a Bitmap. */
+ /**
+ * Backing pixel buffer the SurfaceView blits to a Bitmap.
+ *
+ * Threading: written by the RFB I/O coroutine in [connect] and read by the
+ * UI thread in `X11Screen.update`. Both sides MUST `synchronized(framebuffer)`
+ * around the read/write to avoid torn pixels (one frame mid-write being
+ * blitted, producing transient horizontal tearing visible as banding).
+ */
val framebuffer: IntArray = IntArray(X11Constants.FB_WIDTH * X11Constants.FB_HEIGHT)
private val _frameCounter = MutableStateFlow(0)
@@ -70,11 +77,17 @@ class X11ViewModel @Inject constructor(
audio.start(viewModelScope)
while (isActive) {
- VncClient.readFramebufferUpdate(
- inp = inp,
- targetArgb = framebuffer,
- stride = X11Constants.FB_WIDTH,
- )
+ // Lock the framebuffer for the full RFB rect decode so the
+ // UI thread can't observe a half-written frame. The lock
+ // is uncontended ~99% of the time (UI grabs it only during
+ // setPixels, which is fast).
+ synchronized(framebuffer) {
+ VncClient.readFramebufferUpdate(
+ inp = inp,
+ targetArgb = framebuffer,
+ stride = X11Constants.FB_WIDTH,
+ )
+ }
_frameCounter.value = _frameCounter.value + 1
VncClient.requestFramebufferUpdate(out, incremental = true)
}
diff --git a/app/src/main/java/com/excp/podroid/x11/AudioStreamer.kt b/app/src/main/java/com/excp/podroid/x11/AudioStreamer.kt
index 9183c9c..ebfe84a 100644
--- a/app/src/main/java/com/excp/podroid/x11/AudioStreamer.kt
+++ b/app/src/main/java/com/excp/podroid/x11/AudioStreamer.kt
@@ -73,7 +73,13 @@ class AudioStreamer(private val host: String = "127.0.0.1") {
X11Constants.AUDIO_SAMPLE_RATE,
AudioFormat.CHANNEL_OUT_STEREO,
AudioFormat.ENCODING_PCM_16BIT,
- ).coerceAtLeast(BUF_BYTES * 4)
+ )
+ // Target ~100 ms — 4410 frames @ 44.1 kHz * 2 channels * 2 bytes/sample
+ // ≈ 17.6 KB. Floor at minBuf so AudioTrack never refuses to build.
+ // Previously we used minBuf * 4 which gave ~170 ms one-way latency —
+ // audible lag on click feedback in X11.
+ val targetBuf = (X11Constants.AUDIO_SAMPLE_RATE / 10 *
+ X11Constants.AUDIO_CHANNELS * 2).coerceAtLeast(minBuf)
return AudioTrack.Builder()
.setAudioAttributes(
@@ -89,7 +95,7 @@ class AudioStreamer(private val host: String = "127.0.0.1") {
.setChannelMask(AudioFormat.CHANNEL_OUT_STEREO)
.build()
)
- .setBufferSizeInBytes(minBuf)
+ .setBufferSizeInBytes(targetBuf)
.setTransferMode(AudioTrack.MODE_STREAM)
.build()
.also { it.setVolume(1.0f) }
diff --git a/app/src/main/java/com/excp/podroid/x11/VncClient.kt b/app/src/main/java/com/excp/podroid/x11/VncClient.kt
index 877036e..a98d24c 100644
--- a/app/src/main/java/com/excp/podroid/x11/VncClient.kt
+++ b/app/src/main/java/com/excp/podroid/x11/VncClient.kt
@@ -129,6 +129,11 @@ object VncClient {
din.skipBytes(1)
val numRects = din.readUnsignedShort()
+ // Reused row scratch — only reallocated when a wider rect arrives.
+ // Without this, a 1280x720 frame at 60 fps allocates 720 ByteArrays
+ // per refresh (~300 KB/s GC pressure).
+ var rowBuf: ByteArray? = null
+
repeat(numRects) {
val x = din.readUnsignedShort()
val y = din.readUnsignedShort()
@@ -139,9 +144,15 @@ object VncClient {
when (enc) {
ENC_RAW -> {
// 4 bytes BGRA per pixel.
- val rowPixels = ByteArray(w * 4)
+ val needed = w * 4
+ val existing = rowBuf
+ val rowPixels = if (existing == null || existing.size < needed) {
+ ByteArray(needed).also { rowBuf = it }
+ } else {
+ existing
+ }
for (row in 0 until h) {
- din.readFully(rowPixels)
+ din.readFully(rowPixels, 0, needed)
var off = 0
val baseIdx = (y + row) * stride + x
for (col in 0 until w) {