From adf13d0bdd0149f7b369d2df6ce99c5ea92e58e8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 21:58:57 -0500 Subject: [PATCH] feat(session): manage memory automatically and remove the manual memory controls (#2853) Memory in the Steam session is kept above a floor by a monitor instead of the zRAM, RAM cap and VRAM cap settings, which are removed. --- .../droiddeck/launcher/FrontEndActivity.kt | 16 - .../droiddeck/launcher/core/DeviceReport.kt | 3 - .../launcher/session/SessionFiles.kt | 4 +- .../launcher/session/SessionPrefs.kt | 23 - .../launcher/session/SessionService.kt | 7 +- .../session/SessionSuspendController.kt | 37 +- .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 38 - .../droiddeck/launcher/ui/SettingsIndex.kt | 4 - app/src/main/res/values-ar/strings.xml | 12 - app/src/main/res/values-b+es+419/strings.xml | 12 - app/src/main/res/values-bg/strings.xml | 12 - app/src/main/res/values-cs/strings.xml | 12 - app/src/main/res/values-da/strings.xml | 12 - app/src/main/res/values-de/strings.xml | 12 - app/src/main/res/values-el/strings.xml | 12 - app/src/main/res/values-es/strings.xml | 12 - app/src/main/res/values-fi/strings.xml | 12 - app/src/main/res/values-fr/strings.xml | 12 - app/src/main/res/values-hi/strings.xml | 12 - app/src/main/res/values-hu/strings.xml | 12 - app/src/main/res/values-in/strings.xml | 12 - app/src/main/res/values-it/strings.xml | 12 - app/src/main/res/values-ja/strings.xml | 12 - app/src/main/res/values-ko/strings.xml | 12 - app/src/main/res/values-ms/strings.xml | 12 - app/src/main/res/values-nb/strings.xml | 12 - app/src/main/res/values-nl/strings.xml | 12 - app/src/main/res/values-pl/strings.xml | 12 - app/src/main/res/values-pt-rPT/strings.xml | 12 - app/src/main/res/values-pt/strings.xml | 12 - app/src/main/res/values-ro/strings.xml | 12 - app/src/main/res/values-ru/strings.xml | 12 - app/src/main/res/values-sv/strings.xml | 12 - app/src/main/res/values-th/strings.xml | 12 - app/src/main/res/values-tr/strings.xml | 12 - app/src/main/res/values-uk/strings.xml | 12 - app/src/main/res/values-vi/strings.xml | 12 - app/src/main/res/values-zh-rCN/strings.xml | 12 - app/src/main/res/values-zh-rHK/strings.xml | 12 - app/src/main/res/values-zh-rTW/strings.xml | 12 - app/src/main/res/values/strings.xml | 12 - .../session/SessionSuspendControllerTest.kt | 67 +- docs/development/low-memory.md | 196 ++-- docs/development/vram-budget.md | 28 - docs/settings-map.md | 4 - tools/components/recipes.json | 3 +- tools/gpuload/build.sh | 13 +- .../layer/VK_LAYER_DROIDDECK_vram_cap.json | 20 - .../gpuload/src/vk_layer_droiddeck_vramcap.c | 206 ---- tools/gpuload/src/vramcap_budget.h | 32 - tools/gpuload/tests/test_vramcap_budget.c | 154 --- .../overlay/usr/local/bin/droiddeck-game-env | 17 - .../overlay/usr/local/bin/droiddeck-session | 567 +++++------ tools/linuxfs/preload/zram.c | 197 +++- tools/release/runtime_inputs.py | 3 +- tools/tests/test_client_zram_focus.py | 247 +---- tools/tests/test_game_environment.py | 17 - tools/tests/test_memory_pressure.py | 923 ++++++------------ tools/tests/test_zram_preload.py | 157 ++- 60 files changed, 1117 insertions(+), 2264 deletions(-) delete mode 100644 docs/development/vram-budget.md delete mode 100644 tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json delete mode 100644 tools/gpuload/src/vk_layer_droiddeck_vramcap.c delete mode 100644 tools/gpuload/src/vramcap_budget.h delete mode 100644 tools/gpuload/tests/test_vramcap_budget.c diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8f165bc42..56787a7146 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -180,10 +180,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) private var paceCores by mutableStateOf(true) - private var ramCapMb by mutableStateOf(0) - private var zramClient by mutableStateOf(true) - private var zramIdle by mutableStateOf(true) - private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) @@ -2745,10 +2741,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient, zramIdle = zramIdle, - deviceRamMb = (android.app.ActivityManager.MemoryInfo() - .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), - ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, nativeUserland = nativeUserland, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, @@ -2763,10 +2755,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on }, onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, - onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, - onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on }, - onZramIdle = { on -> SessionPrefs.setZramIdle(this, on); zramIdle = on }, - onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, onNativeUserland = { on -> SessionPrefs.setNativeUserland(this, on); nativeUserland = on }, @@ -3065,10 +3053,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) paceCores = SessionPrefs.paceCores(this) - ramCapMb = SessionPrefs.ramCapMb(this) - zramClient = SessionPrefs.zramClient(this) - zramIdle = SessionPrefs.zramIdle(this) - vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 3c047d2e13..fe835b10c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -281,9 +281,6 @@ object DeviceReport { k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) k("pace cores", SessionPrefs.paceCores(context)) - k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) - k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) - k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("native userland (no proot)", SessionPrefs.nativeUserland(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 9501915fe5..53b54e9ca2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -234,8 +234,6 @@ object SessionFiles { val gpuLoad = listOf( "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_gpu_load.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_gpu_load.json", - "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_vram_cap.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json", ) val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libddsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } @@ -282,6 +280,8 @@ object SessionFiles { if (installed) ledger.staged(relative, target) else Log.e(TAG, "$relative NOT staged") } File(root, "usr/local/bin/bannerlator-steam-compat").delete() + File(root, "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so").delete() + File(root, "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json").delete() LegacyNames.migrateRootfs(root) ComponentsManager.migrateLaunchDir(context) EsyncPacks.stageBundled(context, root) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index ed23e31bc3..39d92312b5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -932,29 +932,6 @@ object SessionPrefs { prefs(context).edit().putBoolean("gamescopeRealtime", on).apply() } - fun ramCapMb(context: Context): Int = prefs(context).getInt("ramCapMb", 0).coerceAtLeast(0) - - fun setRamCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() - } - - fun zramClient(context: Context): Boolean = prefs(context).getBoolean("zramClient", true) - - fun setZramClient(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramClient", on).apply() - } - - fun zramIdle(context: Context): Boolean = prefs(context).getBoolean("zramIdle", true) - - fun setZramIdle(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramIdle", on).apply() - } - - fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) - - fun setVramCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("vramCapMb", mb.coerceAtLeast(0)).apply() - } fun gpuClockPin(context: Context): Boolean = prefs(context).getBoolean("gpuClockPin", 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 9c8e6fe2c4..aaf77c3f5f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -911,10 +911,9 @@ class SessionService : Service() { )) } }, - readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> if (processes == 0) { - Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (${availableKb / 1024} MB available is too little)") } else { Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") } @@ -1085,11 +1084,7 @@ class SessionService : Service() { relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("DD_ZRAM=1") - if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_RAM_CAP_MB=$it") } - if (!SessionPrefs.zramClient(this)) guest.add("DD_ZRAM_CLIENT=0") - if (!SessionPrefs.zramIdle(this)) guest.add("DD_ZRAM_IDLE=0") } - SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_VRAM_MB=$it") } guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment guest.addAll(TurnipEnvironment.gameEnvironment(tuOverride, tuDriver, SessionPrefs.tuSysmem(this), extra)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index 221a1e78c5..74f7d5ace9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -27,7 +27,6 @@ internal class SessionSuspendController( private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, - private val readBackAllowed: () -> Boolean = { true }, private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = { _, _, _, _, _ -> }, ) { @@ -278,12 +277,21 @@ internal class SessionSuspendController( private fun pageOut(records: MutableMap, ProcessRecord>, root: Int, helpers: List) { val control = zramControl?.takeIf { it.isFile } ?: return + val hold = holdFile(control) try { - addSnapshot(records, root, helpers) - control.writeText("1") + hold.writeText(PAGE_OUT_REQUEST) + sleep(PAGE_OUT_POLL_MS) + pageOut(control, records, root, helpers) } catch (_: IOException) { - return + } finally { + hold.delete() } + } + + private fun holdFile(control: File) = File(control.parentFile, "${control.name}.hold") + + private fun pageOut(control: File, records: MutableMap, ProcessRecord>, root: Int, helpers: List) { + addSnapshot(records, root, helpers) val targets = records.values.filter { record -> try { File(procRoot, "${record.pid}/maps").useLines { lines -> lines.any { it.endsWith("/libddsession.so") } } @@ -301,16 +309,22 @@ internal class SessionSuspendController( val waiting = targets.toMutableList() while (!closing && !cancelled && nowMillis() - start < PAGE_OUT_TIMEOUT_MS) { val started = nowMillis() - start >= PAGE_OUT_START_MS - waiting.removeAll { val ack = acks.getValue(it); ack.length() > 0 || (started && !ack.exists()) || isGone(it) } + waiting.removeAll { val ack = acks.getValue(it); pagedOut(ack) || (started && !ack.exists()) || isGone(it) } if (waiting.isEmpty()) break sleep(PAGE_OUT_POLL_MS) } - val unacknowledged = targets.count { acks.getValue(it).length() == 0L && !isGone(it) } + val unacknowledged = targets.count { !pagedOut(acks.getValue(it)) && !isGone(it) } acks.values.forEach { it.delete() } val after = memoryKb(targets) pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + private fun pagedOut(ack: File): Boolean = try { + ack.readText().trim() == PAGE_OUT_ACK + } catch (_: IOException) { + false + } + private fun readBack() { val targets = pagedOutTargets.filterNot { isGone(it) } pagedOutTargets = emptyList() @@ -318,13 +332,15 @@ internal class SessionSuspendController( if (targets.isEmpty() || closing) return val before = memoryKb(targets).second val (total, available) = meminfoKb() - if (!readBackAllowed() || !canTake(before, total, available)) { + if (!canTake(before, total, available)) { pagedIn(0, before, before, available, 0) return } + val hold = holdFile(control) try { - control.writeText("0") + hold.writeText(READ_BACK_REQUEST) } catch (_: IOException) { + hold.delete() return } val start = nowMillis() @@ -341,6 +357,8 @@ internal class SessionSuspendController( } } catch (_: InterruptedException) { Thread.currentThread().interrupt() + } finally { + hold.delete() } pagedIn(targets.size, swap, before, available, nowMillis() - start) } @@ -456,6 +474,9 @@ internal class SessionSuspendController( const val SIGSTOP = 19 const val SIGCONT = 18 const val SIGURG = 23 + const val PAGE_OUT_ACK = "1" + const val PAGE_OUT_REQUEST = "1" + const val READ_BACK_REQUEST = "0" const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 0a08067990..f85318b595 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -20,7 +20,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index df22a743f1..3c4db68c32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -28,8 +28,6 @@ import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) -private const val MEMORY_CAP_STEP_MB = 256 - @Composable fun PerformancePage( cores: List, @@ -47,12 +45,6 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, - ramCapMb: Int, - zramClient: Boolean, - zramIdle: Boolean, - vramCapMb: Int, - deviceRamMb: Int, - ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, nativeUserland: Boolean, @@ -71,10 +63,6 @@ fun PerformancePage( onFsyncFirst: (Boolean) -> Unit, onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, - onRamCapMb: (Int) -> Unit, - onZramClient: (Boolean) -> Unit, - onZramIdle: (Boolean) -> Unit, - onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, onNativeUserland: (Boolean) -> Unit, @@ -141,32 +129,6 @@ fun PerformancePage( gpuClockPin, onChange = onGpuClockPin, ) } - SettingsGroup(stringResource(R.string.perf_memory)) { - val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) - val off = stringResource(R.string.perf_cap_off) - val auto = stringResource(R.string.perf_cap_auto) - ToggleRow( - host, "zramidle", stringResource(R.string.perf_zram_idle), - if (ramCapAvailable) stringResource(R.string.perf_zram_idle_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramIdle && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramIdle, - ) - ToggleRow( - host, "zramclient", stringResource(R.string.perf_zram_client), - if (ramCapAvailable) stringResource(R.string.perf_zram_client_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramClient && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramClient, - ) - SliderRow( - stringResource(R.string.perf_ram_cap), - if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), - ramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, enabled = ramCapAvailable, - format = { if (it == 0) off else "$it MB" }, onChange = onRamCapMb, - ) - SliderRow( - stringResource(R.string.perf_vram_cap), stringResource(R.string.perf_vram_cap_hint), - vramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, - format = { if (it == 0) auto else "$it MB" }, onChange = onVramCapMb, - ) - } SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt index 37de5eba31..8e3912e433 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -76,10 +76,6 @@ internal object SettingsIndex { s(SettingsSection.PERFORMANCE, R.string.perf_noglerror), s(SettingsSection.PERFORMANCE, R.string.perf_gsrealtime, "gamescope"), s(SettingsSection.PERFORMANCE, R.string.perf_gpuclock, "gpu", "clock", "max"), - s(SettingsSection.PERFORMANCE, R.string.perf_ram_cap, "ram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_vram_cap, "vram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_idle, "zram", "swap", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_client, "zram", "swap", "memory"), s(SettingsSection.PERFORMANCE, R.string.setup_clear_cached, "memory", "ram", "crash", "sleep", "killed"), s(SettingsSection.PERFORMANCE, R.string.setup_bg_limit, "memory", "ram", "background apps"), s(SettingsSection.PERFORMANCE, R.string.setup_memory_hud, "memory", "ram", "overlay"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e92f6f47e2..943fa41584 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -22,7 +22,6 @@ أضف مكتبات Steam من بطاقة SD أو محرك USB أو SSD، وسيجمع DroidDeck الألعاب معًا في «المكتبة». تتيح لك «المتاجر» تسجيل الدخول إلى Epic Games وGOG وXbox وEA وBattle.net وUbisoft Connect وAmazon Games وitch.io وGame Jolt، ثم تثبيت ألعابها وتحديثها من DroidDeck. تحدّث المكوّنات مثل FEX وDXVK وVKD3D-Proton نفسها تلقائيًا، ويكون Proton Experimental ARM64 هو الافتراضي، أو Proton 11.0 ARM64 بعد تثبيت هذا الإصدار. - يحرر «ضغط Steam أثناء تشغيل لعبة» مساحة من الذاكرة في الأجهزة قليلة الذاكرة. اسحب من الحافة اليمنى للداخل لفتح قائمة الجلسة: وضع «لوحة اللمس» و«لوحة مفاتيح الكمبيوتر» و«وضع زمن الاستجابة المنخفض» وملف اللعبة والمزيد. اللعبة بطيئة؟ حدّد معدل الإطارات في الوصول السريع، ثم جرّب إصدار Proton آخر أو إعدادًا مسبقًا آخر لـ FEX في مكوّنات اللعبة. هل الصوت متقطع أو مفقود في اللعبة؟ جرّب مفتاح «DirectAudio للألعاب» في إعدادات Steam ضمن «الصوت». @@ -634,18 +633,7 @@ gamescope: طابور GPU بأولوية الوقت الفعلي يعطي الأولوية لعمل GPU الخاص بالمُركِّب. قد يحسّن انتظام الإطارات على حساب أداء الألعاب قليلًا. GPU - الذاكرة إيقاف - افتراضي برنامج التشغيل - ضغط Steam أثناء تشغيل لعبة - ضغط ذاكرة اللعبة الخاملة - يرحّل ذاكرة اللعبة الخاملة عند انخفاض RAM. أوقفه إذا كانت الألعاب تتجمد لبضع ثوانٍ كل نصف دقيقة تقريبًا. يُطبَّق عند بدء الجلسة التالية. - بعد 20 ثانية من بدء اللعبة، يُضغط عميل Steam في zRAM لترك ذاكرة أكبر للعبة، ثم يُقرأ مجددًا عند إغلاقها. أوقف هذا الخيار إذا كانت الجلسة تُغلَق بعد بدء الألعاب بقليل. يظل حد RAM أعلاه يضغط Steam عندما تتجاوزه الجلسة. - حد RAM - يُطبَّق أثناء تشغيل عميل Steam، في جلسة Steam أو من سطح المكتب. عندما تستخدم الجلسة أكثر من هذا الحد، يُضغط Steam ثم عمليات الجلسة المدعومة الأخرى في zRAM. حد مرن: لا يُغلَق شيء، لكن قد تتقطّع الألعاب أثناء استعادة الصفحات. - يتطلب مساحة تبديل zRAM، وهي غير متوفرة على هذا الجهاز. - حد VRAM - يُبلّغ ألعاب Direct3D من 9 إلى 12 بميزانية ذاكرة الفيديو هذه لتشجيع تقليل استخدامها. قد تتجاوزها الألعاب؛ لا يضيف هذا ترحيل ذاكرة GPU ولا يضمن منع الانهيار بسبب نفاد الذاكرة. يسري في الجلسة التالية. تثبيت GPU على أعلى تردد له لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة. إصلاحات الجلسة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index c754689975..1351982627 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener microcortes mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de video para reducir su uso. Los juegos pueden superarlo; no agrega paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos microcortes, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e5c8de89cb..f44b98d75d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -22,7 +22,6 @@ Добавяйте библиотеки на Steam от SD карта, USB устройство или SSD, а DroidDeck държи игрите заедно в Библиотека. Магазини ви позволява да влезете в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а после да инсталирате и обновявате техните игри от DroidDeck. Компоненти като FEX, DXVK и VKD3D-Proton се обновяват сами, а Proton Experimental ARM64 е по подразбиране, или Proton 11.0 ARM64, щом тази версия е инсталирана. - Компресиране на Steam, докато върви игра освобождава RAM на устройства с малко памет. Плъзнете навътре от десния ръб, за да отворите менюто на сесията: режим на тъчпад, Клавиатура за компютър, Режим на ниска латентност, профил на играта и други. Играта е бавна? Ограничете кадрите в Quick Access, после опитайте друга версия на Proton или друга предварителна настройка на FEX в компонентите на играта. Пращене или липсващ звук в играта? Опитайте превключвателя DirectAudio за игри в настройките на Steam, под Звук. @@ -626,18 +625,7 @@ gamescope: GPU опашка в реално време Дава приоритет на GPU работата на компоситора. Може да изглади темпото на кадрите с известна цена за игрите. GPU - Памет Изкл. - По подразбиране за драйвера - Компресиране на Steam, докато върви игра - Компресиране на неактивната памет на играта - Компресира неактивната памет на играта при малко RAM. Изключете го, ако игрите замръзват за няколко секунди приблизително на всеки половин минута. Прилага се при следващото стартиране на сесията. - 20 s след стартиране на игра клиентът на Steam се компресира в zRAM, за да остави повече памет на играта, и се прочита обратно, когато играта се затвори. Изключете, ако сесията се затваря малко след стартиране на игри. Ограничение на RAM по-горе пак компресира Steam, когато сесията го надхвърли. - Ограничение на RAM - Прилага се, докато клиентът на Steam работи, в режим Steam или от работния плот. Когато сесията използва повече от това, Steam и след това другите поддържани процеси на сесията се компресират в zRAM. Меко ограничение: нищо не се затваря, но игрите може да засичат, докато страниците се връщат. - Изисква zRAM swap, който това устройство няма. - Ограничение на VRAM - Съобщава този бюджет за видео памет на игри с Direct3D 9 до 12, за да намали използването на памет. Игрите може да го надвишат; това не добавя странициране на GPU и не гарантира защита от сривове при недостиг на памет. Прилага се от следващата сесия. Задръжте GPU на максималната му честота Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина. Корекции на сесията diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 370a0eea68..c27da890b3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -22,7 +22,6 @@ Přidejte knihovny Steamu z SD karty, USB disku nebo SSD a DroidDeck udrží hry pohromadě v Knihovně. Obchody vám umožní přihlásit se do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io a Game Jolt a pak instalovat a aktualizovat jejich hry přímo z DroidDeck. Komponenty jako FEX, DXVK a VKD3D-Proton se aktualizují samy a výchozí je Proton Experimental ARM64, případně Proton 11.0 ARM64, jakmile je tato verze nainstalovaná. - Komprimovat Steam během hry uvolní RAM na zařízeních s nedostatkem paměti. Přejetím od pravého okraje otevřete nabídku relace: režim touchpadu, Klávesnice PC, Režim nízkého zpoždění, profil hry a další. Hra běží pomalu? Omezte snímkovou frekvenci v Quick Access a zkuste jinou verzi Proton nebo jinou předvolbu FEX v komponentách hry. Praskání nebo chybějící zvuk ve hře? Zkuste přepínač DirectAudio pro hry v nastavení Steamu v části Zvuk. @@ -630,18 +629,7 @@ gamescope: fronta GPU v reálném čase Dává prioritu práci GPU kompozitoru. Může vyhladit tempo snímků na úkor her. GPU - Paměť Vypnuto - Výchozí ovladače - Komprimovat Steam během hry - Komprimovat neaktivní paměť hry - Při nedostatku RAM stránkuje neaktivní paměť hry. Vypněte to, pokud hry zhruba každou půlminutu na několik sekund zamrznou. Projeví se při příštím spuštění relace. - 20 s po spuštění hry se klient Steam zkomprimuje do zRAM, aby hře zbylo více paměti, a po zavření hry se načte zpět. Vypněte, pokud se relace krátce po spuštění her zavírá. Limit RAM výše stále komprimuje Steam, když ho relace překročí. - Limit RAM - Platí, když běží klient Steam, v režimu Steam nebo z Plochy. Když relace použije víc, zkomprimuje se do zRAM Steam a poté další podporované procesy relace. Měkký limit: nic se nezavře, ale hry mohou trhat, než se stránky načtou zpět. - Vyžaduje swap zRAM, který toto zařízení nemá. - Limit VRAM - Hlásí hrám s Direct3D 9 až 12 tento rozpočet videopaměti, aby snížily její využití. Hry jej mohou překročit; nepřidává stránkování GPU ani nezaručuje ochranu před pády kvůli nedostatku paměti. Platí od příští relace. Udržet GPU na nejvyšších taktech Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla. Opravy relace diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ea39e14dea..4eb0484c1f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -22,7 +22,6 @@ Tilføj Steam-biblioteker fra et SD-kort, et USB-drev eller en SSD, så samler DroidDeck spillene i dit Bibliotek. Butikker lader dig logge ind på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt og derefter installere og opdatere deres spil fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton opdaterer sig selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64, når den version er installeret. - Komprimer Steam, mens et spil kører frigør RAM på enheder med lidt hukommelse. Stryg ind fra højre kant for at åbne sessionsmenuen: touchpad-tilstand, PC-tastatur, Lav forsinkelse, spilprofil og mere. Kører spillet langsomt? Begræns billedfrekvensen i Hurtig adgang, og prøv så en anden Proton-version eller FEX-forudindstilling i spillets komponenter. Knitrende eller manglende lyd i spillet? Prøv kontakten DirectAudio til spil i Steam-indstillingerne under Lyd. @@ -626,18 +625,7 @@ gamescope: realtids-GPU-kø Prioriterer compositorens GPU-arbejde. Kan give jævnere billedtiming på bekostning af spillene. GPU - Hukommelse Fra - Driverstandard - Komprimer Steam, mens et spil kører - Komprimer spillets inaktive hukommelse - Pager spillets inaktive hukommelse ud, når RAM er lav. Slå det fra, hvis spil fryser i et par sekunder cirka hvert halve minut. Træder i kraft, næste gang sessionen starter. - 20 s efter et spil starter, komprimeres Steam-klienten i zRAM for at give spillet mere hukommelse, og læses tilbage, når spillet lukkes. Slå fra, hvis sessionen lukker kort efter, at spil starter. En RAM-grænse ovenfor komprimerer stadig Steam, når sessionen overskrider den. - RAM-grænse - Gælder, mens Steam-klienten kører, i Steam-tilstand eller fra skrivebordet. Når sessionen bruger mere end dette, komprimeres Steam og derefter sessionens andre understøttede processer i zRAM. En blød grænse: intet lukkes, men spil kan hakke, mens sider hentes tilbage. - Kræver zRAM-swap, som denne enhed ikke har. - VRAM-grænse - Rapporterer dette videohukommelsesbudget til Direct3D 9 til 12-spil for at mindske hukommelsesforbruget. Spil kan overskride det; dette tilføjer ikke GPU-paging og garanterer ikke beskyttelse mod nedbrud ved hukommelsesmangel. Gælder fra næste session. Hold GPU’en på dens højeste clock Kun Adreno. Færre hak, mere batteribrug og varme. Sessionsrettelser diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8b4ccd022..b60fceb58d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,7 +22,6 @@ Füge Steam-Bibliotheken von einer SD-Karte, einem USB-Laufwerk oder einer SSD hinzu, und DroidDeck hält die Spiele in deiner Bibliothek zusammen. Mit Stores meldest du dich bei Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io und Game Jolt an und installierst und aktualisierst deren Spiele direkt in DroidDeck. Komponenten wie FEX, DXVK und VKD3D-Proton aktualisieren sich selbst, und Proton Experimental ARM64 ist der Standard, oder Proton 11.0 ARM64, sobald diese Version installiert ist. - Steam komprimieren, während ein Spiel läuft gibt auf Geräten mit knappem Arbeitsspeicher RAM frei. Wische vom rechten Rand nach innen, um das Sitzungsmenü zu öffnen: Touchpad-Modus, PC-Tastatur, Modus mit geringer Latenz, Spielprofil und mehr. Das Spiel läuft langsam? Begrenze die Bildrate im Schnellzugriff und probiere dann eine andere Proton-Version oder ein anderes FEX-Preset in den Komponenten des Spiels. Knacken oder fehlender Spielton? Probiere den Schalter DirectAudio für Spiele in den Steam-Einstellungen unter Audio. @@ -626,18 +625,7 @@ gamescope: Echtzeit-GPU-Warteschlange Priorisiert die GPU-Arbeit des Compositors. Kann das Frame-Pacing glätten, kostet Spiele aber etwas Leistung. GPU - Arbeitsspeicher Aus - Treiberstandard - Steam komprimieren, während ein Spiel läuft - Inaktiven Spielspeicher komprimieren - Lagert inaktiven Spielspeicher bei knappem RAM aus. Schalte dies aus, wenn Spiele etwa jede halbe Minute für einige Sekunden einfrieren. Gilt ab dem nächsten Start der Sitzung. - 20 s nach dem Spielstart wird der Steam-Client in zRAM komprimiert, um dem Spiel mehr Speicher zu lassen, und beim Beenden des Spiels zurückgelesen. Schalte dies aus, wenn sich die Sitzung kurz nach dem Spielstart schließt. Ein RAM-Limit oben komprimiert Steam weiterhin, wenn die Sitzung es überschreitet. - RAM-Limit - Gilt, solange der Steam-Client läuft, im Steam-Modus oder vom Desktop aus. Verbraucht die Sitzung mehr als diesen Wert, werden Steam und danach die übrigen unterstützten Prozesse der Sitzung in zRAM komprimiert. Ein weiches Limit: Nichts wird geschlossen, aber Spiele können ruckeln, während Seiten zurückgeladen werden. - Benötigt zRAM-Swap, den dieses Gerät nicht hat. - VRAM-Limit - Meldet Direct3D-9-bis-12-Spielen dieses Videospeicherbudget, um den Speicherverbrauch zu senken. Spiele können es überschreiten; dies fügt kein GPU-Paging hinzu und garantiert keinen Schutz vor Abstürzen durch Speichermangel. Gilt ab der nächsten Sitzung. GPU auf höchstem Takt halten Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme. Sitzungskorrekturen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 42baf8965a..faa6c9727f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -22,7 +22,6 @@ Προσθέστε βιβλιοθήκες Steam από κάρτα SD, μονάδα USB ή SSD, και το DroidDeck κρατά τα παιχνίδια μαζί στη Βιβλιοθήκη σας. Τα Καταστήματα σάς επιτρέπουν να συνδεθείτε σε Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io και Game Jolt και μετά να εγκαθιστάτε και να ενημερώνετε τα παιχνίδια τους από το DroidDeck. Στοιχεία όπως τα FEX, DXVK και VKD3D-Proton ενημερώνονται μόνα τους, και το Proton Experimental ARM64 είναι το προεπιλεγμένο, ή το Proton 11.0 ARM64 μόλις εγκατασταθεί αυτή η έκδοση. - Η επιλογή Συμπίεση του Steam όσο τρέχει παιχνίδι ελευθερώνει RAM σε συσκευές με λίγη μνήμη. Σύρετε προς τα μέσα από τη δεξιά άκρη για να ανοίξετε το μενού συνεδρίας: λειτουργία πινακίδας αφής, Πληκτρολόγιο PC, Λειτουργία χαμηλής καθυστέρησης, προφίλ παιχνιδιού και άλλα. Το παιχνίδι τρέχει αργά; Περιορίστε τον ρυθμό καρέ στο Quick Access και δοκιμάστε άλλη έκδοση Proton ή άλλη προεπιλογή FEX στα στοιχεία του παιχνιδιού. Κροταλίσματα ή απουσία ήχου στο παιχνίδι; Δοκιμάστε τον διακόπτη DirectAudio για παιχνίδια στις ρυθμίσεις του Steam, στην ενότητα Ήχος. @@ -626,18 +625,7 @@ gamescope: ουρά GPU πραγματικού χρόνου Δίνει προτεραιότητα στην εργασία GPU του compositor. Μπορεί να εξομαλύνει τον ρυθμό καρέ με κάποιο κόστος για τα παιχνίδια. GPU - Μνήμη Ανενεργό - Προεπιλογή προγράμματος οδήγησης - Συμπίεση του Steam όσο τρέχει παιχνίδι - Συμπίεση ανενεργής μνήμης παιχνιδιού - Σελιδοποιεί την ανενεργή μνήμη του παιχνιδιού όταν η RAM είναι χαμηλή. Απενεργοποιήστε το αν τα παιχνίδια παγώνουν για λίγα δευτερόλεπτα περίπου κάθε μισό λεπτό. Ισχύει από την επόμενη έναρξη της συνεδρίας. - 20 s μετά την εκκίνηση ενός παιχνιδιού, ο πελάτης Steam συμπιέζεται στη zRAM για να μείνει περισσότερη μνήμη στο παιχνίδι, και διαβάζεται πίσω όταν το παιχνίδι κλείσει. Απενεργοποιήστε το αν η συνεδρία κλείνει λίγο μετά την εκκίνηση παιχνιδιών. Ένα όριο RAM παραπάνω εξακολουθεί να συμπιέζει το Steam όταν η συνεδρία το ξεπεράσει. - Όριο RAM - Ισχύει όσο τρέχει ο πελάτης Steam, σε λειτουργία Steam ή από την επιφάνεια εργασίας. Όταν η συνεδρία χρησιμοποιεί περισσότερη, το Steam και έπειτα οι άλλες υποστηριζόμενες διεργασίες της συνεδρίας συμπιέζονται στη zRAM. Ήπιο όριο: τίποτα δεν κλείνει, αλλά τα παιχνίδια μπορεί να κολλάνε όσο επιστρέφουν οι σελίδες. - Απαιτεί zRAM swap, που δεν υπάρχει σε αυτή τη συσκευή. - Όριο VRAM - Αναφέρει αυτόν τον προϋπολογισμό μνήμης βίντεο σε παιχνίδια Direct3D 9 έως 12 για να μειωθεί η χρήση μνήμης. Τα παιχνίδια μπορεί να τον υπερβούν· δεν προσθέτει σελιδοποίηση GPU ούτε εγγυάται προστασία από σφάλματα έλλειψης μνήμης. Ισχύει από την επόμενη συνεδρία. Διατήρηση της GPU στη μέγιστη συχνότητά της Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα. Διορθώσεις συνεδρίας diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38ada10bda..15a280bac0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener tirones mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de vídeo para reducir su uso. Los juegos pueden superarlo; no añade paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos tirones, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b912a7cf0b..2abc70d958 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -22,7 +22,6 @@ Lisää Steam-kirjastoja SD-kortilta, USB-asemalta tai SSD-levyltä, ja DroidDeck pitää pelit yhdessä Kirjastossasi. Kaupat-osiossa voit kirjautua sisään palveluihin Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ja Game Jolt sekä asentaa ja päivittää niiden pelejä DroidDeckistä. Komponentit, kuten FEX, DXVK ja VKD3D-Proton, päivittyvät itsestään, ja oletuksena on Proton Experimental ARM64 tai Proton 11.0 ARM64, kun kyseinen versio on asennettu. - Pakkaa Steam pelin ollessa käynnissä vapauttaa RAM-muistia laitteilla, joilla muisti on vähissä. Pyyhkäise oikeasta reunasta sisäänpäin avataksesi istuntovalikon: kosketuslevytila, PC-näppäimistö, matalan viiveen tila, pelin profiili ja muuta. Peli pyörii hitaasti? Rajoita kuvanopeutta Pikavalikossa ja kokeile sitten toista Proton-versiota tai FEX-esiasetusta pelin komponenteissa. Rätisevä tai puuttuva pelin ääni? Kokeile Steamin asetuksissa kohdassa Ääni asetusta DirectAudio peleille. @@ -626,18 +625,7 @@ gamescope: reaaliaikainen GPU-jono Priorisoi kompositorin GPU-työtä. Voi tasoittaa kuvanopeuden tahditusta pelien kustannuksella. GPU - Muisti Pois - Ajurin oletus - Pakkaa Steam pelin ollessa käynnissä - Pakkaa pelin käyttämätöntä muistia - Siirtää pelin käyttämätöntä muistia zRAMiin, kun RAM-muisti vähenee. Poista tämä käytöstä, jos pelit jäätyvät muutamaksi sekunniksi noin puolen minuutin välein. Tulee voimaan, kun istunto käynnistyy seuraavan kerran. - 20 s pelin käynnistymisen jälkeen Steam-asiakasohjelma pakataan zRAMiin, jotta pelille jää enemmän muistia, ja luetaan takaisin, kun peli sulkeutuu. Poista tämä käytöstä, jos istunto sulkeutuu pian pelien käynnistymisen jälkeen. Yllä oleva RAM-raja pakkaa silti Steamin, kun istunto ylittää sen. - RAM-raja - Koskee aikaa, jolloin Steam-asiakasohjelma on käynnissä, Steam-tilassa tai työpöydältä. Kun istunto käyttää tätä enemmän, Steam ja sen jälkeen istunnon muut tuetut prosessit pakataan zRAMiin. Pehmeä raja: mitään ei suljeta, mutta pelit voivat nykiä, kun sivuja luetaan takaisin. - Vaatii zRAM-swapin, jota tässä laitteessa ei ole. - VRAM-raja - Ilmoittaa tämän videomuistibudjetin Direct3D 9–12 -peleille muistin käytön vähentämiseksi. Pelit voivat ylittää sen; tämä ei lisää GPU-sivutusta eikä takaa suojaa muistin loppumisesta johtuvilta kaatumisilta. Tulee voimaan seuraavassa istunnossa. Pidä GPU huippukellotaajuudessaan Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä. Istunnon korjaukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c889818314..ef705ec2eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -22,7 +22,6 @@ Ajoutez des bibliothèques Steam depuis une carte SD, une clé USB ou un SSD, et DroidDeck réunit les jeux dans votre Bibliothèque. Boutiques vous permet de vous connecter à Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io et Game Jolt, puis d\'installer et de mettre à jour leurs jeux depuis DroidDeck. Les composants comme FEX, DXVK et VKD3D-Proton se mettent à jour seuls, et Proton Experimental ARM64 est la valeur par défaut, ou Proton 11.0 ARM64 une fois cette version installée. - Compresser Steam pendant un jeu libère de la RAM sur les appareils qui en manquent. Balayez depuis le bord droit pour ouvrir le menu de session : mode pavé tactile, Clavier PC, Mode faible latence, Profil du jeu et plus encore. Jeu lent ? Limitez la fréquence d\'images dans Accès rapide, puis essayez une autre version de Proton ou un autre préréglage FEX dans les composants du jeu. Audio du jeu qui grésille ou absent ? Essayez l\'option Utiliser DirectAudio pour le jeu dans les paramètres Steam, sous Audio. @@ -628,18 +627,7 @@ gamescope : file d\'attente GPU temps réel Augmente la priorité du travail GPU du compositeur. Peut améliorer la stabilité du temps de frame, mais consomme une partie des performances du jeu. GPU - Mémoire Désactivé - Valeur par défaut du pilote - Compresser Steam pendant un jeu - Compresser la mémoire inactive du jeu - Compresse la mémoire inactive du jeu quand la RAM manque. Désactivez-le si les jeux se figent quelques secondes environ toutes les trente secondes. S\'applique au prochain démarrage de la session. - 20 s après le démarrage d\'un jeu, le client Steam est compressé dans zRAM pour laisser plus de mémoire au jeu, puis relu à la fermeture du jeu. Désactivez cette option si la session se ferme peu après le démarrage des jeux. Une limite de RAM ci-dessus compresse toujours Steam lorsque la session la dépasse. - Limite de RAM - S\'applique tant que le client Steam fonctionne, en mode Steam ou depuis le bureau. Lorsque la session dépasse cette valeur, Steam puis les autres processus pris en charge de la session sont compressés dans zRAM. Limite souple : rien n\'est fermé, mais les jeux peuvent saccader pendant le rechargement des pages. - Nécessite un swap zRAM, dont cet appareil ne dispose pas. - Limite de VRAM - Signale ce budget de mémoire vidéo aux jeux Direct3D 9 à 12 pour réduire leur consommation. Les jeux peuvent le dépasser ; cela ne fournit pas de pagination GPU et ne garantit pas une protection contre les plantages par manque de mémoire. Prend effet à la prochaine session. Maintenir le GPU à sa fréquence maximale Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur. Correctifs de session diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d26bbc324c..f758c55481 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -22,7 +22,6 @@ SD कार्ड, USB ड्राइव या SSD से Steam लाइब्रेरी जोड़ें, और DroidDeck गेम को आपकी लाइब्रेरी में एक साथ रखता है। स्टोर से आप Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io और Game Jolt में साइन इन कर सकते हैं, फिर DroidDeck से उनके गेम इंस्टॉल और अपडेट कर सकते हैं। FEX, DXVK और VKD3D-Proton जैसे कॉम्पोनेंट खुद अपडेट होते हैं, और डिफ़ॉल्ट Proton Experimental ARM64 है, या वह बिल्ड इंस्टॉल होने पर Proton 11.0 ARM64। - गेम चलते समय Steam को कंप्रेस करें कम RAM वाले डिवाइस पर RAM खाली करता है। सत्र मेनू खोलने के लिए दाएँ किनारे से अंदर की ओर स्वाइप करें: टचपैड मोड, पीसी कीबोर्ड, लो लेटेंसी मोड, गेम प्रोफ़ाइल और बहुत कुछ। गेम धीमा चल रहा है? Quick Access में फ़्रेम रेट सीमित करें, फिर गेम के कॉम्पोनेंट में कोई दूसरा Proton वर्शन या FEX प्रीसेट आज़माएँ। गेम की आवाज़ में खरखराहट है या आवाज़ नहीं आ रही? Steam सेटिंग में ऑडियो के अंतर्गत गेम के लिए DirectAudio टॉगल आज़माएँ। @@ -626,18 +625,7 @@ gamescope: रीयलटाइम GPU क्यू कम्पोज़िटर के GPU काम को प्राथमिकता देता है। गेम की कुछ कीमत पर फ़्रेम पेसिंग को स्मूथ कर सकता है। GPU - मेमोरी बंद - ड्राइवर डिफ़ॉल्ट - गेम चलते समय Steam को कंप्रेस करें - गेम की निष्क्रिय मेमोरी को संपीड़ित करें - RAM कम होने पर गेम की निष्क्रिय मेमोरी को पेज करता है। अगर गेम लगभग हर आधे मिनट में कुछ सेकंड के लिए रुकते हैं, तो इसे बंद करें। अगली बार सत्र शुरू होने पर लागू होता है। - गेम शुरू होने के 20 s बाद, Steam क्लाइंट को zRAM में कंप्रेस किया जाता है ताकि गेम को ज़्यादा मेमोरी मिले, और गेम बंद होने पर वापस पढ़ा जाता है। अगर गेम शुरू होने के कुछ देर बाद सेशन बंद हो जाता है तो इसे बंद करें। ऊपर दी गई RAM सीमा पार होने पर भी Steam कंप्रेस होता है। - RAM सीमा - Steam क्लाइंट चलते समय लागू होती है, Steam मोड में या डेस्कटॉप से। जब सेशन इससे ज़्यादा इस्तेमाल करता है, तो Steam और फिर सेशन की दूसरी समर्थित प्रोसेस zRAM में कंप्रेस होती हैं। यह सॉफ़्ट सीमा है: कुछ बंद नहीं होता, लेकिन पेज वापस आते समय गेम अटक सकते हैं। - zRAM स्वैप चाहिए, जो इस डिवाइस में नहीं है। - VRAM सीमा - मेमोरी का उपयोग कम करने के लिए Direct3D 9 से 12 गेम को यह वीडियो मेमोरी बजट बताता है। गेम इसे पार कर सकते हैं; यह GPU पेजिंग नहीं जोड़ता और मेमोरी खत्म होने से क्रैश रोकने की गारंटी नहीं देता। अगले सत्र से लागू होगा। GPU को उसकी टॉप क्लॉक पर बनाए रखें सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी। सेशन फ़िक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6563b39d2d..e00b2643c9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -22,7 +22,6 @@ Adj hozzá Steam-könyvtárakat SD-kártyáról, USB-meghajtóról vagy SSD-ről, és a DroidDeck egy helyen tartja a játékokat a Könyvtárban. Az Áruházak lehetővé teszi, hogy bejelentkezz a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io és Game Jolt szolgáltatásokba, majd telepítsd és frissítsd a játékaikat a DroidDeckből. Az olyan összetevők, mint a FEX, a DXVK és a VKD3D-Proton, maguktól frissülnek, az alapértelmezett pedig a Proton Experimental ARM64, vagy a Proton 11.0 ARM64, ha az a build telepítve van. - A Steam tömörítése játék közben RAM-ot szabadít fel a kevés memóriával rendelkező eszközökön. Húzd be az ujjad a jobb szélről a munkamenet menü megnyitásához: érintőpad mód, PC-billentyűzet, alacsony késleltetésű mód, játékprofil és más. Lassan fut a játék? Korlátozd a képkockasebességet a Gyors hozzáférésben, majd próbálj ki másik Proton-verziót vagy FEX-előbeállítást a játék összetevőiben. Ropog vagy hiányzik a játék hangja? Próbáld ki a DirectAudio a játékokhoz kapcsolót a Steam beállításaiban a Hang alatt. @@ -626,18 +625,7 @@ gamescope: valós idejű GPU-sor Előnyben részesíti a kompozitor GPU-munkáját. Egyenletesebbé teheti a képkocka-ütemezést, kisebb költséggel a játékoknak. GPU - Memória Ki - Illesztőprogram alapértéke - A Steam tömörítése játék közben - Játék inaktív memóriájának tömörítése - Kevés RAM esetén tömöríti a játék inaktív memóriáját. Kapcsold ki, ha a játékok nagyjából félpercenként néhány másodpercre lefagynak. A munkamenet következő indításakor lép érvénybe. - 20 mp-cel a játék indulása után a Steam-kliens a zRAM-ba tömörül, hogy több memória maradjon a játéknak, és a játék bezárásakor visszaolvasódik. Kapcsolja ki, ha a munkamenet röviddel a játékok indulása után bezárul. A fenti RAM-korlát akkor is tömöríti a Steamet, ha a munkamenet túllépi. - RAM-korlát - Akkor érvényes, amikor a Steam-kliens fut, Steam módban vagy az asztalról. Ha a munkamenet ennél többet használ, a Steam, majd a munkamenet többi támogatott folyamata a zRAM-ba tömörül. Puha korlát: semmi sem zárul be, de a játékok akadhatnak, amíg a lapok visszatöltődnek. - zRAM swap szükséges, amely ezen az eszközön nincs. - VRAM-korlát - Ezt a videomemória-keretet jelzi a Direct3D 9–12 játékoknak a memóriahasználat csökkentésére. A játékok túlléphetik; nem biztosít GPU-lapozást, és nem garantál védelmet a memóriahiány miatti összeomlás ellen. A következő munkamenettől érvényes. A GPU legmagasabb órajelen tartása Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés. Munkamenet-javítások diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1cc8c8a9c1..b52adf60a2 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -22,7 +22,6 @@ Tambahkan pustaka Steam dari kartu SD, drive USB, atau SSD, dan DroidDeck menyatukan semua gim di Pustaka kamu. Toko memungkinkanmu masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, dan Game Jolt, lalu memasang dan memperbarui gim mereka dari DroidDeck. Komponen seperti FEX, DXVK, dan VKD3D-Proton memperbarui diri sendiri, dan Proton Experimental ARM64 menjadi default, atau Proton 11.0 ARM64 setelah build tersebut terpasang. - Kompres Steam saat gim berjalan membebaskan RAM pada perangkat yang kekurangan memori. Geser masuk dari tepi kanan untuk membuka menu sesi: mode touchpad, Keyboard PC, Mode latensi rendah, Profil gim, dan lainnya. Gim berjalan lambat? Batasi frame rate di Akses cepat, lalu coba versi Proton lain atau preset FEX lain di komponen gim. Audio gim pecah atau tidak ada? Coba opsi DirectAudio untuk gim di pengaturan Steam pada bagian Audio. @@ -624,18 +623,7 @@ gamescope: antrean GPU realtime Memprioritaskan kerja GPU compositor. Dapat menghaluskan pacing frame dengan sedikit mengorbankan gim. GPU - Memori Nonaktif - Default driver - Kompres Steam saat gim berjalan - Kompres memori game yang tidak aktif - Mengompres memori game yang tidak aktif saat RAM rendah. Matikan jika game membeku beberapa detik kira-kira setiap setengah menit. Berlaku saat sesi dimulai berikutnya. - 20 detik setelah gim dimulai, klien Steam dikompres ke zRAM agar gim mendapat lebih banyak memori, lalu dibaca kembali saat gim ditutup. Nonaktifkan jika sesi tertutup sesaat setelah gim dimulai. Batas RAM di atas tetap mengompres Steam saat sesi melampauinya. - Batas RAM - Berlaku saat klien Steam berjalan, di mode Steam atau dari desktop. Saat sesi menggunakan lebih dari ini, Steam lalu proses lain yang didukung dalam sesi dikompres ke zRAM. Batas lunak: tidak ada yang ditutup, tetapi gim dapat tersendat saat halaman dimuat kembali. - Memerlukan swap zRAM, yang tidak dimiliki perangkat ini. - Batas VRAM - Melaporkan anggaran memori video ini ke game Direct3D 9 hingga 12 untuk mengurangi penggunaan memori. Game dapat melampauinya; ini tidak menambahkan paging GPU atau menjamin perlindungan dari crash akibat kehabisan memori. Berlaku pada sesi berikutnya. Pertahankan GPU pada clock tertingginya Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas. Perbaikan sesi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 296ea93f8d..b8495afa08 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -22,7 +22,6 @@ Aggiungi librerie Steam da una scheda SD, un\'unità USB o un SSD, e DroidDeck tiene i giochi insieme nella tua Libreria. Negozi ti permette di accedere a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, poi di installare e aggiornare i loro giochi da DroidDeck. I componenti come FEX, DXVK e VKD3D-Proton si aggiornano da soli, e Proton Experimental ARM64 è il predefinito, oppure Proton 11.0 ARM64 una volta installata quella build. - Comprimi Steam durante il gioco libera RAM sui dispositivi che ne hanno poca. Scorri verso l\'interno dal bordo destro per aprire il menu della sessione: modalità touchpad, Tastiera PC, Modalità bassa latenza, Profilo del gioco e altro. Il gioco è lento? Limita il frame rate in Accesso rapido, poi prova un\'altra versione di Proton o un altro preset FEX nei componenti del gioco. Audio del gioco che gracchia o manca? Prova l\'opzione DirectAudio per i giochi nelle impostazioni di Steam, sotto Audio. @@ -628,18 +627,7 @@ gamescope: coda GPU in tempo reale Dà priorità al lavoro GPU del compositor. Può rendere più regolare il frame pacing, a scapito dei giochi. GPU - Memoria Disattivo - Predefinito del driver - Comprimi Steam durante il gioco - Comprimi la memoria inattiva del gioco - Comprime la memoria inattiva del gioco quando la RAM scarseggia. Disattivalo se i giochi si bloccano per qualche secondo circa ogni mezzo minuto. Si applica al prossimo avvio della sessione. - 20 s dopo l\'avvio di un gioco, il client Steam viene compresso in zRAM per lasciare più memoria al gioco e viene riletto quando il gioco si chiude. Disattivalo se la sessione si chiude poco dopo l\'avvio dei giochi. Un limite di RAM impostato sopra comprime comunque Steam quando la sessione lo supera. - Limite RAM - Si applica mentre il client Steam è in esecuzione, in modalità Steam o dal desktop. Quando la sessione usa più di questo valore, Steam e poi gli altri processi supportati della sessione vengono compressi in zRAM. È un limite morbido: non viene chiuso nulla, ma i giochi possono scattare mentre le pagine vengono recuperate. - Richiede lo swap zRAM, che questo dispositivo non ha. - Limite VRAM - La memoria video che DXVK comunica ai giochi Direct3D, così usano meno texture. Le impostazioni DXVK del gioco hanno comunque la priorità. Si applica dalla prossima sessione. Mantieni la GPU alla frequenza massima Solo Adreno. Meno scatti, più consumo di batteria e più calore. Correzioni della sessione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3a616a8570..fc7485bac0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -22,7 +22,6 @@ SDカード、USBドライブ、SSDからSteamライブラリを追加でき、DroidDeckはゲームをライブラリにまとめて表示します。 ストアでは、Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io、Game Joltにサインインして、DroidDeckからそれらのゲームをインストール・更新できます。 FEX、DXVK、VKD3D-Protonなどのコンポーネントは自動で更新されます。既定はProton Experimental ARM64で、Proton 11.0 ARM64がインストールされている場合はそちらになります。 - ゲーム実行中はSteamを圧縮すると、メモリが少ない端末でRAMを確保できます。 画面の右端から内側にスワイプするとセッションメニューが開きます。タッチパッドモード、PCキーボード、低遅延モード、ゲームプロファイルなどがあります。 ゲームが重い場合は、クイックアクセスでフレームレートを制限し、ゲームのコンポーネントで別のProtonバージョンやFEXプリセットを試してください。 ゲームの音が割れる、または出ない場合は、Steam設定のオーディオにある「ゲームでDirectAudioを使用」を試してください。 @@ -624,18 +623,7 @@ gamescope:リアルタイムGPUキュー コンポジタのGPU作業の優先度を上げます。フレームタイムの安定性が向上する場合がありますが、ゲームのパフォーマンスの一部を消費します。 GPU - メモリ オフ - ドライバーのデフォルト - ゲーム実行中はSteamを圧縮 - ゲームのアイドルメモリを圧縮 - RAMが少ないときにゲームのアイドルメモリを圧縮します。ゲームが30秒ごとに数秒止まる場合はオフにしてください。次回のセッション開始時に適用されます。 - ゲーム開始の20秒後、SteamクライアントをzRAMに圧縮してゲームに使えるメモリを増やし、ゲーム終了時に読み戻します。ゲーム開始直後にセッションが終了する場合はオフにしてください。上のRAM上限を設定している場合は、セッションが上限を超えるとSteamは引き続き圧縮されます。 - RAM上限 - Steamモードでもデスクトップからでも、Steamクライアントの実行中に適用されます。セッションの使用量がこの値を超えると、Steam、次にセッション内の対応する他のプロセスがzRAMに圧縮されます。ソフトな上限のため何も終了されませんが、ページの読み戻し中にゲームがカクつくことがあります。 - zRAMスワップが必要ですが、このデバイスにはありません。 - VRAM上限 - Direct3D 9~12のゲームにこのビデオメモリ予算を通知し、メモリ使用量の削減を促します。ゲームは予算を超える場合があります。GPUのページングを追加するものではなく、メモリ不足によるクラッシュの防止は保証されません。次のセッションから有効になります。 GPUを最高クロックに保つ Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。 セッション修正 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 78182d217a..9c7bf0671a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -22,7 +22,6 @@ SD 카드, USB 드라이브, SSD에서 Steam 라이브러리를 추가할 수 있으며, DroidDeck이 게임을 라이브러리에 함께 모아 줍니다. 스토어에서는 Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, Game Jolt에 로그인하고 DroidDeck에서 해당 게임을 설치하고 업데이트할 수 있습니다. FEX, DXVK, VKD3D-Proton 같은 구성 요소는 스스로 업데이트되며, 기본값은 Proton Experimental ARM64이고 Proton 11.0 ARM64 빌드가 설치되면 그쪽이 기본값이 됩니다. - 게임 실행 중 Steam 압축은 메모리가 부족한 기기에서 RAM을 확보해 줍니다. 오른쪽 가장자리에서 안쪽으로 스와이프하면 세션 메뉴가 열립니다. 터치패드 모드, PC 키보드, 저지연 모드, 게임 프로필 등이 있습니다. 게임이 느린가요? 빠른 액세스에서 프레임 레이트를 제한한 다음, 게임의 구성 요소에서 다른 Proton 버전이나 FEX 프리셋을 시도해 보세요. 게임 소리가 지직거리거나 나오지 않나요? Steam 설정의 오디오에서 게임에서 DirectAudio 사용 토글을 시도해 보세요. @@ -624,18 +623,7 @@ gamescope: 실시간 GPU 큐 컴포지터 GPU 작업의 우선순위를 높입니다. 프레임 타임 안정성을 개선할 수 있지만 게임 성능의 일부를 소모합니다. GPU - 메모리 끄기 - 드라이버 기본값 - 게임 실행 중 Steam 압축 - 유휴 게임 메모리 압축 - RAM이 부족할 때 유휴 게임 메모리를 압축합니다. 게임이 약 30초마다 몇 초씩 멈추면 끄세요. 다음 세션을 시작할 때 적용됩니다. - 게임이 시작되고 20초 후 Steam 클라이언트를 zRAM으로 압축해 게임에 더 많은 메모리를 남기고, 게임이 종료되면 다시 읽어 들입니다. 게임 시작 직후 세션이 종료되면 이 옵션을 끄세요. 위의 RAM 제한을 설정하면 세션이 이를 초과할 때 여전히 Steam을 압축합니다. - RAM 제한 - Steam 모드나 데스크톱에서 Steam 클라이언트가 실행되는 동안 적용됩니다. 세션이 이 값보다 많이 사용하면 Steam과 세션의 다른 지원 프로세스를 차례로 zRAM으로 압축합니다. 소프트 제한이므로 종료되는 것은 없지만, 페이지를 다시 읽어 들이는 동안 게임이 끊길 수 있습니다. - zRAM 스왑이 필요하지만 이 기기에는 없습니다. - VRAM 제한 - 메모리 사용량을 줄이도록 Direct3D 9~12 게임에 이 비디오 메모리 예산을 알립니다. 게임은 예산을 초과할 수 있으며, GPU 페이징을 추가하거나 메모리 부족으로 인한 충돌 방지를 보장하지 않습니다. 다음 세션부터 적용됩니다. GPU를 최고 클럭으로 유지 Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다. 세션 수정 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 8ac9fe26ef..95bde0cbb5 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -22,7 +22,6 @@ Tambah pustaka Steam daripada kad SD, pemacu USB atau SSD, dan DroidDeck menyatukan permainan dalam Pustaka anda. Kedai membolehkan anda log masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io dan Game Jolt, kemudian memasang dan mengemas kini permainan mereka daripada DroidDeck. Komponen seperti FEX, DXVK dan VKD3D-Proton mengemas kini sendiri, dan Proton Experimental ARM64 ialah lalai, atau Proton 11.0 ARM64 sebaik sahaja binaan itu dipasang. - Mampatkan Steam semasa permainan berjalan membebaskan RAM pada peranti yang kekurangan memori. Leret masuk dari tepi kanan untuk membuka menu sesi: mod pad sentuh, Papan kekunci PC, Mod kependaman rendah, profil permainan dan banyak lagi. Permainan berjalan perlahan? Hadkan kadar bingkai dalam Akses pantas, kemudian cuba versi Proton atau pratetap FEX lain dalam komponen permainan. Bunyi permainan berderak atau tiada? Cuba togol DirectAudio untuk permainan dalam tetapan Steam di bawah Audio. @@ -624,18 +623,7 @@ gamescope: baris gilir GPU masa nyata Mengutamakan kerja GPU compositor. Boleh melicinkan rentak bingkai dengan sedikit kos kepada permainan. GPU - Memori Mati - Lalai pemacu - Mampatkan Steam semasa permainan berjalan - Mampatkan memori permainan terbiar - Mampatkan memori permainan terbiar apabila RAM rendah. Matikan jika permainan membeku beberapa saat lebih kurang setiap setengah minit. Berkuat kuasa apabila sesi dimulakan seterusnya. - 20 s selepas permainan bermula, klien Steam dimampatkan ke dalam zRAM untuk memberi permainan lebih banyak memori, dan dibaca semula apabila permainan ditutup. Matikan ini jika sesi tertutup sejurus selepas permainan bermula. Had RAM di atas masih memampatkan Steam apabila sesi melebihinya. - Had RAM - Berkuat kuasa semasa klien Steam berjalan, dalam mod Steam atau dari desktop. Apabila sesi menggunakan lebih daripada ini, Steam dan kemudian proses lain sesi yang disokong dimampatkan ke dalam zRAM. Had lembut: tiada apa yang ditutup, tetapi permainan mungkin tersekat-sekat semasa halaman dibaca semula. - Memerlukan swap zRAM, yang tiada pada peranti ini. - Had VRAM - Melaporkan bajet memori video ini kepada permainan Direct3D 9 hingga 12 untuk mengurangkan penggunaan memori. Permainan boleh melebihinya; ini tidak menambah paging GPU atau menjamin perlindungan daripada ranap akibat kehabisan memori. Berkuat kuasa pada sesi seterusnya. Kekalkan GPU pada kelajuan tertinggi Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba. Pembetulan sesi diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index dc2dc6ec18..6c64167883 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -22,7 +22,6 @@ Legg til Steam-biblioteker fra et SD-kort, en USB-stasjon eller en SSD, så holder DroidDeck spillene samlet i Biblioteket ditt. Butikker lar deg logge inn på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt, og deretter installere og oppdatere spillene deres fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton oppdaterer seg selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64 når den versjonen er installert. - Komprimer Steam mens et spill kjører frigjør minne på enheter som har lite. Sveip inn fra høyre kant for å åpne øktmenyen: styreflatemodus, PC-tastatur, modus for lav forsinkelse, spillprofil og mer. Kjører spillet tregt? Begrens bildefrekvensen i Hurtigmeny, og prøv deretter en annen Proton-versjon eller FEX-forhåndsinnstilling i spillets komponenter. Knitrende eller manglende spillyd? Prøv bryteren DirectAudio for spill i Steam-innstillingene under Lyd. @@ -626,18 +625,7 @@ gamescope: realtime GPU-kø Prioriterer kompositørens GPU-arbeid. Kan jevne ut bildetakten, på bekostning av spillene. GPU - Minne Av - Driverstandard - Komprimer Steam mens et spill kjører - Komprimer inaktivt spillminne - Komprimerer inaktivt spillminne når RAM er lav. Slå av hvis spill fryser i noen sekunder omtrent hvert halve minutt. Trer i kraft neste gang økten starter. - 20 s etter at et spill starter, komprimeres Steam-klienten til zRAM for å gi spillet mer minne, og leses inn igjen når spillet lukkes. Slå av hvis sesjonen lukkes kort tid etter at spill starter. En RAM-grense ovenfor komprimerer fortsatt Steam når sesjonen går over den. - RAM-grense - Gjelder mens Steam-klienten kjører, i Steam-modus eller fra skrivebordet. Når sesjonen bruker mer enn dette, komprimeres Steam og deretter sesjonens andre støttede prosesser til zRAM. En myk grense: ingenting lukkes, men spill kan hakke mens sider hentes tilbake. - Krever zRAM-swap, som denne enheten ikke har. - VRAM-grense - Rapporterer dette videominnebudsjettet til Direct3D 9 til 12-spill for å redusere minnebruken. Spill kan overskride det; dette legger ikke til GPU-sideveksling og garanterer ikke beskyttelse mot krasj ved minnemangel. Gjelder fra neste økt. Hold GPU-en på toppfrekvens Bare Adreno. Færre hikk, mer batteribruk og varme. Sesjonsfikser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1ae36c1cad..1176b01733 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -22,7 +22,6 @@ Voeg Steam-bibliotheken toe vanaf een SD-kaart, USB-stick of SSD, en DroidDeck houdt de games bij elkaar in je Bibliotheek. Met Winkels log je in bij Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io en Game Jolt, en installeer en update je hun games vanuit DroidDeck. Componenten zoals FEX, DXVK en VKD3D-Proton updaten zichzelf, en Proton Experimental ARM64 is de standaard, of Proton 11.0 ARM64 zodra die build is geïnstalleerd. - Steam comprimeren terwijl een game draait maakt RAM vrij op apparaten die weinig geheugen hebben. Veeg vanaf de rechterrand naar binnen om het sessiemenu te openen: touchpadmodus, Pc-toetsenbord, modus voor lage latentie, gameprofiel en meer. Draait een game traag? Begrens de framerate in het Snelmenu en probeer dan een andere Proton-versie of FEX-preset in de componenten van de game. Kraakt de audio of ontbreekt het geluid? Probeer de schakelaar DirectAudio voor games in de Steam-instellingen onder Audio. @@ -626,18 +625,7 @@ gamescope: realtime GPU-wachtrij Geeft het GPU-werk van de compositor voorrang. Kan de framepacing gladder maken, ten koste van wat gameprestaties. GPU - Geheugen Uit - Driverstandaard - Steam comprimeren terwijl een game draait - Inactief gamegeheugen comprimeren - Comprimeert inactief gamegeheugen bij weinig RAM. Zet dit uit als games ongeveer elke halve minuut een paar seconden vastlopen. Geldt vanaf de volgende keer dat de sessie start. - 20 s nadat een game start, wordt de Steam-client in zRAM gecomprimeerd om de game meer geheugen te geven, en teruggelezen als de game sluit. Zet dit uit als de sessie kort na het starten van games sluit. Een RAM-limiet hierboven comprimeert Steam nog steeds als de sessie die overschrijdt. - RAM-limiet - Geldt terwijl de Steam-client draait, in de Steam-modus of vanaf de desktop. Als de sessie meer gebruikt dan dit, worden Steam en daarna de andere ondersteunde processen van de sessie in zRAM gecomprimeerd. Een zachte limiet: er wordt niets gesloten, maar games kunnen haperen terwijl pagina’s terugkomen. - Vereist zRAM-swap, die dit apparaat niet heeft. - VRAM-limiet - Meldt dit videogeheugenbudget aan Direct3D 9- tot 12-games om het geheugengebruik te verlagen. Games kunnen het overschrijden; dit voegt geen GPU-paging toe en garandeert geen bescherming tegen crashes door geheugentekort. Geldt vanaf de volgende sessie. GPU op hoogste kloksnelheid houden Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte. Sessiefixes diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index dd47a73b5d..da0c0e4c1f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -22,7 +22,6 @@ Dodaj biblioteki Steam z karty SD, dysku USB lub SSD, a DroidDeck zbierze gry razem w Twojej Bibliotece. Sklepy pozwalają zalogować się do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io i Game Jolt, a następnie instalować i aktualizować ich gry z poziomu DroidDeck. Komponenty takie jak FEX, DXVK i VKD3D-Proton aktualizują się same, a domyślny jest Proton Experimental ARM64 albo Proton 11.0 ARM64, gdy ta wersja jest zainstalowana. - Kompresuj Steam podczas gry zwalnia pamięć RAM na urządzeniach, którym jej brakuje. Przesuń palcem od prawej krawędzi, aby otworzyć menu sesji: tryb touchpada, Klawiatura PC, Tryb niskiego opóźnienia, profil gry i więcej. Gra działa wolno? Ogranicz liczbę klatek w menu Szybki dostęp, a potem wypróbuj inną wersję Proton lub inny preset FEX w komponentach gry. Trzaski lub brak dźwięku w grze? Wypróbuj przełącznik DirectAudio dla gier w ustawieniach Steam w sekcji Dźwięk. @@ -630,18 +629,7 @@ gamescope: kolejka GPU czasu rzeczywistego Nadaje priorytet pracy GPU kompozytora. Może wygładzić tempo klatek kosztem części wydajności gier. GPU - Pamięć Wyłączony - Domyślny sterownika - Kompresuj Steam podczas gry - Kompresuj nieużywaną pamięć gry - Kompresuje nieużywaną pamięć gry przy małej ilości RAM. Wyłącz, jeśli gry zawieszają się na kilka sekund mniej więcej co pół minuty. Działa od następnego uruchomienia sesji. - 20 s po starcie gry klient Steam jest kompresowany do zRAM, aby zostawić grze więcej pamięci, i wczytywany z powrotem po zamknięciu gry. Wyłącz, jeśli sesja zamyka się wkrótce po starcie gier. Powyższy limit RAM nadal kompresuje Steam, gdy sesja go przekroczy. - Limit RAM - Działa, gdy działa klient Steam, w trybie Steam lub z pulpitu. Gdy sesja używa więcej, Steam, a następnie inne obsługiwane procesy sesji są kompresowane do zRAM. Miękki limit: nic nie jest zamykane, ale gry mogą się zacinać podczas wczytywania stron z powrotem. - Wymaga swapu zRAM, którego to urządzenie nie ma. - Limit VRAM - Zgłasza ten budżet pamięci wideo grom Direct3D od 9 do 12, aby ograniczyć zużycie pamięci. Gry mogą go przekroczyć; nie dodaje to stronicowania GPU ani nie gwarantuje ochrony przed awariami z powodu braku pamięci. Działa od następnej sesji. Utrzymuj GPU na najwyższym taktowaniu Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła. Poprawki sesji diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index fdb7974b59..f36d346b39 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas Steam de um cartão SD, unidade USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite iniciar sessão no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles a partir do DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton atualizam-se sozinhos, e o Proton Experimental ARM64 é o predefinido, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir o Steam durante um jogo liberta RAM em dispositivos com pouca memória. Deslize a partir do limite direito para abrir o menu da sessão: modo de painel tátil, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. O jogo está lento? Limite a taxa de fotogramas no Acesso rápido e experimente outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com estalidos ou ausente? Experimente a opção DirectAudio para jogos nas definições do Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Dá prioridade ao trabalho de GPU do compositor. Pode suavizar o ritmo de fotogramas, com algum custo para os jogos. GPU - Memória Desativado - Predefinição do controlador - Comprimir o Steam durante um jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos bloquearem durante alguns segundos aproximadamente a cada meio minuto. Aplica-se no próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar pouco depois de os jogos iniciarem. Um limite de RAM acima continua a comprimir o Steam quando a sessão o ultrapassa. - Limite de RAM - Aplica-se enquanto o cliente Steam está em execução, no modo Steam ou a partir do ambiente de trabalho. Quando a sessão utiliza mais do que isto, o Steam e depois os outros processos suportados da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem ter soluços enquanto as páginas são repostas. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Comunica este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir a utilização de memória. Os jogos podem excedê-lo; isto não adiciona paginação da GPU nem garante proteção contra falhas por falta de memória. Aplica-se na próxima sessão. Manter a GPU na frequência máxima Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d29261a8a7..bc8927ea3c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas da Steam de um cartão SD, pen drive USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite entrar no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles pelo DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton se atualizam sozinhos, e o Proton Experimental ARM64 é o padrão, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir a Steam durante o jogo libera RAM em dispositivos com pouca memória. Deslize da borda direita para abrir o menu da sessão: modo touchpad, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. Jogo rodando devagar? Limite a taxa de quadros no Acesso rápido e depois teste outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com chiado ou sem som? Experimente a opção DirectAudio para jogos nas configurações da Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Prioriza o trabalho de GPU do compositor. Pode suavizar o ritmo dos quadros, com algum custo para os jogos. GPU - Memória Desativado - Padrão do driver - Comprimir a Steam durante o jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos travarem por alguns segundos a cada meio minuto, aproximadamente. Vale a partir do próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar logo após os jogos iniciarem. Um limite de RAM acima ainda comprime a Steam quando a sessão o ultrapassa. - Limite de RAM - Vale enquanto o cliente Steam está em execução, no modo Steam ou pela área de trabalho. Quando a sessão usa mais que isso, a Steam e depois os outros processos compatíveis da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem travar enquanto as páginas voltam. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Informa este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir o uso de memória. Os jogos podem excedê-lo; isso não adiciona paginação de GPU nem garante proteção contra falhas por falta de memória. Entra em vigor na próxima sessão. Manter a GPU no clock máximo Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fff6f62692..4ef9d1d8cb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -22,7 +22,6 @@ Adaugă biblioteci Steam de pe un card SD, o unitate USB sau un SSD, iar DroidDeck păstrează jocurile împreună în Biblioteca ta. Magazine îți permite să te conectezi la Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io și Game Jolt, apoi să instalezi și să actualizezi jocurile lor din DroidDeck. Componente precum FEX, DXVK și VKD3D-Proton se actualizează singure, iar Proton Experimental ARM64 este implicit, sau Proton 11.0 ARM64 odată ce acea versiune este instalată. - Comprimă Steam cât rulează un joc eliberează RAM pe dispozitivele cu memorie puțină. Glisează dinspre marginea dreaptă ca să deschizi meniul sesiunii: mod touchpad, Tastatură de PC, Mod latență redusă, profilul jocului și altele. Jocul rulează greu? Limitează rata de cadre în Acces rapid, apoi încearcă altă versiune de Proton sau alt preset FEX în componentele jocului. Sunet de joc cu pârâituri sau lipsă? Încearcă opțiunea DirectAudio pentru jocuri din setările Steam, la Sunet. @@ -628,18 +627,7 @@ gamescope: coadă GPU în timp real Prioritizează lucrul GPU al compositorului. Poate netezi ritmul cadrelor, cu un cost pentru jocuri. GPU - Memorie Dezactivat - Implicit driver - Comprimă Steam cât rulează un joc - Comprimă memoria inactivă a jocului - Comprimă memoria inactivă a jocului când memoria RAM este redusă. Dezactivează dacă jocurile îngheață câteva secunde aproximativ la fiecare jumătate de minut. Se aplică la următoarea pornire a sesiunii. - La 20 s după pornirea unui joc, clientul Steam este comprimat în zRAM pentru a lăsa jocului mai multă memorie și este citit înapoi când jocul se închide. Dezactivează dacă sesiunea se închide la scurt timp după pornirea jocurilor. O limită RAM de mai sus tot comprimă Steam când sesiunea o depășește. - Limită RAM - Se aplică cât rulează clientul Steam, în modul Steam sau de pe desktop. Când sesiunea folosește mai mult de atât, Steam și apoi celelalte procese acceptate ale sesiunii sunt comprimate în zRAM. O limită flexibilă: nimic nu se închide, dar jocurile pot sacada cât paginile revin. - Necesită swap zRAM, pe care acest dispozitiv nu îl are. - Limită VRAM - Raportează acest buget de memorie video jocurilor Direct3D 9 până la 12 pentru a reduce utilizarea memoriei. Jocurile îl pot depăși; nu adaugă paginare GPU și nu garantează protecție împotriva blocărilor cauzate de lipsa memoriei. Se aplică din sesiunea următoare. Fixează GPU-ul la frecvența maximă Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură. Remedieri de sesiune diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c1e27d2a5a..f2005f1af4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -22,7 +22,6 @@ Добавляйте библиотеки Steam с SD-карты, USB-накопителя или SSD, и DroidDeck соберёт игры вместе в вашей «Библиотеке». «Магазины» позволяют войти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а затем устанавливать и обновлять их игры из DroidDeck. Компоненты вроде FEX, DXVK и VKD3D-Proton обновляются сами, а по умолчанию используется Proton Experimental ARM64 или Proton 11.0 ARM64, когда эта сборка установлена. - «Сжимать Steam во время игры» освобождает ОЗУ на устройствах с нехваткой памяти. Проведите от правого края, чтобы открыть меню сеанса: режим тачпада, «Клавиатура ПК», «Режим низкой задержки», профиль игры и другое. Игра тормозит? Ограничьте частоту кадров в меню «Быстрый доступ», затем попробуйте другую версию Proton или другой пресет FEX в компонентах игры. Треск или нет звука в игре? Попробуйте переключатель «DirectAudio для игр» в настройках Steam в разделе «Аудио». @@ -630,18 +629,7 @@ gamescope: очередь GPU в реальном времени Повышает приоритет работы GPU композитора. Может улучшить стабильность времени кадра, но потребляет часть производительности игры. GPU - Память Выкл. - По умолчанию драйвера - Сжимать Steam во время игры - Сжимать неактивную память игры - Сжимает неактивную память игры при нехватке RAM. Отключите, если игры зависают на несколько секунд примерно каждые полминуты. Применяется при следующем запуске сеанса. - Через 20 с после запуска игры клиент Steam сжимается в zRAM, чтобы оставить игре больше памяти, и считывается обратно после закрытия игры. Отключите, если сессия закрывается вскоре после запуска игр. Лимит RAM выше всё равно сжимает Steam, когда сессия его превышает. - Лимит RAM - Действует, пока работает клиент Steam, в режиме Steam или с рабочего стола. Когда сессия использует больше этого значения, Steam, а затем другие поддерживаемые процессы сессии сжимаются в zRAM. Мягкий лимит: ничего не закрывается, но игры могут подтормаживать, пока страницы возвращаются. - Нужен своп zRAM, которого на этом устройстве нет. - Лимит VRAM - Сообщает играм Direct3D 9–12 этот бюджет видеопамяти для снижения её использования. Игры могут его превысить; это не добавляет подкачку памяти GPU и не гарантирует защиту от сбоев из-за нехватки памяти. Действует со следующего сеанса. Поддерживать максимальную частоту GPU Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева. Исправления сессии diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2732a0c90..670a8019c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -22,7 +22,6 @@ Lägg till Steam-bibliotek från ett SD-kort, USB-minne eller SSD, så håller DroidDeck ihop spelen i ditt Bibliotek. Butiker låter dig logga in på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io och Game Jolt och sedan installera och uppdatera deras spel från DroidDeck. Komponenter som FEX, DXVK och VKD3D-Proton uppdaterar sig själva, och Proton Experimental ARM64 är standard, eller Proton 11.0 ARM64 när den versionen är installerad. - Komprimera Steam medan ett spel körs frigör RAM på enheter med lite minne. Svep in från högerkanten för att öppna sessionsmenyn: pekplattsläge, PC-tangentbord, låg latens, spelprofil med mera. Går spelet långsamt? Begränsa bildfrekvensen i Snabbåtkomst och prova sedan en annan Proton-version eller FEX-förinställning i spelets komponenter. Knaster eller saknat ljud i spelet? Prova växlaren DirectAudio för spel i Steam-inställningarna under Ljud. @@ -626,18 +625,7 @@ gamescope: GPU-kö i realtid Prioriterar kompositorns GPU-arbete. Kan jämna ut bildtakten till viss kostnad för spelen. GPU - Minne Av - Drivrutinens standard - Komprimera Steam medan ett spel körs - Komprimera spelets inaktiva minne - Komprimerar spelets inaktiva minne när RAM-minnet är lågt. Stäng av om spel fryser några sekunder ungefär var halvminut. Gäller nästa gång sessionen startar. - 20 s efter att ett spel startat komprimeras Steam-klienten till zRAM för att ge spelet mer minne, och läses tillbaka när spelet stängs. Stäng av om sessionen stängs strax efter att spel startar. En RAM-gräns ovan komprimerar fortfarande Steam när sessionen överskrider den. - RAM-gräns - Gäller medan Steam-klienten körs, i Steam-läge eller från skrivbordet. När sessionen använder mer än detta komprimeras Steam och sedan sessionens övriga processer som stöds till zRAM. En mjuk gräns: inget stängs, men spel kan hacka medan sidor läses tillbaka. - Kräver zRAM-swap, vilket den här enheten saknar. - VRAM-gräns - Rapporterar denna videominnesbudget till Direct3D 9 till 12-spel för att minska minnesanvändningen. Spel kan överskrida den; detta lägger inte till sidväxling av GPU-minne och garanterar inte skydd mot krascher vid minnesbrist. Gäller från nästa session. Håll GPU:n på dess högsta klockfrekvens Bara Adreno. Färre hack, högre batteriförbrukning och mer värme. Sessionsfixar diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 89147a62cf..576b285e7b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -22,7 +22,6 @@ เพิ่มคลังเกม Steam จากการ์ด SD ไดรฟ์ USB หรือ SSD แล้ว DroidDeck จะรวมเกมไว้ด้วยกันใน ไลบรารี ของคุณ สโตร์ ให้คุณลงชื่อเข้าใช้ Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io และ Game Jolt แล้วติดตั้งและอัปเดตเกมของสโตร์เหล่านั้นจาก DroidDeck ได้ คอมโพเนนต์อย่าง FEX, DXVK และ VKD3D-Proton อัปเดตตัวเอง และค่าเริ่มต้นคือ Proton Experimental ARM64 หรือ Proton 11.0 ARM64 เมื่อติดตั้งบิลด์นั้นแล้ว - บีบอัด Steam ขณะเล่นเกม ช่วยเพิ่ม RAM ว่างบนอุปกรณ์ที่หน่วยความจำเหลือน้อย ปัดเข้าจากขอบขวาเพื่อเปิดเมนูเซสชัน: โหมดทัชแพด แป้นพิมพ์พีซี โหมดหน่วงเวลาต่ำ โปรไฟล์เกม และอื่น ๆ เกมช้าใช่ไหม ลองจำกัดเฟรมเรตใน Quick Access แล้วลองใช้ Proton เวอร์ชันอื่นหรือพรีเซ็ต FEX อื่นในคอมโพเนนต์ของเกม เสียงเกมแตกพร่าหรือไม่มีเสียง ลองเปิดสวิตช์ DirectAudio สำหรับเกม ในการตั้งค่า Steam ภายใต้ เสียง @@ -624,18 +623,7 @@ gamescope: คิว GPU แบบเรียลไทม์ ให้ความสำคัญกับงาน GPU ของตัวประกอบภาพก่อน อาจทำให้การเรียงเฟรมราบรื่นขึ้นโดยแลกกับประสิทธิภาพของเกมบางส่วน GPU - หน่วยความจำ ปิด - ค่าเริ่มต้นของไดรเวอร์ - บีบอัด Steam ขณะเล่นเกม - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งาน - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งานเมื่อ RAM เหลือน้อย ปิดไว้หากเกมค้างไม่กี่วินาทีทุกประมาณครึ่งนาที มีผลเมื่อเริ่มเซสชันครั้งถัดไป - 20 วินาทีหลังเกมเริ่ม ไคลเอนต์ Steam จะถูกบีบอัดลงใน zRAM เพื่อเหลือหน่วยความจำให้เกมมากขึ้น และอ่านกลับเมื่อปิดเกม ปิดตัวเลือกนี้หากเซสชันปิดไปไม่นานหลังเริ่มเกม ขีดจำกัด RAM ด้านบนยังคงบีบอัด Steam เมื่อเซสชันใช้เกินขีดจำกัด - ขีดจำกัด RAM - มีผลขณะไคลเอนต์ Steam ทำงาน ทั้งในโหมด Steam หรือจากเดสก์ท็อป เมื่อเซสชันใช้เกินค่านี้ Steam และโปรเซสอื่นที่รองรับของเซสชันจะถูกบีบอัดลงใน zRAM ตามลำดับ เป็นขีดจำกัดแบบอ่อน: ไม่มีอะไรถูกปิด แต่เกมอาจกระตุกขณะดึงหน้าหน่วยความจำกลับมา - ต้องใช้ zRAM swap ซึ่งอุปกรณ์นี้ไม่มี - ขีดจำกัด VRAM - แจ้งงบประมาณหน่วยความจำวิดีโอนี้ให้เกม Direct3D 9 ถึง 12 เพื่อลดการใช้หน่วยความจำ เกมอาจใช้เกินงบได้ ฟีเจอร์นี้ไม่ได้เพิ่มการสลับหน้าหน่วยความจำ GPU และไม่รับประกันว่าจะป้องกันการแครชเมื่อหน่วยความจำหมด มีผลในเซสชันถัดไป ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น การแก้ไขเซสชัน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 84ccc32c35..3fe7a74c55 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -22,7 +22,6 @@ SD karttan, USB sürücüden veya SSD\'den Steam kütüphaneleri ekle; DroidDeck oyunları Kütüphane\'nde bir arada tutar. Mağazalar, Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ve Game Jolt\'ta oturum açmanı, ardından oyunlarını DroidDeck\'ten yüklemeni ve güncellemeni sağlar. FEX, DXVK ve VKD3D-Proton gibi bileşenler kendini günceller; varsayılan Proton Experimental ARM64\'tür, Proton 11.0 ARM64 kurulduktan sonra ise o olur. - Oyun çalışırken Steam\'i sıkıştır, belleği az olan cihazlarda RAM boşaltır. Oturum menüsünü açmak için sağ kenardan içeri kaydır: dokunmatik yüzey modu, PC klavyesi, düşük gecikme, oyun profili ve daha fazlası. Oyun yavaş mı çalışıyor? Hızlı erişim\'de kare hızını sınırla, sonra oyunun bileşenlerinde başka bir Proton sürümü veya FEX ön ayarı dene. Oyun sesinde cızırtı var ya da ses yok mu? Steam ayarlarında Ses altındaki Oyunlar için DirectAudio düğmesini dene. @@ -626,18 +625,7 @@ gamescope: gerçek zamanlı GPU kuyruğu Bileştiricinin GPU işine öncelik verir. Oyunlardan biraz feda ederek kare zamanlamasını yumuşatabilir. GPU - Bellek Kapalı - Sürücü varsayılanı - Oyun çalışırken Steam\'i sıkıştır - Oyunun boşta belleğini sıkıştır - RAM azaldığında oyunun boşta belleğini sıkıştırır. Oyunlar yaklaşık her yarım dakikada birkaç saniye donuyorsa kapatın. Oturum bir sonraki başlatıldığında geçerli olur. - Oyun başladıktan 20 sn sonra oyuna daha fazla bellek kalması için Steam istemcisi zRAM\'e sıkıştırılır ve oyun kapanınca geri okunur. Oyunlar başladıktan kısa süre sonra oturum kapanıyorsa bunu kapatın. Yukarıdaki RAM sınırı, oturum onu aştığında Steam\'i yine sıkıştırır. - RAM sınırı - Steam istemcisi Steam oturumunda veya masaüstünden çalışırken uygulanır. Oturum bundan fazlasını kullandığında önce Steam, ardından oturumun desteklenen diğer işlemleri zRAM\'e sıkıştırılır. Yumuşak bir sınırdır: hiçbir şey kapatılmaz, ancak sayfalar geri yüklenirken oyunlar takılabilir. - Bu cihazda olmayan zRAM takası gerekir. - VRAM sınırı - Bellek kullanımını azaltmak için Direct3D 9–12 oyunlarına bu video belleği bütçesini bildirir. Oyunlar bütçeyi aşabilir; GPU sayfalaması eklemez veya bellek yetersizliğinden kaynaklanan çökmeleri önlemeyi garanti etmez. Sonraki oturumda geçerli olur. GPU\'yu en yüksek saat hızında tut Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma. Oturum düzeltmeleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 17d3a83830..f7354e66e2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -22,7 +22,6 @@ Додавайте бібліотеки Steam із SD-картки, USB-накопичувача чи SSD, і DroidDeck збере ігри разом у вашій «Бібліотеці». «Магазини» дають змогу увійти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io і Game Jolt, а потім установлювати й оновлювати їхні ігри з DroidDeck. Компоненти, як-от FEX, DXVK і VKD3D-Proton, оновлюються самі, а типовою є Proton Experimental ARM64 або Proton 11.0 ARM64, щойно цю збірку встановлено. - «Стискати Steam під час гри» звільняє оперативну пам\'ять на пристроях, яким її бракує. Проведіть від правого краю, щоб відкрити меню сеансу: режим сенсорної панелі, «Клавіатура ПК», низька затримка, профіль гри та інше. Гра гальмує? Обмежте частоту кадрів у меню «Швидкий доступ», потім спробуйте іншу версію Proton або набір налаштувань FEX у компонентах гри. Тріск або зникає звук у грі? Спробуйте перемикач «DirectAudio для ігор» у налаштуваннях Steam у розділі «Звук». @@ -630,18 +629,7 @@ gamescope: черга GPU реального часу Надає пріоритет роботі композитора на GPU. Може вирівняти темп кадрів ціною частини продуктивності ігор. GPU - Памʼять Вимк. - Типово для драйвера - Стискати Steam під час гри - Стискати неактивну пам’ять гри - Стискає неактивну пам’ять гри, коли мало RAM. Вимкніть, якщо ігри зависають на кілька секунд приблизно кожні пів хвилини. Застосовується під час наступного запуску сеансу. - Через 20 с після запуску гри клієнт Steam стискається в zRAM, щоб залишити грі більше памʼяті, і зчитується назад, коли гра закривається. Вимкніть, якщо сеанс закривається невдовзі після запуску ігор. Ліміт RAM вище все одно стискає Steam, коли сеанс його перевищує. - Ліміт RAM - Діє, поки працює клієнт Steam, у режимі Steam або з робочого столу. Коли сеанс використовує більше цього значення, Steam, а потім інші підтримувані процеси сеансу стискаються в zRAM. Мʼякий ліміт: нічого не закривається, але ігри можуть підвисати, поки сторінки повертаються. - Потрібен своп zRAM, якого на цьому пристрої немає. - Ліміт VRAM - Повідомляє іграм Direct3D 9–12 цей бюджет відеопам’яті для зменшення її використання. Ігри можуть його перевищити; це не додає підкачку пам’яті GPU й не гарантує захисту від збоїв через нестачу пам’яті. Діє з наступного сеансу. Тримати GPU на максимальній частоті Лише Adreno. Менше запинок, вища витрата заряду та нагрів. Виправлення сеансу diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 34ec1d90bc..896a787697 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -22,7 +22,6 @@ Thêm thư viện Steam từ thẻ SD, ổ USB hoặc SSD, và DroidDeck sẽ gom các game lại trong Thư viện của bạn. Cửa hàng cho phép bạn đăng nhập Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io và Game Jolt, rồi cài đặt và cập nhật game của họ ngay từ DroidDeck. Các thành phần như FEX, DXVK và VKD3D-Proton tự cập nhật, và mặc định là Proton Experimental ARM64, hoặc Proton 11.0 ARM64 khi bản dựng đó đã được cài. - Nén Steam khi game đang chạy giúp giải phóng RAM trên các thiết bị thiếu bộ nhớ. Vuốt vào từ mép phải để mở menu phiên: chế độ bàn di chuột, Bàn phím PC, độ trễ thấp, hồ sơ game và nhiều hơn nữa. Game chạy chậm? Hãy giới hạn tốc độ khung hình trong Truy cập nhanh, rồi thử phiên bản Proton khác hoặc bộ cài đặt sẵn FEX khác trong các thành phần của game. Âm thanh game bị rè hoặc mất tiếng? Hãy thử bật DirectAudio cho game trong cài đặt Steam, mục Âm thanh. @@ -624,18 +623,7 @@ gamescope: hàng đợi GPU thời gian thực Ưu tiên công việc GPU của compositor. Có thể làm nhịp khung hình mượt hơn với một phần chi phí cho game. GPU - Bộ nhớ Tắt - Mặc định của driver - Nén Steam khi game đang chạy - Nén bộ nhớ game không hoạt động - Nén bộ nhớ game không hoạt động khi RAM thấp. Tắt nếu game bị đứng vài giây khoảng mỗi nửa phút. Áp dụng từ lần khởi động phiên tiếp theo. - 20 giây sau khi game bắt đầu, client Steam được nén vào zRAM để game có thêm bộ nhớ, và được đọc lại khi game đóng. Tắt nếu phiên bị đóng ngay sau khi game bắt đầu. Giới hạn RAM ở trên vẫn nén Steam khi phiên vượt quá mức đó. - Giới hạn RAM - Áp dụng khi client Steam đang chạy, ở chế độ Steam hoặc từ desktop. Khi phiên dùng nhiều hơn mức này, Steam rồi đến các tiến trình được hỗ trợ khác của phiên sẽ bị nén vào zRAM. Giới hạn mềm: không có gì bị đóng, nhưng game có thể giật khi các trang được nạp lại. - Cần swap zRAM, thiết bị này không có. - Giới hạn VRAM - Báo ngân sách bộ nhớ video này cho các trò chơi Direct3D 9 đến 12 để giảm mức dùng bộ nhớ. Trò chơi có thể vượt ngân sách; tính năng này không bổ sung phân trang GPU hay bảo đảm tránh lỗi do hết bộ nhớ. Có hiệu lực ở phiên tiếp theo. Giữ GPU ở xung nhịp cao nhất Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn. Các bản sửa phiên diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index aa10c5ccf6..e91a58b486 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -22,7 +22,6 @@ 可添加 SD 卡、USB 驱动器或 SSD 上的 Steam 游戏库,DroidDeck 会把这些游戏集中在你的库中。 游戏商店让你登录 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然后在 DroidDeck 中安装和更新它们的游戏。 FEX、DXVK 和 VKD3D-Proton 等组件会自动更新,默认使用 Proton Experimental ARM64,安装 Proton 11.0 ARM64 后则默认使用它。 - “游戏运行时压缩 Steam”可在内存不足的设备上释放 RAM。 从右边缘向内滑动可打开会话菜单:触控板模式、PC 键盘、低延迟、游戏配置档案等。 游戏运行缓慢?先在快捷访问中限制帧率,再到游戏的组件中尝试其他 Proton 版本或 FEX 预设。 游戏音频爆音或没有声音?请在 Steam 设置的“音频”下尝试“游戏使用 DirectAudio”开关。 @@ -624,18 +623,7 @@ gamescope:实时 GPU 队列 优先处理合成器的 GPU 工作。可平滑帧节奏,但会牺牲部分游戏性能。 GPU - 内存 关闭 - 驱动默认 - 游戏运行时压缩 Steam - 压缩游戏闲置内存 - RAM 较低时压缩游戏闲置内存。如果游戏大约每半分钟卡顿几秒,请关闭此项。下次启动会话时生效。 - 游戏启动 20 秒后,Steam 客户端会被压缩到 zRAM 中,为游戏腾出更多内存,并在游戏关闭时读回。如果会话在游戏启动后不久就关闭,请关闭此选项。设置了上方的 RAM 上限时,会话超出上限后仍会压缩 Steam。 - RAM 上限 - 在 Steam 客户端运行时生效,无论是 Steam 模式还是从桌面启动。会话使用量超过此值时,会先将 Steam、再将会话中其他受支持的进程压缩到 zRAM。这是软上限:不会关闭任何进程,但在页面读回时游戏可能卡顿。 - 需要 zRAM 交换空间,但此设备不支持。 - VRAM 上限 - 向 Direct3D 9 至 12 游戏报告此显存预算,以促使游戏减少内存使用。游戏可能超出预算;此功能不提供 GPU 分页,也不保证避免内存不足导致的崩溃。下次会话生效。 把 GPU 锁定在最高频率 仅限 Adreno。卡顿更少,但更耗电、更发热。 会话修复 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d86325fe04..25a9d22aea 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 優先處理合成器的 GPU 工作。可令幀間隔更平穩,但會犧牲少許遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果會話在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,會話仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當會話的用量超過此值時,會先將 Steam、再將會話中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但此裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲報告此顯存預算,以促使遊戲減少記憶體用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免因記憶體不足而崩潰。下次工作階段生效。 讓 GPU 保持最高頻率 只限 Adreno。減少卡頓,但更耗電、更發熱。 會話修正 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb8df3aec8..66a0480c55 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「遊戲商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 提高合成器 GPU 工作的優先順序。可能改善影格時間穩定性,但會佔用一部分遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設值 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果工作階段在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,工作階段仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當工作階段的用量超過此值時,會先將 Steam、再將工作階段中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但這部裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲回報此顯示記憶體預算,以促使遊戲減少記憶體使用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免記憶體不足造成的當機。下次工作階段生效。 讓 GPU 保持最高頻率 僅適用於 Adreno。卡頓更少,但耗電和發熱更多。 工作階段修復 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e697c0bb00..c72a92b84b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,7 +49,6 @@ Add Steam libraries from an SD card, USB drive or SSD, and DroidDeck keeps the games together in your Library. Stores lets you sign in to Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io and Game Jolt, then install and update their games from DroidDeck. Components like FEX, DXVK and VKD3D-Proton update themselves, and Proton Experimental ARM64 is the default, or Proton 11.0 ARM64 once that build is installed. - Compress Steam while a game runs frees RAM on devices that run low. Swipe in from the right edge to open the session menu: touchpad mode, PC keyboard, low latency, game profile and more. Game running slow? Cap the frame rate in Quick Access, then try another Proton version or FEX preset in the game\'s components. Crackling or missing game audio? Try the DirectAudio for games toggle in Steam settings under Audio. @@ -654,18 +653,7 @@ gamescope: realtime GPU queue Prioritizes the compositor\'s GPU work. Can smooth frame pacing at some cost to games. GPU - Memory Off - Driver default - Compress Steam while a game runs - Compress idle game memory - Pages out idle game memory when RAM is low. Turn this off if games freeze for a few seconds about every half minute. Applies the next time the session starts. - Compresses Steam while a game runs, starting sooner when memory is tight. Steam is read back after the game closes once enough RAM is available. Turn this off if the session closes shortly after games start. A RAM cap above still compresses Steam when the session goes over it. - RAM cap - Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back. - Needs zRAM swap, which this device does not have. - VRAM cap - Reports this video memory budget to Direct3D 9 to 12 games to encourage lower memory use. Games may exceed it; this does not add GPU paging or guarantee protection from out-of-memory crashes. Takes effect at the next session. Hold the GPU at its top clock Adreno only. Fewer hitches, more battery use and heat. Session fixes diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 7d2087f6fc..66b68631f4 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -35,7 +35,8 @@ class SessionSuspendControllerTest { val urgent = fixture.signals.filter { it.signal == URG } assertEquals(listOf(GAME), urgent.map { it.pid }) assertTrue(fixture.signals.indexOfFirst { it.signal == URG } < fixture.signals.indexOfFirst { it.signal == STOP }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) + assertEquals("0", fixture.control.readText()) assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) assertEquals(0, fixture.unacknowledged) assertTrue(fixture.game.threads.all { it.state == 't' }) @@ -56,6 +57,22 @@ class SessionSuspendControllerTest { assertEquals(0, fixture.unacknowledged) } + @Test fun aTrimAcknowledgementIsNotTakenForAFinishedPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + val ack = File(fixture.control.parentFile, ".dd-zram.ack.$GAME") + var stoppedEarly = false + fixture.afterSleep = { + if (fixture.now == 3000L) fixture.handlerStalls = false + if (fixture.handlerStalls && fixture.signals.any { it.signal == URG }) ack.writeText("4096") + if (fixture.handlerStalls && fixture.signals.any { it.signal == STOP }) stoppedEarly = true + } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(stoppedEarly) + assertEquals(0, fixture.unacknowledged) + } + @Test fun replacedHandlerIsNotWaitedForPastTheStartWindow() { val fixture = fixture(17) fixture.control.writeText("0") @@ -107,6 +124,17 @@ class SessionSuspendControllerTest { assertEquals(1, fixture.pagedIn.size) } + @Test fun theMonitorIsHeldOffWhilePagingOutAndReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + val hold = File(fixture.control.parentFile, ".dd-zram.hold") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(hold.exists()) + fixture.controller.resume { assertTrue(it) } + assertFalse(hold.exists()) + assertEquals(listOf("1", "0"), fixture.held) + } + @Test fun noReadBackAfterAFreezeWithoutPageOut() { val fixture = fixture(17) fixture.control.writeText("0") @@ -116,6 +144,18 @@ class SessionSuspendControllerTest { assertTrue(fixture.pagedIn.isEmpty()) } + @Test fun aTrimRequestInTheControlFileDoesNotReplaceThePageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { fixture.control.writeText("2 4096\n") } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertEquals(listOf("1", "0"), fixture.held) + assertEquals("2 4096\n", fixture.control.readText()) + assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + } + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { val fixture = fixture(17) fixture.control.writeText("0") @@ -124,7 +164,7 @@ class SessionSuspendControllerTest { val before = fixture.signals.size fixture.controller.resume { assertTrue(it) } assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } @@ -151,18 +191,6 @@ class SessionSuspendControllerTest { assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } - @Test fun noReadBackWithARamCap() { - val fixture = fixture(17) - fixture.control.writeText("0") - fixture.readBackAllowed = false - fixture.controller.freeze(pageOut = true) { assertTrue(it) } - val before = fixture.signals.size - fixture.controller.resume { assertTrue(it) } - assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) - assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) - } - @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { val fixture = fixture(17) fixture.control.writeText("0") @@ -170,7 +198,7 @@ class SessionSuspendControllerTest { fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertFalse(fixture.signals.any { it.signal == STOP }) assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(1, fixture.pagedIn.single().first) assertEquals(0L, fixture.pagedIn.single().second) assertTrue(fixture.pagedIn.single().third > 0L) @@ -183,7 +211,7 @@ class SessionSuspendControllerTest { fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) } @@ -467,6 +495,7 @@ class SessionSuspendControllerTest { val groups = mutableListOf(root, game) val helpers = mutableListOf() val signals = mutableListOf() + val held = mutableListOf() var rootPid = ROOT var now = 0L var audioSuspends = 0 @@ -486,7 +515,6 @@ class SessionSuspendControllerTest { val pagedIn = mutableListOf>() var availableKb = 8_000_000L var totalKb = 16_000_000L - var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false @@ -506,7 +534,6 @@ class SessionSuspendControllerTest { pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, - readBackAllowed = { readBackAllowed }, pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) @@ -514,6 +541,8 @@ class SessionSuspendControllerTest { private fun signal(pid: Int, signal: Int) { signals += SentSignal(pid, signal) + val request = if (signal == URG) File(control.parentFile, "${control.name}.hold").takeIf { it.isFile }?.readText() else null + if (signal == URG) held += request val group = groups.first { it.pid == pid } if (signal == STOP) { continuing = false @@ -522,7 +551,7 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true + if (request == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { if (clockAtContinue == null && clock.isFile) { clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 434aa22679..218d1fd8e9 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -1,42 +1,121 @@ -# Low-memory reclaim and userspace compression +# Automatic memory management -The Steam session monitor uses the existing `libddsession.so` page-out request to reclaim -private anonymous launcher memory. The default remains a request 20 seconds after game focus, -with five minutes between requests. With client compression enabled, low system headroom can -also trigger a request while a game is loading, before its first focused window. +The Steam session keeps enough memory free on its own. There are no memory settings: the +session monitor in `droiddeck-session` measures how much memory is available and how fast it is +being taken, and compresses just enough idle memory into zRAM to stay ahead of it. -Every five seconds the monitor reads `MemAvailable`, swap headroom and memory PSI. Low -headroom means less than one fifth of total RAM (bounded to 512–1536 MiB), or at least 1% -`some avg10` memory stall with less than one third of RAM available. Pressure requests target -only the launcher processes already recognized by the monitor, never the game. They require -at least 128 MiB launcher RSS and enough free swap to cover its anonymous RSS while leaving -one fifth of swap (at least 256 MiB) free. File-backed resident pages do not consume this -budget: the page-out helper targets private anonymous mappings. If `RssAnon` is absent from a -process's status, its full RSS is used instead. The regular automatic client request uses the -same swap guard. An explicit session RAM cap retains its existing behavior. +## What the monitor measures -Pressure requests are at least 30 seconds apart. Reclaiming less than 16 MiB doubles the -retry delay, up to five minutes. After game exit, speculative launcher readback is deferred -until the session is under any explicit RAM cap, pressure has subsided, and available RAM -can cover twice the launcher's swap while leaving the headroom reserve. Normal demand paging -continues while readback is deferred; Steam does not have to wait for the monitor to recover. -The same readback runs while the game is still running once the client has been in front of it -for five seconds (a game stuck on a black screen and left through Steam, or a long stay in the -Steam menu), under the same memory checks and only without an explicit RAM cap. Missing or -unreadable focus data never counts as the client in front. Demand paging -alone left the Steam library and menus blank for about half a minute in that case. The -client is compressed again 20 seconds after the game is back in front. -Missing memory counters disable automatic pressure reclaim and speculative readback. Missing -PSI alone still permits the `MemAvailable` fallback. No root settings, swap sizes, compression -algorithms, Android process priorities or game-specific settings are changed. +Each pass reads four things: + +- `MemAvailable` from `/proc/meminfo`. +- The fall rate: how much `MemAvailable` dropped since the last pass, plus what the monitor + itself freed in between, per second. A peak decays by a quarter per pass, so one burst keeps + the monitor alert for a few seconds without holding it there. +- Memory stall: the change in the `some` total of `/proc/pressure/memory`, as a percentage of + the time between passes. A missing PSI file reads as no stall. +- zRAM room and saving: free space on the zRAM swap devices in `/proc/swaps` after a reserve + of one eighth of zRAM (at least 128 MiB), and the measured saving per compressed byte from + `/sys/block/zram0/mm_stat` (bounded to 1.2:1–6:1, 2.5:1 before 64 MiB has been stored). + Disk swap is not counted as room: paging to storage is what causes long stalls. + +The monitor sleeps five seconds between passes while more than two fifths of RAM is available +and memory is steady, and one second otherwise. + +## Levels + +| Level | Value | Meaning | +| --- | --- | --- | +| Floor | one eighth of RAM, bounded to 640–1280 MiB | Below this the system is close to killing the session. `lmkd` ended a session on a 7.5 GiB device with 490 MiB available. | +| Target | floor + ten seconds of the fall rate | Where the monitor wants available memory to stay. | +| Burst | two seconds of the fall rate, when that is at least 64 MiB and less than two fifths of RAM is available | Memory that will be taken before the next passes can react. | + +The amount to free is the distance to the target or the burst, whichever is larger. The hard +part of it is what available memory is short of the floor, and nothing when it is above. With +a memory stall of at least 1% the hard part is two seconds of the fall rate when that is +larger, whatever the size of the fall and however much memory is available. + +## What gets compressed, in order + +1. The Steam client and hidden launchers, while a game is running and the client is not known + to be in front (unreadable focus data counts as not in front), or at any time when there is + a hard need. Without a hard need the client is left alone for 30 seconds after + it was read back. +2. Processes of the session that loaded `libddsession.so` (the game, Wine and its services), + largest first, only for the hard part that the client did not cover. One pass moves at + most 256 MiB. + +Both use the preload's cold-only request (`2 `): each process pages out only memory it has +not touched recently and stops at the budget, so memory in use stays in RAM and is not read +straight back. The budget is the amount to free divided by the measured saving, limited to the +zRAM room. With less than half the floor available the request ignores heat (`3 `), moves +up to 1 GiB, and runs at most once every ten seconds. + +Two things keep memory from going in and out of zRAM. The preload remembers each 1 MiB chunk +it paged out: when a quarter or more of those pages are resident again at the next visit, the +chunk is hot and is passed over for the next 64 visits, then 128, then 255. And the monitor +reads `pswpin` from `/proc/vmstat`: what was read back from swap, fading over half a minute, +is taken off what one pass may move (1 GiB in all, at most 256 MiB of it from the session). A device +whose working set does not fit therefore stops being trimmed and is left to the kernel, until +the forced level is reached. + +A pass that gives back less than a quarter of what the floor is short by is followed by a wait: +five seconds, doubling after each such pass up to a minute. The wait ends early when available +memory drops another eighth of the floor or reaches the forced level, and is forgotten after a +pass that gives back enough or once nothing is needed. + +Requests go to one process at a time. The monitor waits for that process's acknowledgement +(the kB it paged out) before the next, reads `MemAvailable` again, and stops once the budget is +met or available memory is back at the level the pass was started for. A process that has not +started within half a second, or has not finished when the pass (client and session together) +has waited five seconds in total or six seconds have gone by since it began, is skipped for a +minute, and a late answer from it is discarded. A process is known by its number and start time, so a new process that got the +number of a skipped one is asked. Processes with less +than 8 MiB of anonymous memory are skipped. While the app pages the session out for suspend, or +reads it back on resume, it holds the monitor off with `/tmp/.dd-zram.hold` and writes its own +request (`1` to page out, `0` to read back) into that file. A signalled process reads the hold +file first and the control file only when the hold file is missing or empty, so a trim request +the monitor wrote at the same moment cannot replace the app's. The suspend page-out answers `1` +in `/tmp/.dd-zram.ack.` and a trim answers its kB in `/tmp/.dd-zram.trim.`, so the +monitor never removes or reads an answer the app is waiting for, and the app never takes a +trim's answer for its own. A trim budget smaller than a chunk covers the stretch of the chunk +that holds that many resident pages, and the next request continues from where it ended. With less than 64 MiB of zRAM room nothing is requested and the +session log says so once a minute. + +With no shortage nothing is compressed. A game that fits in memory is never touched, and Steam +is no longer compressed on a timer. + +## Reading the client back + +Once the client has been compressed, it is read back in one request when the game has exited, +or the client has been in front of the game for five seconds, and at least 30 seconds have +passed since the last request, and available memory covers the client's swap plus the target +and the floor. Missing or unreadable focus data never counts as the client in front. Demand +paging alone left the Steam library and menus blank for about half a minute in that case. +Suspending the session while it is asleep, hidden or the screen is off still pages everything +out, and resuming reads it back when available memory is at least twice what those processes +have in swap at that moment and, after it, 1 GiB or a tenth of RAM, whichever is larger, stays +available. + +## Threads + +Page-out never runs on a thread of the game. The preload's signal handler only wakes its +`zr-worker` thread, which does the `madvise` calls. A forked process +without a worker trims inline in steps of at most 32 MiB per request and looks at no more +than 512 MiB of its address space each time. The page-out for a suspend and the read-back +after it are not limited there: they run once, while the process is being stopped or +started, and cover all of it. The monitor is a +shell loop in the session, outside every game process. + +The session log gets a line once at least 16 MiB has moved since the last one, at most every +five seconds: +`memory: available N MB, falling N MB/s, compressed N MB of the client and N MB of the session`. + +No root settings, swap sizes, compression algorithms, Android process priorities or +game-specific settings are changed. + +## Measurements behind the levels -A bounded live test of the pressure helper on the FIT during Caravan SandWitch loading -requested page-out at 20:52:37 UTC, 18 seconds before the installed timed reclaimer. Aggregate -launcher RSS fell from 608 to 283 MiB across that request; this is summed process RSS, not a -measurement of net physical RAM saved. The game reached its main menu at 60 FPS. The test ran -the candidate monitor functions alongside the old APK's monitor, not a newly built APK; -the old monitor's later request is visible separately at 20:52:55 in the session log. This -does not establish gameplay performance or resolve Stellar Blade's larger memory failure. Continuing an existing Caravan save reproduced a whole-session low-memory kill with the pressure helper running. Android recorded `ApplicationExitInfo` reason `LOW_MEMORY`, and @@ -49,39 +128,6 @@ reduced aggregate launcher RSS only from 263 to 255 MiB and backed off. Thus lau does not resolve this load failure, and this run did not exhaust swap. The unevictable/shmem growth needs allocation attribution before treating it as a driver or GPU-memory diagnosis. -## Pressure reclaim: compressing idle game memory - -The monitor also compresses the game session itself when observed pressure approaches the -system kill boundary. There is no RAM-size gate. The trigger is absolute real headroom, not a -percentage: Android's `lmkd` killed a session on a 7.5 GiB device with -490 MiB still available, so a 95% used threshold (about 400 MiB left on 8 GB) is already past the -kill. A world load added 1 GiB of GPU memory in about ten seconds, and compressing 1.4 GiB took -2.6 seconds, so the request has to leave room for both. - -Performance > Compress idle game memory turns this off (`DD_ZRAM_IDLE=0`); launcher compression -and the RAM cap are unaffected. - -The session request runs when real headroom falls below a quarter of RAM (bounded to -768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` -memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and -`Shmem` from `MemAvailable`; a rapid fall also qualifies below twice the headroom or two fifths of RAM, whichever is larger (a 15 GB Thor Max was killed with 5.3 GB still available while memory fell about 400 MB per tick). The monitor -may first request page-out of idle Steam and hidden launchers, subject to the Performance -setting and client reclaim limits. When both qualify, both requests are sent before waiting -for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client -request finishes, its anonymous RSS remains reserved from the session's swap budget. Completion -and backoff are measured against the processes that received each request, even if a later scan -finds different processes. The session request targets processes that loaded -`libddsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. -Requests are at least 30 seconds apart and need the same -swap reserve as launcher requests. When the session has read back more than half of what the -previous request compressed, that memory is in use: the request is skipped and the wait doubles, -up to five minutes. A completed request must also raise `MemAvailable` by at least one -sixteenth of the tier headroom, with a 16 MiB minimum; otherwise the same wait doubles because -the pass did not provide meaningful system headroom. A request whose memory stayed compressed or -whose available memory recovers resets the wait to 30 seconds. Below half the headroom the wait -is ignored and only the 30-second spacing applies, so critical pressure can still trigger a -request. The state resets when the game exits. - Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: @@ -99,20 +145,6 @@ allocation, not swap capacity. Little Nightmares at the same settings compressed the following minute at its menu and 440 MiB while loading the next area; frame rate stayed at 44–46 FPS with one or two short frame-time spikes. These are single runs, not averages. -On the PR build without any manual step, the monitor compressed WoW before character select and -again during the load; the game entered the world and stayed there at 33 FPS. Once in the world, -available memory settled near 1 GiB, under the headroom, and the first version of the policy -compressed 200–400 MiB every 30 seconds while the game read back about 15 MiB/s. The -read-back check therefore compares against the last request instead of all compressed memory. - -A second run on that build showed the trigger arriving too late: character select sat at -1.5–1.6 GiB available, just above the original one-fifth headroom, so nothing was compressed -there. During the load, available memory crossed the headroom 9 seconds after Enter World, but the -launcher check ran first and waited 12 seconds for acknowledgements; the game request started at -21 seconds, moved about 200 MiB, and `lmkd` ended the session at 30 seconds. The quarter-of-RAM -level starts reclaim earlier. Sending both requests before waiting removes the launcher -acknowledgement delay; it does not guarantee that reclaim can keep up with every loading peak. - Without root an app cannot write its memory cgroup's `memory.reclaim` (owned by `system`), `process_madvise` on another process returns `EPERM`, `PAGEMAP_SCAN` is absent before Linux 6.7, and KGSL's per-process GPU reclaim `state` is root-only. Page-out therefore runs inside each diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md deleted file mode 100644 index 8877bd7bf3..0000000000 --- a/docs/development/vram-budget.md +++ /dev/null @@ -1,28 +0,0 @@ -# Reported video memory budget - -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives `dxgi.maxDeviceMemory` and `dxgi.maxSharedMemory`, which separately reduce the adapter's advertised dedicated and shared video memory (on a single-heap GPU DXVK reports the heap as both, so a game adding the two would otherwise still see the whole heap as shared), and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. - -This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. - -This is a budget hint, not a physical reservation or a GPU paging implementation. Games may exceed it. On UMA hardware, host-visible Vulkan allocations can share the same device-local heap as textures. Rejecting every allocation above a fixed total can therefore break required upload buffers and other allocations, rather than make a game reduce its texture pool. The layer does not intercept `vkAllocateMemory` or `vkFreeMemory`, and preserves the real heap size so individual allocations larger than the budget remain Vulkan-valid. - -The layer activates only with `DROIDDECK_VRAM_CAP=1` and a positive `DROIDDECK_VRAM_CAP_MB`. With the Performance setting on Auto, the game environment does not enable it. Explicit DXVK configuration remains available, while the Vulkan layer also covers D3D12 and games that replace their DXVK configuration. - -## Physical investigation - -On an 8 GB Pocket FIT Elite with DD Turnip 0.4.0, Proton 11-12.1, and Caravan SandWitch build 25301828: - -- A native Vulkan probe reported a device-local heap of 5,650,776,064 bytes. All exposed memory types used the same device-local UMA heap. The initial implementation clamped both heap and budget to 2048 MiB; the revised layer preserves heap capacity and clamps only the budget. -- The initial hard allocation cap caused the existing save to fail a required 603,979,776-byte D3D12 allocation. Android survived, but the game crashed. Discord testers also reported crashes after reaching the cap in Fallout 76. -- In the initial test with allocation rejection disabled, vkd3d-proton logged the smaller 2048 MiB heap and budget. Caravan still exhausted system memory while loading the save. A reported budget alone does not solve this workload. -- DX11 loaded the same save and supported movement around the station at approximately 60 FPS for more than five minutes, both with and without the reported budget layer. Graphics settings were unchanged. This establishes a renderer workaround, not proof that the layer solved Caravan's OOM. -- The final release-signed APK, preserving real heap size and clamping only the budget to 2048 MiB, also passed more than five minutes of loaded-save DX11 movement. D3D12 with the same budget still exhausted system memory. -- Launching D3D12 through `droiddeck-proton-run --app` without the Linux Steam client reached the loaded save and allowed movement, then Android killed the session for low memory. Removing the client footprint alone was insufficient. - -A separate Windows DXGI query probe on a **12 GB AYN Thor** with the same APK and Proton queried the adapter without allocating game resources. With the layer disabled, dedicated video memory was 8,858,370,048 bytes and the local budget was 5,656,018,944 bytes. Enabling only the layer at 2048 MiB preserved that dedicated-memory value and changed the local and UMA non-local budgets to 2,147,483,648 bytes. Adding the existing `DXVK_CONFIG="dxgi.maxDeviceMemory = 2048"` setting also lowered advertised dedicated memory to 2,147,483,648 bytes while retaining the 2048 MiB budgets. These probes verify the application-facing budget path; they are not 8 GB gameplay results. - -On that Thor, subsequent D3D12 runs both with and without the 2048 MiB budget reached the existing save and supported more than five minutes of movement. Both used the Stability preset and `VKD3D_CONFIG=log_memory_budget`. The budgeted run ended with an Android low-memory kill during the shutdown window; the unbudgeted retry stopped cleanly. Earlier runs also encountered low-memory kills or a separate exception-stack startup failure. These observations do not establish a reduction in Caravan's memory use from the budget hint or a stable D3D12 fix. - -Native regression coverage exercises core and KHR memory-property queries, chained budget structures, unchanged real usage above the budget, separate heap types, disabled behavior, device lifecycle dispatch, and successful driver allocations whose individual and combined sizes exceed the reported budget. - -The Vulkan specification describes [`heapBudget` as a guideline](https://docs.vulkan.org/refpages/latest/refpages/source/VkPhysicalDeviceMemoryBudgetPropertiesEXT.html). Transparent movement between device-local and host-local memory requires driver and operating-system support for [pageable device-local memory](https://docs.vulkan.org/refpages/latest/refpages/source/vkAllocateMemory.html). diff --git a/docs/settings-map.md b/docs/settings-map.md index b9b42d5639..694717ff8b 100644 --- a/docs/settings-map.md +++ b/docs/settings-map.md @@ -19,10 +19,6 @@ Links of the form `droiddeck://settings/
` open a Settings section direc | Skip GL error checks | Settings › Performance (`droiddeck://settings/performance`) | | | gamescope: realtime GPU queue | Settings › Performance (`droiddeck://settings/performance`) | gamescope | | Hold the GPU at its top clock | Settings › Performance (`droiddeck://settings/performance`) | gpu, clock, max | -| RAM cap | Settings › Performance (`droiddeck://settings/performance`) | ram, memory | -| VRAM cap | Settings › Performance (`droiddeck://settings/performance`) | vram, memory | -| Compress idle game memory | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | -| Compress Steam while a game runs | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | | Clear cached apps before a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, crash, sleep, killed | | Background apps during a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, background apps | | Memory readout | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, overlay | diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 79562333d4..5fd8ca4bc2 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -23,8 +23,7 @@ "outputs": [ "app/src/main/assets/linuxfs/usr/local/bin/gamescope", "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" ], "ndk": true, "packages": [ diff --git a/tools/gpuload/build.sh b/tools/gpuload/build.sh index 683057c382..cf43a948b2 100755 --- a/tools/gpuload/build.sh +++ b/tools/gpuload/build.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Builds VK_LAYER_DROIDDECK_gpu_load for the arm64 guest: tools/gpuload/build.sh [--native] OUT -# OUT gets libVkLayer_droiddeck_gpuload.so, libVkLayer_droiddeck_vramcap.so and their implicit-layer manifests. set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) repo=$(cd "$here/../.." && pwd) @@ -36,15 +35,10 @@ cmd=(sh -c ' build/gpuload/test_gpuload_busy cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -o build/gpuload/test_gpuload_ring tools/gpuload/tests/test_gpuload_ring.c build/gpuload/test_gpuload_ring - cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -pthread -Wno-unused-parameter -Wno-missing-field-initializers -o build/gpuload/test_vramcap_budget tools/gpuload/tests/test_vramcap_budget.c - build/gpuload/test_vramcap_budget aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ -o build/gpuload/out/libVkLayer_droiddeck_gpuload.so tools/gpuload/src/vk_layer_droiddeck_gpuload.c - aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ - -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ - -o build/gpuload/out/libVkLayer_droiddeck_vramcap.so tools/gpuload/src/vk_layer_droiddeck_vramcap.c - aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so build/gpuload/out/libVkLayer_droiddeck_vramcap.so') + aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so') if [ "$native" = 1 ]; then (cd "$repo" && "${cmd[@]}") else @@ -52,8 +46,7 @@ else "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" fi -cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$here/layer/VK_LAYER_DROIDDECK_vram_cap.json" "$work/out/" +cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/" mkdir -p "$out" -cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/libVkLayer_droiddeck_vramcap.so" \ - "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/VK_LAYER_DROIDDECK_vram_cap.json" "$out/" +cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$out/" echo "built $out" diff --git a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json b/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json deleted file mode 100644 index 9bff13fe76..0000000000 --- a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "file_format_version": "1.2.0", - "layer": { - "name": "VK_LAYER_DROIDDECK_vram_cap", - "type": "GLOBAL", - "library_path": "/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "api_version": "1.3.0", - "implementation_version": "1", - "description": "Reports a smaller video memory budget to DXVK and vkd3d-proton", - "functions": { - "vkNegotiateLoaderLayerInterfaceVersion": "DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion" - }, - "enable_environment": { - "DROIDDECK_VRAM_CAP": "1" - }, - "disable_environment": { - "DROIDDECK_VRAM_CAP_DISABLE": "1" - } - } -} diff --git a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c b/tools/gpuload/src/vk_layer_droiddeck_vramcap.c deleted file mode 100644 index eefa5608d3..0000000000 --- a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c +++ /dev/null @@ -1,206 +0,0 @@ -#define _GNU_SOURCE -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "vramcap_budget.h" - -#define EXPORT __attribute__((visibility("default"))) - -static uint64_t g_cap; - -__attribute__((constructor)) static void init(void) { - g_cap = vramcap_parse_mb(getenv("DROIDDECK_VRAM_CAP_MB")); -} - -struct inst { - struct inst *next_in_list; - VkInstance handle; - PFN_vkGetInstanceProcAddr gipa; - PFN_vkDestroyInstance destroy; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2_khr; -}; - -struct dev { - struct dev *next_in_list; - VkDevice handle; - PFN_vkGetDeviceProcAddr gdpa; - PFN_vkDestroyDevice destroy; -}; - -static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; -static struct inst *g_insts; -static struct dev *g_devs; -static int g_announced; - -static void *key(const void *obj) { return *(void *const *)obj; } - -static struct inst *inst_for(const void *obj) { - struct inst *r; - pthread_mutex_lock(&g_lock); - for (r = g_insts; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static struct dev *dev_for(const void *obj) { - struct dev *r; - pthread_mutex_lock(&g_lock); - for (r = g_devs; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static void say(const char *what) { - fprintf(stderr, "[droiddeck-vram-cap] pid %d: %s\n", (int)getpid(), what); -} - -static void announce(void) { - if (__atomic_exchange_n(&g_announced, 1, __ATOMIC_RELAXED)) return; - char line[96]; - snprintf(line, sizeof(line), "reported device memory budget %llu MB", (unsigned long long)(g_cap >> 20)); - say(line); -} - -static void clamp_properties2(PFN_vkGetPhysicalDeviceMemoryProperties2 next, VkPhysicalDevice pd, - VkPhysicalDeviceMemoryProperties2 *out) { - next(pd, out); - for (VkBaseOutStructure *s = out->pNext; s; s = s->pNext) - if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - vramcap_budget(&out->memoryProperties, (VkPhysicalDeviceMemoryBudgetPropertiesEXT *)s, g_cap); - if (g_cap) announce(); - } -} - -static void VKAPI_CALL GetMemoryProperties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2, pd, out); -} - -static void VKAPI_CALL GetMemoryProperties2KHR(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2_khr, pd, out); -} - -static VkResult VKAPI_CALL CreateInstance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *alloc, VkInstance *out) { - VkLayerInstanceCreateInfo *link = (VkLayerInstanceCreateInfo *)ci->pNext; - while (link && !(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO && link->function == VK_LAYER_LINK_INFO)) - link = (VkLayerInstanceCreateInfo *)link->pNext; - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - PFN_vkCreateInstance create = (PFN_vkCreateInstance)next_gipa(VK_NULL_HANDLE, "vkCreateInstance"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct inst *in = calloc(1, sizeof(*in)); - if (!in) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(ci, alloc, out); - if (r != VK_SUCCESS) { free(in); return r; } - in->handle = *out; - in->gipa = next_gipa; - in->destroy = (PFN_vkDestroyInstance)next_gipa(*out, "vkDestroyInstance"); - in->mem2 = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2"); - in->mem2_khr = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2KHR"); - pthread_mutex_lock(&g_lock); - in->next_in_list = g_insts; - g_insts = in; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocationCallbacks *alloc) { - struct inst *in = inst_for(instance); - if (!in) return; - PFN_vkDestroyInstance destroy = in->destroy; - pthread_mutex_lock(&g_lock); - for (struct inst **p = &g_insts; *p; p = &(*p)->next_in_list) - if (*p == in) { *p = in->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - free(in); - if (destroy) destroy(instance, alloc); -} - -static VkLayerDeviceCreateInfo *device_chain(const VkDeviceCreateInfo *ci, VkLayerFunction function) { - VkLayerDeviceCreateInfo *c = (VkLayerDeviceCreateInfo *)ci->pNext; - while (c && !(c->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && c->function == function)) - c = (VkLayerDeviceCreateInfo *)c->pNext; - return c; -} - -static VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, const VkAllocationCallbacks *alloc, - VkDevice *out) { - VkLayerDeviceCreateInfo *link = device_chain(ci, VK_LAYER_LINK_INFO); - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - PFN_vkGetDeviceProcAddr next_gdpa = link->u.pLayerInfo->pfnNextGetDeviceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - struct inst *in = inst_for(pd); - PFN_vkCreateDevice create = (PFN_vkCreateDevice)next_gipa(in ? in->handle : VK_NULL_HANDLE, "vkCreateDevice"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct dev *d = calloc(1, sizeof(*d)); - if (!d) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(pd, ci, alloc, out); - if (r != VK_SUCCESS) { free(d); return r; } - d->handle = *out; - d->gdpa = next_gdpa; - d->destroy = (PFN_vkDestroyDevice)next_gdpa(*out, "vkDestroyDevice"); - pthread_mutex_lock(&g_lock); - d->next_in_list = g_devs; - g_devs = d; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCallbacks *alloc) { - struct dev *d = dev_for(device); - if (!d) return; - pthread_mutex_lock(&g_lock); - for (struct dev **p = &g_devs; *p; p = &(*p)->next_in_list) - if (*p == d) { *p = d->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - PFN_vkDestroyDevice destroy = d->destroy; - free(d); - if (destroy) destroy(device, alloc); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name); - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetInstanceProcAddr(VkInstance instance, const char *name) { - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)CreateInstance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)DestroyInstance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)CreateDevice; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - if (!strcmp(name, "vkGetInstanceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetInstanceProcAddr; - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!instance) return NULL; - struct inst *in = inst_for(instance); - if (!in) return NULL; - if (g_cap) { - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") && in->mem2) return (PFN_vkVoidFunction)GetMemoryProperties2; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR") && in->mem2_khr) - return (PFN_vkVoidFunction)GetMemoryProperties2KHR; - } - return in->gipa(instance, name); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name) { - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - struct dev *d = dev_for(device); - if (!d) return NULL; - return d->gdpa(device, name); -} - -EXPORT VKAPI_ATTR VkResult VKAPI_CALL DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *v) { - if (v->loaderLayerInterfaceVersion > 2) v->loaderLayerInterfaceVersion = 2; - v->pfnGetInstanceProcAddr = DroidDeckVramCap_GetInstanceProcAddr; - v->pfnGetDeviceProcAddr = DroidDeckVramCap_GetDeviceProcAddr; - v->pfnGetPhysicalDeviceProcAddr = NULL; - return VK_SUCCESS; -} diff --git a/tools/gpuload/src/vramcap_budget.h b/tools/gpuload/src/vramcap_budget.h deleted file mode 100644 index 3d77b1c951..0000000000 --- a/tools/gpuload/src/vramcap_budget.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef VRAMCAP_BUDGET_H -#define VRAMCAP_BUDGET_H - -#include -#include - -static inline uint64_t vramcap_parse_mb(const char *text) { - if (!text || !*text) return 0; - uint64_t value = 0, limit = UINT64_MAX >> 20; - for (; *text; text++) { - if (*text < '0' || *text > '9') return 0; - unsigned digit = (unsigned)(*text - '0'); - if (value > (limit - digit) / 10) return 0; - value = value * 10 + digit; - } - return value << 20; -} - -static inline VkDeviceSize vramcap_clamp(VkDeviceSize value, uint64_t cap) { - return cap && value > cap ? cap : value; -} - -static inline void vramcap_budget(const VkPhysicalDeviceMemoryProperties *p, - VkPhysicalDeviceMemoryBudgetPropertiesEXT *budget, uint64_t cap) { - for (uint32_t i = 0; i < p->memoryHeapCount && i < VK_MAX_MEMORY_HEAPS; i++) - if (p->memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) { - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], cap); - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], p->memoryHeaps[i].size); - } -} - -#endif diff --git a/tools/gpuload/tests/test_vramcap_budget.c b/tools/gpuload/tests/test_vramcap_budget.c deleted file mode 100644 index 40c6f9d8c2..0000000000 --- a/tools/gpuload/tests/test_vramcap_budget.c +++ /dev/null @@ -1,154 +0,0 @@ -#include -#include -#include "../src/vk_layer_droiddeck_vramcap.c" - -static int instance_dispatch, device_dispatch; -static void *instance_object = &instance_dispatch, *physical_object = &instance_dispatch; -static void *device_object = &device_dispatch; -static VkInstance instance; -static VkPhysicalDevice physical; -static VkDevice device; -static unsigned allocations, frees, destroyed_devices, destroyed_instances; - -static void VKAPI_CALL memory_properties(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties *out) { - assert(pd == physical); - *out = (VkPhysicalDeviceMemoryProperties){ - .memoryHeapCount = 3, - .memoryHeaps = {{8ULL << 30, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}, {4ULL << 30, 0}, - {512ULL << 20, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}}, - .memoryTypeCount = 1, - .memoryTypes = {{VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, 0}}, - }; -} - -static void VKAPI_CALL memory_properties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - memory_properties(pd, &out->memoryProperties); - for (VkBaseOutStructure *p = out->pNext; p; p = p->pNext) - if (p->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT *b = (void *)p; - b->heapBudget[0] = 6ULL << 30; - b->heapBudget[1] = 3ULL << 30; - b->heapBudget[2] = 256ULL << 20; - b->heapUsage[0] = 3ULL << 30; - } -} - -static VkResult VKAPI_CALL allocate(VkDevice d, const VkMemoryAllocateInfo *info, - const VkAllocationCallbacks *a, VkDeviceMemory *out) { - assert(d == device && info->allocationSize == (3ULL << 30)); - *out = (VkDeviceMemory)(uintptr_t)++allocations; - return VK_SUCCESS; -} - -static void VKAPI_CALL release(VkDevice d, VkDeviceMemory m, const VkAllocationCallbacks *a) { - assert(d == device && m); - frees++; -} - -static void VKAPI_CALL destroy_device(VkDevice d, const VkAllocationCallbacks *a) { - assert(d == device); - destroyed_devices++; -} - -static void VKAPI_CALL destroy_instance(VkInstance in, const VkAllocationCallbacks *a) { - assert(in == instance); - destroyed_instances++; -} - -static PFN_vkVoidFunction VKAPI_CALL gdpa(VkDevice d, const char *name) { - assert(d == device); - if (!strcmp(name, "vkAllocateMemory")) return (PFN_vkVoidFunction)allocate; - if (!strcmp(name, "vkFreeMemory")) return (PFN_vkVoidFunction)release; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)destroy_device; - return NULL; -} - -static VkResult VKAPI_CALL create_device(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, - const VkAllocationCallbacks *a, VkDevice *out) { - assert(pd == physical); - *out = device; - return VK_SUCCESS; -} - -static VkResult VKAPI_CALL create_instance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *a, VkInstance *out) { - *out = instance; - return VK_SUCCESS; -} - -static PFN_vkVoidFunction VKAPI_CALL gipa(VkInstance in, const char *name) { - assert(in == instance || in == VK_NULL_HANDLE); - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)create_instance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)destroy_instance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)create_device; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties")) return (PFN_vkVoidFunction)memory_properties; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") || !strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR")) - return (PFN_vkVoidFunction)memory_properties2; - return NULL; -} - -int main(void) { - assert(vramcap_parse_mb("2048") == (2ULL << 30)); - assert(vramcap_parse_mb(NULL) == 0 && vramcap_parse_mb("") == 0 && vramcap_parse_mb("0") == 0); - const char *bad[] = {"-1", "+1", " 1024", "1024 ", "1GB", "18446744073709551616", "17592186044416"}; - for (size_t i = 0; i < sizeof(bad) / sizeof(bad[0]); i++) assert(vramcap_parse_mb(bad[i]) == 0); - assert(vramcap_parse_mb("17592186044415") == ((UINT64_MAX >> 20) << 20)); - - instance = (VkInstance)&instance_object; - physical = (VkPhysicalDevice)&physical_object; - device = (VkDevice)&device_object; - g_cap = 2ULL << 30; - VkLayerInstanceLink il = {.pfnNextGetInstanceProcAddr = gipa}; - VkLayerInstanceCreateInfo ic = {.sType = VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &il}; - VkInstanceCreateInfo ici = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = &ic}; - VkInstance got_instance; - assert(CreateInstance(&ici, NULL, &got_instance) == VK_SUCCESS && got_instance == instance); - VkPhysicalDeviceMemoryProperties p; - PFN_vkGetPhysicalDeviceMemoryProperties get = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties"); - assert(get == memory_properties); - get(physical, &p); - assert(p.memoryHeaps[0].size == (8ULL << 30) && p.memoryHeaps[1].size == (4ULL << 30)); - assert(p.memoryHeaps[2].size == (512ULL << 20)); - assert(p.memoryTypes[0].propertyFlags == (VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)); - - const char *names[] = {"vkGetPhysicalDeviceMemoryProperties2", "vkGetPhysicalDeviceMemoryProperties2KHR"}; - for (size_t i = 0; i < 2; i++) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT b = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT}; - VkPhysicalDeviceIDProperties id = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES, .pNext = &b}; - VkPhysicalDeviceMemoryProperties2 p2 = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, .pNext = &id}; - PFN_vkGetPhysicalDeviceMemoryProperties2 get2 = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, names[i]); - get2(physical, &p2); - assert(p2.memoryProperties.memoryHeaps[0].size == (8ULL << 30)); - assert(b.heapBudget[0] == g_cap && b.heapBudget[1] == (3ULL << 30)); - assert(b.heapBudget[2] == (256ULL << 20)); - assert(b.heapUsage[0] == (3ULL << 30)); - assert(p2.pNext == &id && id.pNext == &b); - } - - VkLayerDeviceLink dl = {.pfnNextGetInstanceProcAddr = gipa, .pfnNextGetDeviceProcAddr = gdpa}; - VkLayerDeviceCreateInfo dc = {.sType = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &dl}; - VkDeviceCreateInfo dci = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = &dc}; - VkDevice got_device; - assert(CreateDevice(physical, &dci, NULL, &got_device) == VK_SUCCESS && got_device == device); - PFN_vkAllocateMemory next_allocate = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkAllocateMemory"); - PFN_vkFreeMemory next_free = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkFreeMemory"); - assert(next_allocate == allocate && next_free == release); - VkMemoryAllocateInfo ai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .allocationSize = 3ULL << 30}; - VkDeviceMemory blocks[2]; - for (unsigned i = 0; i < 2; i++) assert(next_allocate(device, &ai, NULL, &blocks[i]) == VK_SUCCESS); - assert(allocations == 2); - for (unsigned i = 0; i < 2; i++) next_free(device, blocks[i], NULL); - assert(frees == 2); - - g_cap = 0; - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, names[0]) == (PFN_vkVoidFunction)memory_properties2); - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties") == (PFN_vkVoidFunction)memory_properties); - PFN_vkDestroyDevice destroy = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkDestroyDevice"); - assert(destroy == DestroyDevice); - destroy(device, NULL); - DestroyInstance(instance, NULL); - assert(destroyed_devices == 1 && destroyed_instances == 1 && !g_devs && !g_insts); - puts("test_vramcap_budget: ok"); - return 0; -} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 0e816b9dab..5dd574abdf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -14,7 +14,6 @@ from pathlib import Path GAME_PREFIX = "DROIDDECK_GAME_" GAME_SPLIT_KEYS = ("TU_DEBUG", "MESA_NO_ERROR") CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} -D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("DD_SYNC", "DD_SYNC_FALLBACK", "DD_FSYNC_FIRST", "DD_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "DD_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") @@ -470,21 +469,6 @@ def split_game_gpu(entries): return result -def vram_cap(env): - value = env.get("DD_VRAM_MB", "") - if not re.fullmatch(r"[1-9][0-9]{0,6}", value): - return env - result = env.copy() - cap = "dxgi.maxDeviceMemory = {0}; dxgi.maxSharedMemory = {0}".format(int(value)) - if int(value) < D3D9_DEFAULT_MEMORY_MB: - cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) - own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() - result["DXVK_CONFIG"] = cap + "; " + own if own else cap - result["DROIDDECK_VRAM_CAP"] = "1" - result["DROIDDECK_VRAM_CAP_MB"] = value - return result - - def parse_cores(text): cores = set() for part in text.replace(" ", "").split(","): @@ -1456,7 +1440,6 @@ def main(): if mic_enabled == "0": env["AUDIO_DIRECT_MIC"] = "0" env = directaudio_settings(env) - env = vram_cap(env) note = render_path_defaults(command, env) if app_id else None if note: print("droiddeck-game-env: " + note, file=sys.stderr) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 4a10cd42bd..ee13167e38 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -132,6 +132,7 @@ clear_stale_tmp() { [ -z "${DD_INSIDE:-}" ] && clear_stale_tmp if [ -z "${DD_INSIDE:-}" ]; then if [ "${DD_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.dd-zram; else rm -f /tmp/.dd-zram; fi + rm -f /tmp/.dd-zram.hold dd if=/dev/zero of=/tmp/.dd-clock bs=8 count=1 conv=notrunc status=none fi @@ -756,13 +757,6 @@ case $mode in fi if [ "${DD_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" - _dd_ram_cap=0 - case ${DD_RAM_CAP_MB:-} in - ''|0) ;; - *[!0-9]*|0*|???????*) step "RAM cap: ignored invalid value '$DD_RAM_CAP_MB'" ;; - *) _dd_ram_cap=$((DD_RAM_CAP_MB * 1024)); step "RAM cap: ${DD_RAM_CAP_MB} MB" ;; - esac ( dd_zram_scan() { _dd_game=0 _dd_pids=() _dd_others=() _dd_apps= @@ -839,284 +833,235 @@ case $mode in echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } dd_memory_read() { - local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall - _saved_growth=${_dd_preserved_growth:-0} _saved_fall=${_dd_preserved_fall:-0} - _dd_preserved_growth=0 _dd_preserved_fall=0 - _dd_mem_total=0 _dd_available=-1 _dd_swap_total=0 _dd_swap_free=-1 - _dd_psi_some=0 _dd_psi_full=0 _dd_gpu=0 _dd_unevictable=0 _dd_shmem=0 + local _k _v _u _kind _fields _name _type _size _used _orig _comp _mem _dt _fall + local _stall=-1 _swap_total=0 _swap_free=0 _total=0 _room=0 _listed=0 _in=-1 + _dd_mem_total=0 _dd_available=-1 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in MemTotal:) _dd_mem_total=$_v ;; MemAvailable:) _dd_available=$_v ;; - SwapTotal:) _dd_swap_total=$_v ;; - SwapFree:) _dd_swap_free=$_v ;; - Unevictable:) _dd_unevictable=$_v ;; - Shmem:) _dd_shmem=$_v ;; + SwapTotal:) _swap_total=$_v ;; + SwapFree:) _swap_free=$_v ;; esac done 2>/dev/null < /proc/meminfo + while read -r _name _type _size _used _u; do + _listed=1 + case $_name in */zram[0-9]*) ;; *) continue ;; esac + case $_size$_used in ''|*[!0-9]*) continue ;; esac + _total=$((_total + _size)) _room=$((_room + _size - _used)) + done 2>/dev/null < /proc/swaps + [ "$_listed" = 1 ] || _total=$_swap_total _room=$_swap_free + _dd_swap_room=$((_total / 8)) + [ "$_dd_swap_room" -ge $((128 * 1024)) ] || _dd_swap_room=$((128 * 1024)) + _dd_swap_room=$((_room - _dd_swap_room)) + _dd_saving=600 + if [ -r /sys/block/zram0/mm_stat ] && read -r _orig _comp _mem _u 2>/dev/null < /sys/block/zram0/mm_stat; then + case $_orig$_mem in + ''|*[!0-9]*) ;; + *) [ "$_orig" -lt $((64 << 20)) ] || _dd_saving=$(((_orig - _mem) / (_orig / 1000))) ;; + esac + [ "$_dd_saving" -ge 167 ] || _dd_saving=167 + [ "$_dd_saving" -le 833 ] || _dd_saving=833 + fi if [ -r /proc/pressure/memory ]; then while read -r _kind _fields; do - [ "$_kind" = some ] || [ "$_kind" = full ] || continue - _avg=${_fields#avg10=} _avg=${_avg%% *} - _whole=${_avg%%.*} _frac=${_avg#*.} - [ "$_frac" = "$_avg" ] && _frac=00 - _frac=${_frac}00 - _frac=${_frac:0:2} - case $_whole$_frac in ''|*[!0-9]*) continue ;; esac - if [ "$_kind" = some ]; then - _dd_psi_some=$((10#$_whole * 100 + 10#$_frac)) - else - _dd_psi_full=$((10#$_whole * 100 + 10#$_frac)) - fi + [ "$_kind" = some ] || continue + _fields=${_fields##*total=} + case $_fields in ''|*[!0-9]*) ;; *) _stall=$_fields ;; esac done 2>/dev/null < /proc/pressure/memory fi - if [ -r /sys/class/kgsl/kgsl/page_alloc ]; then - read -r _gpu_bytes _u < /sys/class/kgsl/kgsl/page_alloc - case $_gpu_bytes in ''|*[!0-9]*) _gpu_bytes=0 ;; esac - _dd_gpu=$((_gpu_bytes / 1024)) + while read -r _k _v; do + [ "$_k" = pswpin ] || continue + case $_v in ''|*[!0-9]*) ;; *) _in=$((_v * _dd_page_kb)) ;; esac + break + done 2>/dev/null < /proc/vmstat + _dt=$((SECONDS - ${_dd_sample_at:-$SECONDS})) + if [ -z "${_dd_sample_at:-}" ]; then + _dd_rate=0 _dd_psi=0 _dd_returned=0 + elif [ "$_dt" -gt 0 ] && [ "$_dd_available" -ge 0 ]; then + _fall=$(((_dd_sample_available - _dd_available + _dd_freed) / _dt)) + _dd_rate=$((_dd_rate * 3 / 4)) + [ "$_fall" -le "$_dd_rate" ] || _dd_rate=$_fall + _dd_psi=0 + [ "$_stall" -lt 0 ] || [ "$_dd_sample_stall" -lt 0 ] || _dd_psi=$(((_stall - _dd_sample_stall) / (_dt * 100))) + _dd_returned=$((_dt < 30 ? _dd_returned * (30 - _dt) / 30 : 0)) + [ "$_in" -lt "$_dd_sample_in" ] || [ "$_dd_sample_in" -lt 0 ] || _dd_returned=$((_dd_returned + _in - _dd_sample_in)) fi - _dd_psi=$_dd_psi_some - [ "$_dd_psi_full" -gt "$_dd_psi" ] && _dd_psi=$_dd_psi_full - if [ "${_dd_sample_at:-}" = "" ]; then - _dd_growth=0 _dd_fall=0 - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - elif [ "$SECONDS" -gt "$_dd_sample_at" ]; then - _dd_growth=0 _dd_fall=0 - _growth=$((_dd_gpu - _dd_sample_gpu)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_unevictable - _dd_sample_unevictable)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_shmem - _dd_sample_shmem)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _dd_fall=$((_dd_sample_available - _dd_available)) - [ "$_saved_growth" -gt "$_dd_growth" ] && _dd_growth=$_saved_growth - [ "$_saved_fall" -gt "$_dd_fall" ] && _dd_fall=$_saved_fall - if [ $((SECONDS - _dd_sample_at)) -ge 5 ]; then - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - fi + if [ "$_dd_available" -ge 0 ] && { [ -z "${_dd_sample_at:-}" ] || [ "$_dt" -gt 0 ]; }; then + _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_stall=$_stall _dd_sample_in=$_in _dd_freed=0 fi - _dd_real_available=$_dd_available - [ "$_dd_real_available" -ge 0 ] && _dd_real_available=$((_dd_real_available - _dd_growth)) - _dd_headroom=$((_dd_mem_total / 5)) - [ "$_dd_headroom" -ge $((512 * 1024)) ] || _dd_headroom=$((512 * 1024)) - [ "$_dd_headroom" -le $((1536 * 1024)) ] || _dd_headroom=$((1536 * 1024)) - _dd_tier_headroom=$((_dd_mem_total / 4)) - [ "$_dd_tier_headroom" -ge $((768 * 1024)) ] || _dd_tier_headroom=$((768 * 1024)) - [ "$_dd_tier_headroom" -le $((2560 * 1024)) ] || _dd_tier_headroom=$((2560 * 1024)) - _dd_fall_headroom=$((_dd_tier_headroom * 2)) - [ "$_dd_fall_headroom" -ge $((_dd_mem_total * 2 / 5)) ] || _dd_fall_headroom=$((_dd_mem_total * 2 / 5)) - _dd_swap_reserve=$((_dd_swap_total / 5)) - [ "$_dd_swap_reserve" -ge $((256 * 1024)) ] || _dd_swap_reserve=$((256 * 1024)) + _dd_floor=$((_dd_mem_total / 8)) + [ "$_dd_floor" -ge $((640 * 1024)) ] || _dd_floor=$((640 * 1024)) + [ "$_dd_floor" -le $((1280 * 1024)) ] || _dd_floor=$((1280 * 1024)) + _dd_target=$((_dd_floor + _dd_rate * 10)) } - dd_memory_tight() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_mem_total / 3)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt $((_dd_headroom * 2)) ]; }; } - } - dd_client_can_pageout() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && dd_zram_has_room - } - dd_zram_has_room() { - [ "$_dd_swap_total" -gt 0 ] && - [ $((_dd_swap_free - _dd_anon - ${_dd_client_reserve:-0})) -ge "$_dd_swap_reserve" ] - } - dd_client_can_readback() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && ! dd_memory_tight && ! dd_memory_critical && - [ "$_dd_real_available" -ge $((_dd_swap * 2)) ] && - [ $((_dd_real_available - _dd_swap)) -ge "$_dd_headroom" ] - } - dd_client_pressure() { - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ "$_dd_game" = 1 ] && - [ "${#_dd_pids[@]}" -gt 0 ] && { dd_memory_tight || dd_memory_critical; } || return 0 - [ "$_dd_pressure_at" -lt 0 ] || - [ $((SECONDS - _dd_pressure_at)) -ge "$_dd_pressure_backoff" ] || return 0 - [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 30 ] || return 0 - _dd_pressure_at=$SECONDS - if ! dd_client_can_pageout; then - step "zRAM: pressure reclaim skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 + dd_memory_need() { + local _burst=$((_dd_rate * 2)) + _dd_need=0 _dd_hard=0 _dd_force=0 + [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] || return 0 + _dd_need=$((_dd_target - _dd_available)) _dd_hard=$((_dd_floor - _dd_available)) + if [ "$_burst" -ge $((64 * 1024)) ] && [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] && [ "$_burst" -gt "$_dd_need" ]; then + _dd_need=$_burst fi - [ "$_dd_rss" -ge $((128 * 1024)) ] || return 0 - _dd_pressure_before=$_dd_rss - if [ "${1:-}" = defer ]; then - _dd_client_reserve=$_dd_anon - _dd_client_pending=1 - fi - dd_zram_send 1 "memory pressure, compressing the client (available $((_dd_available / 1024)) MB, swap free $((_dd_swap_free / 1024)) MB)" client "${1:-}" - _dd_packed=$SECONDS - if [ "${1:-}" = defer ]; then - _dd_client_targets=("${_dd_zram_targets[@]}") - else - dd_client_pressure_result + if [ "$_dd_psi" -ge 100 ] && [ "$_burst" -gt "$_dd_hard" ]; then + _dd_hard=$_burst fi + [ "$_dd_hard" -gt 0 ] || _dd_hard=0 + [ "$_dd_need" -ge "$_dd_hard" ] || _dd_need=$_dd_hard + [ "$_dd_available" -ge $((_dd_floor / 2)) ] || _dd_force=1 } - dd_client_pressure_finish() { - [ "${_dd_client_pending:-0}" = 1 ] || return 0 - dd_zram_finish 1 "${_dd_client_targets[@]}" - dd_client_pressure_result "${_dd_client_targets[@]}" - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() - } - dd_client_pressure_result() { - [ "${_dd_pageout_complete:-0}" = 1 ] || return 0 - if [ "$#" -gt 0 ]; then dd_zram_usage "$@" > /dev/null; else dd_zram_usage "${_dd_pids[@]}" > /dev/null; fi - if [ $((_dd_pressure_before - _dd_rss)) -lt $((16 * 1024)) ]; then - _dd_pressure_backoff=$((_dd_pressure_backoff * 2 > 300 ? 300 : _dd_pressure_backoff * 2)) - else - _dd_pressure_backoff=30 - fi - } - dd_memory_critical() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_tier_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_tier_headroom * 3 / 2)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; }; } - } - dd_session_pressure() { - dd_memory_read - dd_memory_critical || _dd_tier_backoff=30 _dd_tier_nogain=0 - [ "$_dd_game" = 1 ] && dd_memory_critical || return 0 - [ "${DD_ZRAM_IDLE:-1}" = 1 ] && dd_game_focused 0 || return 0 - local _wait=$_dd_tier_backoff _before _available_before _pids _targets _gain _min_gain - [ "$_dd_available" -ge $((_dd_headroom / 2)) ] || [ "$_dd_tier_pushed" -lt 0 ] || _wait=30 - [ "$_dd_tier_at" -lt 0 ] || [ $((SECONDS - _dd_tier_at)) -ge "$_wait" ] || return 0 - if [ "$_dd_tier_at" -ge 0 ] && [ "$_dd_tier_pushed" -gt 0 ]; then - dd_tier_readback - if [ "$_dd_tier_back" -le $((_dd_tier_pushed / 2)) ]; then - [ "${_dd_tier_nogain:-0}" = 1 ] || _dd_tier_backoff=30 - else - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_pushed=-1 - step "zRAM: the game read back most of its last page-out, next try in ${_dd_tier_backoff} s" - return 0 - fi - fi - _dd_tier_at=$SECONDS _dd_tier_pushed=0 - dd_zram_pick session - dd_zram_usage "${_pids[@]}" > /dev/null - [ "$_dd_rss" -ge $((256 * 1024)) ] || return 0 - if ! dd_zram_has_room; then - step "zRAM: low-memory page-out skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 - fi - _targets=("${_pids[@]}") _before=$_dd_swap _available_before=$_dd_available - dd_zram_send 1 "low memory (available $((_dd_real_available / 1024)) MB), compressing idle game memory" session - dd_zram_usage "${_targets[@]}" > /dev/null - _dd_tier_pushed=$((_dd_swap - _before)) - dd_tier_note "${_targets[@]}" - if [ "${_dd_pageout_complete:-0}" = 1 ]; then - dd_memory_read - _gain=$((_dd_available - _available_before)) - _min_gain=$((_dd_tier_headroom / 16)) - [ "$_min_gain" -ge $((16 * 1024)) ] || _min_gain=$((16 * 1024)) - if [ "$_gain" -lt "$_min_gain" ]; then - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_nogain=1 - step "zRAM: low-memory page-out gained only $((_gain / 1024)) MB available, next try in ${_dd_tier_backoff} s" - else - _dd_tier_nogain=0 - fi - fi - } - dd_proc_start() { - local _s= - _dd_start= - read -r _s 2>/dev/null < "/proc/$1/stat" || return 1 - _s=${_s##*) } - set -- $_s - [ "$1" != Z ] && [ "$#" -ge 20 ] || return 1 - _dd_start=${20} - } - dd_tier_note() { - local _p - _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - for _p in "$@"; do - dd_proc_start "$_p" || continue - dd_zram_usage "$_p" > /dev/null - _dd_tier_targets+=("$_p") _dd_tier_swaps+=("$_dd_swap") _dd_tier_starts+=("$_dd_start") - done - } - dd_tier_readback() { - local _i _back=0 - for _i in "${!_dd_tier_targets[@]}"; do - dd_proc_start "${_dd_tier_targets[$_i]}" && [ "$_dd_start" = "${_dd_tier_starts[$_i]}" ] || continue - dd_zram_usage "${_dd_tier_targets[$_i]}" > /dev/null - [ "${_dd_tier_swaps[$_i]}" -le "$_dd_swap" ] || _back=$((_back + _dd_tier_swaps[_i] - _dd_swap)) - done - _dd_tier_back=$_back - } - dd_watch_nap() { - local _i - if [ "$_dd_game" = 1 ] && [ "$_dd_available" -ge 0 ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; then - for _i in 1 2 3 4 5; do - nap 1 - dd_memory_read - dd_memory_critical && return 0 - done - else - nap 5 - fi - return 0 + dd_pid_key() { + local _s + _dd_key=$1 + read -r _s 2>/dev/null < "/proc/$1/stat" || return 0 + set -- ${_s##*) } + _dd_key=$_dd_key.${20:-} } dd_session_others() { local _p + local -A _known=() _dd_session=() for _p in "${_dd_others[@]}"; do - grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null && _dd_session+=("$_p") + dd_pid_key "$_p" + [ -n "${_dd_preloaded[$_dd_key]:-}" ] || + grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null || continue + _known[$_dd_key]=1 + dd_zram_usage "$_p" > /dev/null + _dd_session+=("$_dd_anon $_p") done + _dd_preloaded=() + for _p in "${!_known[@]}"; do + _dd_preloaded[$_p]=1 + done + [ "${#_dd_session[@]}" -gt 0 ] || return 0 + mapfile -t _dd_session < <(printf '%s\n' "${_dd_session[@]}" | sort -rn) + _dd_session=("${_dd_session[@]#* }") } - dd_zram_pick() { - if [ "$1" = game ]; then - dd_session_others - _pids=("${_dd_session[@]}") - [ "${DD_ZRAM_CLIENT:-1}" != 1 ] || _pids+=("${_dd_pids[@]}") - elif [ "$1" = session ]; then - dd_session_others - _pids=("${_dd_session[@]}") + dd_memory_relieved() { + local _k _v _u + while read -r _k _v _u; do + [ "$_k" = MemAvailable: ] || continue + case $_v in ''|*[!0-9]*) return 1 ;; esac + [ "$_v" -ge "$_dd_goal" ] + return + done 2>/dev/null < /proc/meminfo + return 1 + } + dd_zram_trim() { + local _mode=$1 _left=$2 _p _k _n _i _acks=() + shift 2 + _dd_trimmed=0 + for _k in "${!_dd_deaf[@]}"; do + [ "${_dd_deaf[$_k]}" -gt "$SECONDS" ] || unset "_dd_deaf[$_k]" + done + for _p in "$@"; do + [ "$_left" -ge 4096 ] && [ "$_dd_polls" -lt 250 ] && [ $((SECONDS - _dd_pass_at)) -lt 6 ] && + [ ! -e /tmp/.dd-zram.hold ] || break + ! dd_memory_relieved || break + dd_pid_key "$_p" + _k=$_dd_key + [ "${_dd_deaf[$_k]:-0}" -le "$SECONDS" ] || continue + dd_zram_usage "$_p" > /dev/null + [ "$_dd_anon" -ge 8192 ] || continue + printf %s - > "/tmp/.dd-zram.trim.$_p" + _acks+=("/tmp/.dd-zram.trim.$_p") + printf '%s %s\n' "$_mode" "$_left" > /tmp/.dd-zram + kill -URG "$_p" 2>/dev/null || continue + _dd_deaf[$_k]=$((SECONDS + 60)) + for ((_i = 0; _dd_polls < 250 && SECONDS - _dd_pass_at < 6; _i++, _dd_polls++)); do + [ ! -e /tmp/.dd-zram.hold ] || { _dd_deaf[$_k]=0; break; } + _n= + read -r _n 2>/dev/null < "/tmp/.dd-zram.trim.$_p" || : + case $_n in + -) [ "$_i" -lt 25 ] || break ;; + ''|*[!0-9]*) ;; + *) _dd_trimmed=$((_dd_trimmed + _n)) _left=$((_left - _n)) _dd_deaf[$_k]=0; break ;; + esac + nap 0.02 + done + done + [ ! -e /tmp/.dd-zram.hold ] || return 0 + printf '2 0\n' > /tmp/.dd-zram + [ "${#_acks[@]}" = 0 ] || rm -f "${_acks[@]}" + } + dd_memory_relieve() { + local _mode=2 _budget _gain=0 _rest _cap=$((256 * 1024)) _all=$((1024 * 1024)) + dd_memory_need + _dd_polls=0 _dd_pass_at=$SECONDS + if [ "$_dd_need" -le 0 ]; then + _dd_rest=0 + return 0 + fi + [ "$_dd_rest" = 0 ] || [ "$_dd_force" = 1 ] || [ "$SECONDS" -ge "$_dd_rest_until" ] || + [ "$_dd_available" -lt $((_dd_rest_available - _dd_floor / 8)) ] || return 0 + if [ "$_dd_swap_room" -lt $((64 * 1024)) ]; then + if [ $((SECONDS - _dd_full_at)) -ge 60 ]; then + _dd_full_at=$SECONDS + step "memory: available $((_dd_available / 1024)) MB and zRAM has no room left" + fi + return 0 + fi + if [ "$_dd_force" = 1 ] && [ $((SECONDS - _dd_forced_at)) -ge 10 ]; then + _mode=3 _dd_forced_at=$SECONDS _cap=$_all else - _pids=("${_dd_pids[@]}") + _cap=$((_cap - _dd_returned)) _all=$((_all - _dd_returned)) + fi + if [ "${#_dd_pids[@]}" -gt 0 ] && [ "$_all" -ge 4096 ] && + { [ "$_dd_hard" -gt 0 ] || + { [ "$_dd_game" = 1 ] && [ "$_dd_focus" != 1 ] && [ $((SECONDS - _dd_back_at)) -ge 30 ]; }; }; then + _budget=$((_dd_need * 1000 / _dd_saving)) + [ "$_budget" -le "$_all" ] || _budget=$_all + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_need)) + dd_zram_trim "$_mode" "$_budget" "${_dd_pids[@]}" + _gain=$((_dd_trimmed * _dd_saving / 1000)) + _dd_swap_room=$((_dd_swap_room - _dd_trimmed)) _all=$((_all - _dd_trimmed)) + [ "$_cap" -le "$_all" ] || _cap=$_all + _dd_client_out=$((_dd_client_out + _dd_trimmed)) _dd_note_client=$((_dd_note_client + _dd_trimmed)) + [ "$_dd_trimmed" = 0 ] || _dd_trim_at=$SECONDS + fi + _rest=$((_dd_hard - _gain)) + if [ "$_rest" -gt 0 ] && [ "$_cap" -ge 4096 ] && [ "$_dd_swap_room" -ge $((64 * 1024)) ]; then + [ "$_dd_session_at" = "$_dd_scan_at" ] || dd_session_others + _dd_session_at=$_dd_scan_at + _budget=$((_rest * 1000 / _dd_saving)) + [ "$_budget" -le "$_cap" ] || _budget=$_cap + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_hard)) + dd_zram_trim "$_mode" "$_budget" "${_dd_session[@]}" + _gain=$((_gain + _dd_trimmed * _dd_saving / 1000)) + _dd_note_session=$((_dd_note_session + _dd_trimmed)) + fi + _dd_freed=$((_dd_freed + _gain)) + if [ "$_dd_hard" -gt 0 ] && [ "$_gain" -lt $((_dd_hard / 4)) ]; then + _dd_rest=$((_dd_rest > 0 ? _dd_rest * 2 : 5)) + [ "$_dd_rest" -le 60 ] || _dd_rest=60 + _dd_rest_until=$((SECONDS + _dd_rest)) _dd_rest_available=$_dd_available + else + _dd_rest=0 fi } - dd_zram_wait() { - local _p _left _start=$SECONDS - while [ $((SECONDS - _start)) -lt 12 ]; do - _left=0 - for _p in "$@"; do - [ -s "/tmp/.dd-zram.ack.$_p" ] && continue - [ -d "/proc/$_p" ] || continue - [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.dd-zram.ack.$_p" ] && continue - _left=1 - done - [ "$_left" = 1 ] || break - nap 0.2 - done - _dd_pageout_complete=1 - for _p in "$@"; do - if [ -d "/proc/$_p" ] && [ ! -s "/tmp/.dd-zram.ack.$_p" ]; then _dd_pageout_complete=0; fi - rm -f "/tmp/.dd-zram.ack.$_p" - done + dd_memory_note() { + [ $((_dd_note_client + _dd_note_session)) -ge $((16 * 1024)) ] && [ $((SECONDS - _dd_noted_at)) -ge 5 ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, falling $((_dd_rate / 1024)) MB/s, compressed $((_dd_note_client / 1024)) MB of the client and $((_dd_note_session / 1024)) MB of the session" + _dd_note_client=0 _dd_note_session=0 _dd_noted_at=$SECONDS } - dd_zram_send() { - local _mode=$1 _what=$2 _which=$3 _pids _p - dd_zram_pick "$_which" - step "zRAM: $_what ($(dd_zram_usage "${_pids[@]}"))" - for _p in "${_pids[@]}"; do rm -f "/tmp/.dd-zram.ack.$_p"; done - printf '%s' "$_mode" > /tmp/.dd-zram - [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null - _dd_zram_targets=("${_pids[@]}") - [ "${4:-}" != defer ] || return 0 - dd_zram_finish "$_mode" "${_pids[@]}" - } - dd_zram_finish() { - local _mode=$1 - shift - if [ "$_mode" = 1 ]; then dd_zram_wait "$@"; else nap 5; fi - dd_zram_scan - step "zRAM: done ($(dd_zram_usage "$@"))" + dd_client_readback() { + [ "$_dd_client_out" -gt 0 ] && [ "${#_dd_pids[@]}" -gt 0 ] || return 0 + [ "$_dd_game" = 0 ] || { [ -n "$_dd_away" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; } || return 0 + [ $((SECONDS - _dd_trim_at)) -ge 30 ] || return 0 + dd_zram_usage "${_dd_pids[@]}" > /dev/null + if [ "$_dd_swap" -lt $((16 * 1024)) ]; then + _dd_client_out=0 + return 0 + fi + [ $((_dd_available - _dd_swap)) -ge $((_dd_target + _dd_floor)) ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, reading $((_dd_swap / 1024)) MB of the client back" + printf 0 > /tmp/.dd-zram || return 0 + kill -URG "${_dd_pids[@]}" 2>/dev/null || return 0 + _dd_freed=$((_dd_freed - _dd_swap * _dd_saving / 1000)) + _dd_client_out=0 _dd_back_at=$SECONDS } dd_game_focused() { if [ "${DD_DESKTOP:-}" = 1 ] || [ -z "${DD_LAUNCH_DIR:-}" ]; then @@ -1131,92 +1076,40 @@ case $mode in esac return 1 } - dd_over_cap() { - [ "$_dd_ram_cap" -gt 0 ] || return 1 - _dd_measured=$SECONDS - dd_session_others - dd_zram_usage "${_dd_pids[@]}" "${_dd_session[@]}" > /dev/null - [ "$_dd_rss" -gt "$_dd_ram_cap" ] - } - dd_cap_due() { - [ "$_dd_ram_cap" -gt 0 ] && { [ "$_dd_measured" -lt 0 ] || [ $((SECONDS - _dd_measured)) -ge 30 ]; } - } - _dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 - _dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() _dd_away= - _dd_sample_at= _dd_sample_available=0 _dd_sample_gpu=0 _dd_sample_unevictable=0 _dd_sample_shmem=0 - while kill -0 $$ 2>/dev/null; do - dd_zram_scan - dd_memory_read - if dd_cap_due; then - if dd_over_cap; then - if [ "$_dd_capped" -lt 0 ] || [ $((SECONDS - _dd_capped)) -ge "$_dd_backoff" ]; then - dd_zram_usage "${_dd_pids[@]}" > /dev/null - if [ "$_dd_rss" -ge $((512 * 1024)) ]; then - dd_zram_send 1 "over the ${DD_RAM_CAP_MB} MB RAM cap, compressing the client" client - [ "$_dd_game" = 1 ] && _dd_packed=$SECONDS - else - step "RAM cap: over, client already small ($((_dd_rss / 1024)) MB resident), skipping it" - fi - dd_over_cap && dd_zram_send 1 "still over the RAM cap, compressing the rest of the session" session - if dd_over_cap; then - _dd_backoff=$((_dd_backoff * 2 > 600 ? 600 : _dd_backoff * 2)) - step "RAM cap: still over after paging out, next try in ${_dd_backoff} s" - else - _dd_backoff=30 - fi - _dd_capped=$SECONDS - fi - else - _dd_backoff=30 + dd_memory_tick() { + if [ $((SECONDS - _dd_scan_at)) -ge 5 ]; then + _dd_scan_at=$SECONDS + dd_zram_scan + _dd_focus=1 + if [ "$_dd_game" = 1 ]; then + dd_game_focused && _dd_focus=0 || _dd_focus=$? fi - fi - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_client_pressure defer - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_session_pressure - dd_client_pressure_finish - _dd_focus=1 - [ "$_dd_game" = 1 ] && { dd_game_focused && _dd_focus=0 || _dd_focus=$?; } - if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 0 ]; then - _dd_away= - if [ "$_dd_since" -lt 0 ] || [ "$_dd_since_apps" != "$_dd_apps" ]; then - _dd_since=$SECONDS _dd_since_apps=$_dd_apps - fi - if [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _dd_since)) -ge 20 ] && [ "${#_dd_pids[@]}" -gt 0 ] && - { [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 300 ]; } && dd_client_can_pageout; then - dd_zram_send 1 "compressing the client" client - _dd_packed=$SECONDS - fi - elif [ "$_dd_game" != 1 ]; then - _dd_away= - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi - _dd_since=-1 _dd_packed=-1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - else - _dd_since=-1 - if [ "$_dd_focus" = 1 ]; then - [ -n "${_dd_away-}" ] || _dd_away=$SECONDS + if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 1 ]; then + [ -n "$_dd_away" ] || _dd_away=$SECONDS else _dd_away= fi - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi fi - if [ "$_dd_unpack" = 1 ] && - { [ "$_dd_game" = 0 ] || { [ "${_dd_ram_cap:-0}" = 0 ] && [ -n "${_dd_away-}" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; }; } && - ! dd_over_cap && dd_client_can_readback; then - if [ "$_dd_game" = 0 ]; then - dd_zram_send 0 "memory recovered, reading the client back" client - else - dd_zram_send 0 "the client is in front of the game, reading it back" client - _dd_packed=-1 - fi - _dd_unpack=0 + dd_memory_read + [ ! -e /tmp/.dd-zram.hold ] || return 0 + dd_memory_relieve + dd_memory_note + [ "$_dd_need" -gt 0 ] || dd_client_readback + } + declare -A _dd_deaf=() _dd_preloaded=() + _dd_scan_at=-5 _dd_session_at=-1 _dd_session=() _dd_focus=1 _dd_away= + _dd_page_kb=$(($(getconf PAGESIZE 2>/dev/null || echo 4096) / 1024)) _dd_returned=0 _dd_polls=0 _dd_pass_at=0 _dd_goal=0 + _dd_sample_at= _dd_freed=0 _dd_client_out=0 _dd_note_client=0 _dd_note_session=0 + _dd_trim_at=-30 _dd_back_at=-30 _dd_forced_at=-10 _dd_full_at=-60 _dd_noted_at=-5 + _dd_rest=0 _dd_rest_until=0 _dd_rest_available=0 + while kill -0 $$ 2>/dev/null; do + dd_memory_tick + if [ "$_dd_available" -ge 0 ] && + { [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] || [ "$_dd_rate" -ge $((16 * 1024)) ]; }; then + nap 1 + else + nap 5 fi - dd_watch_nap done ) & fi diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index 177fe8efef..551a6e148c 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -20,7 +20,16 @@ #define ZR_CTL "/tmp/.dd-zram" #endif #define ZR_SWAPPED (1ULL << 62) +#define ZR_PRESENT (1ULL << 63) #define ZR_BATCH 512 +#define ZR_CHUNK (1UL << 20) +#define ZR_SLOTS 32768UL +#define ZR_PROBES 16 +#define ZR_HEAT_MAX 3 +#define ZR_SKIP 32U +#define ZR_INLINE_KB (32UL << 10) +#define ZR_INLINE_CHUNKS 512UL +#define ZR_FAILED (~0UL) #define ZR_FUTEX_WAIT 0 #define ZR_FUTEX_WAKE 1 @@ -33,18 +42,43 @@ static char zr_maps[8192]; static uint64_t zr_entries[ZR_BATCH]; static struct iovec zr_iov[ZR_BATCH]; static char zr_sink[ZR_BATCH]; +static struct zr_slot { + unsigned long key; + uint16_t gen; + uint16_t pushed; + uint16_t kept; + uint8_t heat; + uint8_t skip; +} zr_slots[ZR_SLOTS]; +static uint16_t zr_gen = 1; +static unsigned long zr_cursor; +static unsigned long zr_visits; static int zr_open(const char *path) { return (int)zr_sys(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC, 0); } -static int zr_mode(void) { - char c = 0; - int fd = zr_open(ZR_CTL); - if (fd < 0) return -1; - long n = zr_sys(SYS_read, fd, &c, 1); - zr_sys(SYS_close, fd); - return n == 1 && (c == '0' || c == '1') ? c - '0' : -1; +static int zr_mode(unsigned long *want) { + char text[24]; + long n = 0; + int fd = zr_open(ZR_CTL ".hold"); + if (fd >= 0) { + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1) { + fd = zr_open(ZR_CTL); + if (fd < 0) return -1; + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1 || text[0] < '0' || text[0] > '3') return -1; + unsigned long kb = 0; + for (long i = 2; i < n && text[i] >= '0' && text[i] <= '9'; i++) + kb = kb * 10 + (unsigned long)(text[i] - '0'); + *want = kb / (zr_page / 1024); + if (text[0] >= '2' && *want == 0) return -1; + return text[0] - '0'; } static unsigned long zr_hex(const char **p) { @@ -96,16 +130,103 @@ static void zr_read_back(int pagemap, unsigned long start, unsigned long end) { } } -static void zr_walk(int compress) { - int maps = zr_open("/proc/self/maps"); - if (maps < 0) return; - int pagemap = compress ? -1 : zr_open("/proc/self/pagemap"); - if (!compress && pagemap < 0) { - zr_sys(SYS_close, maps); - return; +static unsigned long zr_count(int pagemap, unsigned long start, unsigned long end, uint64_t bit) { + unsigned long count = 0; + long size = (long)((end - start) / zr_page * sizeof(uint64_t)); + long got; + do { + if (zr_sys(SYS_lseek, pagemap, (long)(start / zr_page * sizeof(uint64_t)), SEEK_SET) < 0) return ZR_FAILED; + got = zr_sys(SYS_read, pagemap, zr_entries, size); + } while (got < 0 && errno == EINTR); + if (got != size) return ZR_FAILED; + for (long i = 0; i < got / (long)sizeof(uint64_t); i++) + if (zr_entries[i] & bit) count++; + return count; +} + +static struct zr_slot *zr_slot(unsigned long addr, int create) { + unsigned long key = addr / zr_page + 1; + unsigned long home = key * 2654435761UL % ZR_SLOTS; + for (unsigned long i = 0; i < ZR_PROBES; i++) { + struct zr_slot *slot = &zr_slots[(home + i) % ZR_SLOTS]; + if (slot->key == key) return slot; + if (slot->key == 0 && !create) return NULL; + if (slot->key == 0) { + slot->key = key; + return slot; + } } + if (!create) return NULL; + memset(&zr_slots[home], 0, sizeof(zr_slots[home])); + zr_slots[home].key = key; + return &zr_slots[home]; +} + +static unsigned long zr_trim(int pagemap, unsigned long start, unsigned long end, + unsigned long want, int force, unsigned long lo, unsigned long hi) { + unsigned long done = 0; + for (unsigned long addr = start, next; addr < end && done < want; addr = next) { + next = (addr | (ZR_CHUNK - 1)) + 1; + if (next > end || next < addr) next = end; + if (next <= lo || addr >= hi) continue; + if (zr_visits == 0) break; + zr_visits--; + zr_cursor = next; + if (addr < (unsigned long)(zr_slots + ZR_SLOTS) && next > (unsigned long)zr_slots) continue; + unsigned long present = zr_count(pagemap, addr, next, ZR_PRESENT); + if (present == ZR_FAILED) continue; + struct zr_slot *slot = zr_slot(addr, 0); + if (slot != NULL && slot->gen == zr_gen && slot->pushed > 0) { + if (present > slot->kept && (present - slot->kept) * 4 > slot->pushed) { + if (slot->heat < ZR_HEAT_MAX) slot->heat++; + slot->skip = (uint8_t)(ZR_SKIP << slot->heat > 255 ? 255 : ZR_SKIP << slot->heat); + slot->pushed = 0; + } else if (slot->heat > 0) { + slot->heat--; + } + } + if (slot != NULL && slot->skip > 0 && !force) { + slot->skip--; + continue; + } + if (present == 0) continue; + unsigned long from = addr < lo ? lo : addr; + unsigned long left = present; + while (from < next && done + present - left < want) { + unsigned long budget = want - done - (present - left); + unsigned long i = (from - addr) / zr_page; + for (; i < (next - addr) / zr_page && budget > 0; i++) + if (zr_entries[i] & ZR_PRESENT) budget--; + unsigned long to = addr + i * zr_page; + zr_sys(SYS_madvise, from, to - from, MADV_PAGEOUT); + from = to; + unsigned long now = zr_count(pagemap, addr, next, ZR_PRESENT); + if (now == ZR_FAILED) break; + left = now < present ? now : present; + } + if (from < next) zr_cursor = from; + if (left >= present) continue; + if (slot == NULL) slot = zr_slot(addr, 1); + if (slot->gen != zr_gen) slot->pushed = 0; + slot->gen = zr_gen; + slot->pushed = (uint16_t)(slot->pushed + present - left); + slot->kept = (uint16_t)left; + done += present - left; + } + return done; +} + +static unsigned long zr_walk(int mode, unsigned long want, unsigned long lo, unsigned long hi) { + int maps = zr_open("/proc/self/maps"); + if (maps < 0) return 0; + int pagemap = mode == 1 ? -1 : zr_open("/proc/self/pagemap"); + if (mode != 1 && pagemap < 0) { + zr_sys(SYS_close, maps); + return 0; + } + unsigned long done = 0; size_t have = 0; - for (;;) { + while (done < want && zr_visits > 0) { long n = zr_sys(SYS_read, maps, zr_maps + have, sizeof(zr_maps) - 1 - have); if (n < 0 && errno == EINTR) continue; if (n <= 0) break; @@ -113,12 +234,13 @@ static void zr_walk(int compress) { zr_maps[have] = 0; char *line = zr_maps; char *nl; - while ((nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { + while (done < want && zr_visits > 0 && (nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { *nl = 0; unsigned long s, e; - if (zr_eligible(line, compress, &s, &e) && e > s) { - if (compress) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); - else zr_read_back(pagemap, s, e); + if (zr_eligible(line, mode != 0, &s, &e) && e > s) { + if (mode == 0) zr_read_back(pagemap, s, e); + else if (mode == 1) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); + else done += zr_trim(pagemap, s, e, want - done, mode == 3, lo, hi); } line = nl + 1; } @@ -128,11 +250,12 @@ static void zr_walk(int compress) { } if (pagemap >= 0) zr_sys(SYS_close, pagemap); zr_sys(SYS_close, maps); + return done; } -static void zr_ack(int done) { - static const char suffix[] = ".ack."; - char path[sizeof(ZR_CTL) + sizeof(suffix) + 20]; +static void zr_ack(long value, int trim) { + const char *suffix = trim ? ".trim." : ".ack."; + char path[sizeof(ZR_CTL) + sizeof(".trim.") + 20]; char digits[20]; size_t n = 0, d = 0; for (const char *p = ZR_CTL; *p; p++) path[n++] = *p; @@ -143,15 +266,29 @@ static void zr_ack(int done) { path[n] = 0; int fd = (int)zr_sys(SYS_openat, AT_FDCWD, path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600); if (fd < 0) return; - if (done) zr_sys(SYS_write, fd, "1", 1UL); + for (d = 0; value >= 0 && (d == 0 || value > 0); value /= 10) digits[d++] = (char)('0' + value % 10); + for (n = 0; d > 0;) path[n++] = digits[--d]; + if (n > 0) zr_sys(SYS_write, fd, path, n); zr_sys(SYS_close, fd); } -static void zr_request(void) { - int mode = zr_mode(); - if (mode == 1) zr_ack(0); - if (mode >= 0) zr_walk(mode); - if (mode == 1) zr_ack(1); +static void zr_request(int worker) { + unsigned long want = 0; + int mode = zr_mode(&want); + if (mode < 0) return; + if (!worker && want > ZR_INLINE_KB / (zr_page / 1024)) want = ZR_INLINE_KB / (zr_page / 1024); + zr_visits = worker ? ZR_FAILED : ZR_INLINE_CHUNKS; + if (mode > 0) zr_ack(-1, mode > 1); + if (mode < 2) { + zr_walk(mode, 1, 0, 0); + zr_gen++; + if (mode == 1) zr_ack(1, 0); + return; + } + unsigned long from = zr_cursor; + unsigned long done = zr_walk(mode, want, from, ~0UL); + if (done < want && from > 0) done += zr_walk(mode, want - done, 0, from); + zr_ack((long)(done * (zr_page / 1024)), 1); } static void *zr_worker_main(void *unused) { @@ -160,7 +297,7 @@ static void *zr_worker_main(void *unused) { for (;;) { while (!__atomic_exchange_n(&zr_pending, 0, __ATOMIC_SEQ_CST)) zr_sys(SYS_futex, &zr_pending, ZR_FUTEX_WAIT, 0, NULL, NULL, 0); - zr_request(); + zr_request(1); } return NULL; } @@ -176,7 +313,7 @@ static void zr_handler(int sig, siginfo_t *info, void *context) { } else while (__atomic_load_n(&zr_pending, __ATOMIC_SEQ_CST) && !__atomic_exchange_n(&zr_busy, 1, __ATOMIC_SEQ_CST)) { __atomic_store_n(&zr_pending, 0, __ATOMIC_SEQ_CST); - zr_request(); + zr_request(0); __atomic_store_n(&zr_busy, 0, __ATOMIC_SEQ_CST); } errno = saved; diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 16d4c9342c..4b02d29c26 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -100,8 +100,7 @@ def required(): 'layer/VK_LAYER_DROIDDECK_vr.json', 'layer/VK_LAYER_DROIDDECK_vr_implicit.json', 'layer/libdroiddeck_vr_scheduling.so']] paths += ['assets/linuxfs/usr/local/lib/droiddeck-gpuload/' + name for name in - ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json', - 'libVkLayer_droiddeck_vramcap.so', 'VK_LAYER_DROIDDECK_vram_cap.json']] + ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json']] for side in ['left', 'right']: paths += [f'assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/resources/rendermodels/droiddeck_hand_{side}/{name}' for name in [f'droiddeck_hand_{side}.json', 'hand.mtl', 'hand.png', 'hand_open.obj', 'hand_fist.obj', diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 4a69f47ed7..be8e1dc31c 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -18,6 +18,15 @@ def run_bash(script, env=None): return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env) +def state_source(): + source = SCRIPT.read_text() + start = source.index(' declare -A _dd_deaf=()') + return source[start:source.index(' while kill -0', start)] + + +STATE = state_source() + + class ClientZramFocusTest(unittest.TestCase): def test_the_hidden_epic_launcher_is_compressed_with_the_client(self): with tempfile.TemporaryDirectory() as tmp: @@ -78,217 +87,59 @@ class ClientZramFocusTest(unittest.TestCase): self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) - def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): - source = SCRIPT.read_text() - start = source.index(' _dd_focus=1\n') - stop = source.index(' dd_watch_nap\n', start) - body = source[start:stop] - harness = ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_unpack=0 _dd_apps=" 413150" -_dd_pids=(123) -dd_game_focused() { [ "$focused" = 1 ]; } -dd_over_cap() { return 1; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { return 0; } -dd_zram_send() { echo "send:$1"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 -''' + body + ''' -} -tick 0 1 1 -tick 5 1 0 -tick 30 1 1 -echo "refocus:$_dd_packed" -tick 49 1 1 -tick 50 1 1 -tick 55 1 0 -tick 60 0 0 -''' - result = run_bash(harness) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) - - def monitor_harness(self): - source = SCRIPT.read_text() - start = source.index(' dd_zram_scan\n dd_memory_read\n') - stop = source.index(' dd_watch_nap\n', start) - return ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 -_dd_apps=" 413150" -_dd_pids=(123) + TICK = ''' +dd_zram_scan() { _dd_game=$game _dd_pids=(10) _dd_others=() _dd_apps=" 413150"; } +dd_game_focused() { return $focus; } +dd_memory_read() { _dd_available=$((available * 1024)) _dd_mem_total=$((7168 * 1024)) _dd_floor=$((896 * 1024)); _dd_target=$((target * 1024)) _dd_swap_room=$((4096 * 1024)) _dd_saving=500 _dd_rate=0 _dd_psi=0; } +dd_zram_trim() { echo "trim:$NOW"; _dd_trimmed=$((64 * 1024)); } +dd_zram_usage() { _dd_swap=$((64 * 1024)); } +dd_session_others() { :; } step() { :; } -dd_zram_scan() { :; } -dd_memory_read() { :; } -dd_client_pressure() { :; } -dd_client_pressure_finish() { :; } -dd_session_pressure() { :; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { [ "${readback:-1}" = 1 ]; } -dd_game_focused() { [ "$focused" = 1 ] && return 0; [ "$focused" = 2 ] && return 2; return 1; } -dd_cap_due() { [ "$cap_due" = 1 ]; } -dd_over_cap() { [ "$over_cap" = 1 ]; } -dd_zram_send() { echo "send:$1:$3"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 over_cap=$4 cap_due=$5 -''' + source[start:stop] + '\n}\n' +kill() { echo "back:$NOW"; } +game=1 focus=0 available=1500 target=1600 +run() { for NOW in $(seq "$1" "$2"); do dd_memory_tick; done; } +''' - def test_client_toggle_still_disables_automatic_compression(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 1 0 0 -tick 30 0 0 0 0 -''') + def tick(self, body): + functions = '\n'.join(function_source(name) for name in ( + 'dd_memory_need', 'dd_memory_relieve', 'dd_memory_note', 'dd_client_readback', 'dd_memory_tick')) + with tempfile.TemporaryDirectory() as tmp: + script = (functions + self.TICK + body).replace('/tmp/.dd-zram', tmp + '/ctl') + result = run_bash(('NOW=0\nset -u\n' + STATE + script).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + return result.stdout.splitlines() - def test_a_new_game_restarts_the_compression_delay(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -_dd_apps=" 413150 1245620" -tick 15 1 1 0 0 -tick 20 1 1 0 0 -echo "starting:$_dd_packed" -tick 34 1 1 0 0 -tick 35 1 1 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['starting:-1', 'send:1:client'], result.stdout.splitlines()) + def test_the_client_behind_a_game_is_trimmed_while_memory_is_short_of_the_target(self): + self.assertEqual(['trim:0', 'trim:1', 'trim:2'], self.tick('run 0 2\navailable=1700; run 3 9\n')) - def test_ram_cap_can_still_compress_an_unfocused_client(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 DD_RAM_CAP_MB=1024 -dd_zram_usage() { _dd_rss=$((768 * 1024)); } -tick 0 1 0 1 1 -echo "cap:$_dd_packed:$_dd_since:$_dd_backoff" -tick 5 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'send:1:session', 'cap:0:-1:60', 'send:0:client'], result.stdout.splitlines()) + def test_nothing_is_requested_while_the_app_holds_the_control_file(self): + self.assertEqual(['trim:3'], self.tick( + ': > /tmp/.dd-zram.hold; run 0 2\nrm /tmp/.dd-zram.hold; run 3 3\n')) - def test_game_exit_defers_restore_until_the_session_is_under_the_ram_cap(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 30 0 0 1 0 -echo "deferred:$_dd_unpack:$_dd_packed" -tick 35 0 0 0 0 -echo "restored:$_dd_unpack" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1:-1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_nothing_is_read_back_while_memory_is_still_needed(self): + self.assertEqual(['trim:0'], self.tick( + 'run 0 0\ngame=0 available=4000; dd_memory_need() { _dd_need=1 _dd_hard=0 _dd_force=0; }\n' + 'dd_memory_relieve() { dd_memory_need; }; run 1 40\n')) - def test_game_exit_defers_readback_under_pressure_even_without_a_ram_cap(self): - result = run_bash(self.monitor_harness() + """ -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 0 0 0 0 -echo "deferred:$_dd_unpack" -readback=1 -tick 30 0 0 0 0 -echo "restored:$_dd_unpack" -""") - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_game_exit_reads_the_client_back_after_a_quiet_half_minute(self): + self.assertEqual(['trim:0', 'back:30'], self.tick('run 0 0\ngame=0 available=4000; run 1 40\n')) - def test_client_in_front_of_a_running_game_is_read_back_and_compressed_again_later(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -echo "away:$_dd_packed" -tick 30 1 0 0 0 -echo "read:$_dd_packed:$_dd_unpack" -tick 35 1 0 0 0 -tick 40 1 1 0 0 -tick 55 1 1 0 0 -tick 60 1 1 0 0 -echo "again:$_dd_packed" -tick 65 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'away:20', 'send:0:client', 'read:-1:0', 'send:1:client', 'again:60', 'send:0:client'], - result.stdout.splitlines()) - - def test_unknown_focus_keeps_the_client_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 2 0 0 -tick 40 1 2 0 0 -echo "unknown:$_dd_packed:$_dd_unpack" -tick 45 1 0 0 0 -tick 48 1 2 0 0 -tick 52 1 0 0 0 -tick 56 1 0 0 0 -echo "flicker:$_dd_packed" -tick 57 1 0 0 0 -echo "read:$_dd_packed" -tick 60 0 2 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'unknown:20:1', 'flicker:20', 'send:0:client', 'read:-1'], - result.stdout.splitlines()) + def test_client_in_front_of_a_running_game_is_read_back_and_trimmed_again_later(self): + self.assertEqual(['trim:0', 'back:30', 'trim:60'], + self.tick('run 0 0\nfocus=1 available=4000; run 1 44\nfocus=0 available=1500; run 45 60\n')) def test_a_short_look_at_the_client_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 28 1 1 0 0 -tick 30 1 0 0 0 -tick 34 1 0 0 0 -echo "packed:$_dd_packed" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'packed:20'], result.stdout.splitlines()) + self.assertEqual(['trim:0'], self.tick('run 0 0\navailable=4000; run 1 34\nfocus=1; run 35 38\nfocus=0; run 39 60\n')) - def test_client_in_front_waits_for_memory_and_a_ram_cap_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 1 0 0 0 -tick 35 1 0 0 0 -echo "tight:$_dd_packed" -readback=1 -tick 40 1 0 0 0 -echo "eased:$_dd_packed" -_dd_ram_cap=1048576 -tick 60 1 1 0 0 -tick 80 1 1 0 0 -tick 85 1 0 0 0 -tick 100 1 0 0 0 -echo "capped:$_dd_packed" -tick 105 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'tight:20', 'send:0:client', 'eased:-1', 'send:1:client', 'capped:80', 'send:0:client'], - result.stdout.splitlines()) + def test_unknown_focus_keeps_the_client_compressed(self): + self.assertEqual(['trim:0'], self.tick('run 0 0\nfocus=2 available=4000; run 1 60\n')) - def test_client_in_front_without_compression_reads_nothing_back(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 0 0 0 -tick 40 1 0 0 0 -tick 45 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + def test_client_in_front_waits_for_memory(self): + self.assertEqual(['trim:0', 'back:50'], self.tick('run 0 0\nfocus=1 available=1800 target=896; run 1 49\navailable=2500; run 50 60\n')) + + def test_a_client_that_was_never_trimmed_reads_nothing_back(self): + self.assertEqual([], self.tick('focus=1 available=4000; run 0 60\n')) def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): temp = tempfile.TemporaryDirectory() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 18435ffb9c..fbc7bdc026 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -824,7 +824,6 @@ class GameEnvironmentTest(unittest.TestCase): "offline_without_anticheat": lambda command, env: command, "game_logs": lambda command, env, app_id: env, "directaudio_settings": lambda env: env, - "vram_cap": lambda env: env, "render_path_defaults": lambda *args: None, "bridge_feature_level": lambda env: None, "force_ssbs": lambda command, env: env, @@ -1304,22 +1303,6 @@ class GameEnvironmentTest(unittest.TestCase): link.symlink_to(other, target_is_directory=True) self.assertTrue(chromium(str(link))) - def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): - cap = MODULE["vram_cap"] - self.assertEqual(cap({"DD_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096; dxgi.maxSharedMemory = 4096") - self.assertEqual(cap({"DD_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192; dxgi.maxSharedMemory = 8192") - self.assertEqual(cap({"DD_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; dxgi.maxSharedMemory = 4095; d3d9.maxAvailableMemory = 4095") - self.assertEqual(cap({"DD_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") - for off in ({}, {"DD_VRAM_MB": "0"}, {"DD_VRAM_MB": "lots"}, {"DD_VRAM_MB": "²"}, {"DD_VRAM_MB": "-1"}): - self.assertNotIn("DXVK_CONFIG", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP_MB", cap(off)) - - def test_the_vram_cap_also_turns_on_the_vulkan_layer_that_holds_the_game_to_it(self): - env = MODULE["vram_cap"]({"DD_VRAM_MB": "3072", "DXVK_CONFIG": "dxgi.maxDeviceMemory = 16384"}) - self.assertEqual((env["DROIDDECK_VRAM_CAP"], env["DROIDDECK_VRAM_CAP_MB"]), ("1", "3072")) - def test_a_games_wine_sync_choice_also_reaches_its_setup_runs(self): env = {"DD_SYNC": "1", "DD_SYNC_FALLBACK": "1", "DD_FSYNC_FIRST": "0", "OTHER": "kept"} config = {"version": 1, "games": {"42": {"DD_SYNC": "0", "DD_FSYNC_FIRST": "1", "PROTON_NO_ESYNC": "1", "FEX_TSOENABLED": "1"}}} diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index d32fa1f809..aeac289acc 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -2,7 +2,9 @@ from pathlib import Path import tempfile import unittest -from tools.tests.test_client_zram_focus import SCRIPT, function_source, run_bash +from tools.tests.test_client_zram_focus import STATE, function_source, run_bash + +MB = 1024 class MemoryPressureTest(unittest.TestCase): @@ -10,629 +12,336 @@ class MemoryPressureTest(unittest.TestCase): self.directory = tempfile.TemporaryDirectory() self.addCleanup(self.directory.cleanup) self.root = Path(self.directory.name) - self.memory() - def memory(self, available=1024, swap_free=4096, total=7168, swap_total=6144, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') + def sample(self, available=3000, total=7168, stall=0, zram=(6144, 0), other=(4096, 0), stored=None, swapped_in=None): + lines = [f'MemTotal: {total * MB} kB', f'MemAvailable: {available * MB} kB', + f'SwapTotal: {(zram[0] + other[0]) * MB} kB', + f'SwapFree: {(zram[0] - zram[1] + other[0] - other[1]) * MB} kB'] + swaps = ['Filename Type Size Used Priority'] + if zram[0]: + swaps.append(f'/dev/block/zram0 partition {zram[0] * MB} {zram[1] * MB} 100') + if other[0]: + swaps.append(f'/data/swap/swapfile file {other[0] * MB} {other[1] * MB} 50') + text = "printf '%s\\n' " + ' '.join(f"'{line}'" for line in lines) + f" > {self.root}/meminfo\n" + text += "printf '%s\\n' " + ' '.join(f"'{line}'" for line in swaps) + f" > {self.root}/swaps\n" + text += f"echo 'some avg10=0.00 avg60=0.00 avg300=0.00 total={stall}' > {self.root}/pressure\n" + if swapped_in is None: + text += f'rm -f {self.root}/vmstat\n' + else: + text += f"printf '%s\\n' 'pgfault 9' 'pswpin {swapped_in * MB // 4}' 'pswpout 7' > {self.root}/vmstat\n" + if stored is None: + text += f'rm -f {self.root}/mm_stat\n' + else: + text += f'echo "{stored[0] << 20} {stored[1] << 20} {stored[1] << 20} 0 0 0 0 0 0" > {self.root}/mm_stat\n' + return text - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', 'dd_client_can_pageout', - 'dd_client_can_readback', 'dd_client_pressure', 'dd_client_pressure_result', 'dd_zram_has_room')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_pids=(123) _dd_game=1 _dd_packed=-1 _dd_pressure_at=-1 _dd_pressure_backoff=30 -rss=$((384 * 1024)) client_swap=$((512 * 1024)) reclaimed=$((128 * 1024)) -step() { :; } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$client_swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _dd_pageout_complete=${pageout_complete:-1}; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) + def run_policy(self, body, *names): + functions = '\n'.join(function_source(name) for name in ('dd_memory_read', 'dd_memory_need') + names) + for name in ('meminfo', 'swaps', 'pressure/memory', 'vmstat'): + functions = functions.replace('/proc/' + name, str(self.root / name.split('/')[0])) + functions = functions.replace('/sys/block/zram0/mm_stat', str(self.root / 'mm_stat')) + functions = functions.replace('/tmp/.dd-zram', str(self.root / 'ctl')) + result = run_bash(('NOW=0\nset -u\n' + STATE + functions + '\n' + body).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) return result.stdout.splitlines() - def test_pressure_reclaims_before_the_focus_delay_and_respects_cooldown(self): - self.assertEqual(['send:1:client', 'send:1:client'], self.run_policy(''' -SECONDS=0; dd_client_pressure -SECONDS=5; dd_client_pressure -SECONDS=29; dd_client_pressure -SECONDS=30; dd_client_pressure -''')) - - def test_no_game_or_disabled_client_compression_does_not_reclaim(self): - self.assertEqual([], self.run_policy(''' -_dd_game=0; dd_client_pressure -_dd_game=1 DD_ZRAM_CLIENT=0; dd_client_pressure -''')) - - def test_high_available_memory_does_not_reclaim_even_with_stalls(self): - self.memory(available=4096, psi='12.34') - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_psi_reclaims_with_moderate_headroom(self): - self.memory(available=2048, psi='01.23') - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_psi_still_uses_memory_headroom(self): - (self.root / 'pressure').unlink() - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_meminfo_never_reclaims_or_prefetches(self): - (self.root / 'meminfo').write_text('SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_missing_available_memory_does_not_trigger_pressure(self): - p = self.root / 'meminfo' - p.write_text('\n'.join(line for line in p.read_text().splitlines() if not line.startswith('MemAvailable:'))) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_swap_reserve_includes_the_clients_resident_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_pageout; then echo yes; else echo no; fi -''')) - - def test_client_swap_budget_excludes_file_backed_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['send:1:client'], self.run_policy(''' -rss=$((2048 * 1024)) anon=$((256 * 1024)) -dd_client_pressure -''')) - - def test_without_swap_automatic_pageout_is_disabled(self): - self.memory(swap_total=0, swap_free=0) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_recent_periodic_pageout_prevents_an_immediate_pressure_repeat(self): - self.assertEqual([], self.run_policy('_dd_packed=$SECONDS; dd_client_pressure')) - - def test_ineffective_reclaim_backs_off_and_success_resets_it(self): - self.assertEqual(['send:1:client', 'backoff:60', 'send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -SECONDS=30; dd_client_pressure -reclaimed=$((128 * 1024)) -SECONDS=60; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_readback_requires_room_for_the_swapped_client_plus_headroom(self): - self.memory(available=2048) - self.assertEqual(['yes', 'no'], self.run_policy(''' -if dd_client_can_readback; then echo yes; else echo no; fi -client_swap=$((1024 * 1024)) -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_unfinished_pageout_does_not_increase_the_ineffective_reclaim_backoff(self): - self.assertEqual(['send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 pageout_complete=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_pageout_completion_requires_a_finished_ack_from_every_live_target(self): - proc = self.root / 'proc' - proc.mkdir() - for pid in (123, 456): - (proc / str(pid)).mkdir() - source = function_source('dd_zram_wait').replace('/proc/', str(proc) + '/') - source = source.replace('/tmp/.dd-zram.ack.', str(self.root / 'ack.')) - for pending in ('done', 'running', 'not_started'): - with self.subTest(pending=pending): - (self.root / 'ack.123').write_text('1') - if pending != 'not_started': - (self.root / 'ack.456').write_text('1' if pending == 'done' else '') - result = run_bash('nap() { SECONDS=$((SECONDS + 1)); }\n' + source + - '\nSECONDS=0; dd_zram_wait 123 456; echo "$_dd_pageout_complete"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('1' if pending == 'done' else '0', result.stdout.strip()) - - def test_pressure_prevents_prefetch_even_if_the_client_would_fit(self): - self.memory(available=2048, psi='2.00') - self.assertEqual(['no'], self.run_policy('if dd_client_can_readback; then echo yes; else echo no; fi')) - - -class SessionPressureTest(unittest.TestCase): - def setUp(self): - self.directory = tempfile.TemporaryDirectory() - self.addCleanup(self.directory.cleanup) - self.root = Path(self.directory.name) - self.memory() - - def memory(self, available=1024, swap_free=6144, total=7168, swap_total=8192, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') - - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_client_can_pageout', 'dd_client_pressure', 'dd_client_pressure_result', - 'dd_session_pressure', 'dd_zram_has_room', 'dd_watch_nap', 'dd_zram_pick', 'dd_tier_note', 'dd_tier_readback')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_game=1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() _dd_pids=(999) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 -step() { :; } -meminfo=''' + repr(str(self.root / 'meminfo')) + ''' -dd_game_focused() { [ "${focused:-1}" = 1 ]; } -dd_proc_start() { _dd_start=; case " $alive " in *" $1 "*) _dd_start=$started; return 0 ;; esac; return 1; } -nap() { echo "nap:$1"; } -dd_session_others() { _dd_session=(321 654); } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); next_available=${available_after:-$(( $(awk '/^MemAvailable:/ { print $2 }' "$meminfo") / 1024 + 128 ))}; sed -i "s/^MemAvailable:.*/MemAvailable: $((next_available * 1024)) kB/" "$meminfo"; _dd_pageout_complete=$complete; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - - def test_low_headroom_compresses_the_game_session_at_most_every_30_seconds(self): - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -SECONDS=10; dd_session_pressure -SECONDS=29; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_pressure_policy_is_independent_of_ram_size(self): - for total, expected in ((11264, ['send:1:session']), (12288, ['send:1:session']), (16384, ['send:1:session'])): - with self.subTest(total=total): - self.memory(total=total) - self.assertEqual(expected, self.run_policy('dd_session_pressure')) - - def test_large_device_with_real_headroom_does_not_reclaim(self): - self.memory(total=16384, available=5120, psi='12.34') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_large_device_with_psi_and_moderate_headroom_reclaims(self): - self.memory(total=16384, available=3072, psi='1.23') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_a_fast_fall_on_a_large_device_reclaims_above_the_fixed_headroom(self): - self.memory(total=15255, available=6176) - falling = self.root / 'falling' - falling.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {5367 * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - meminfo = self.root / 'meminfo' - self.assertEqual(['send:1:session'], self.run_policy( - f'cp {falling} {meminfo}\nSECONDS=5; dd_session_pressure')) - - def test_a_fall_split_across_one_second_polls_still_reclaims(self): - self.memory(total=15255, available=6300) - steps = [] - for second, available in ((5, 6100), (6, 6020), (7, 5940), (8, 5860), (9, 5780)): - sample = self.root / f'meminfo-{second}' - sample.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - steps.append(f'cp {sample} {self.root / "meminfo"}; SECONDS={second}; dd_session_pressure') - self.assertEqual(['send:1:session'], self.run_policy('\n'.join(steps))) - - def test_no_game_does_not_compress_the_session(self): - self.assertEqual([], self.run_policy('_dd_game=0; dd_session_pressure')) - - def test_disabled_idle_compression_does_not_compress_the_session(self): - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_disabled_idle_compression_signals_only_launcher_processes(self): - sender = (function_source('dd_zram_send') + '\n' + function_source('dd_zram_finish')).replace('/tmp/.dd-zram', str(self.root / 'control')) - self.assertEqual(['kill:-URG 999 998', 'mode:1'], self.run_policy(''' -_dd_pids=(999 998) -kill() { echo "kill:$*"; } -dd_zram_wait() { _dd_pageout_complete=1; } -dd_zram_scan() { :; } -''' + sender + ''' -DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure -echo "mode:$(cat ''' + str(self.root / 'control') + ''')" -''')) - - def test_disabled_idle_compression_reclaims_only_the_launcher_before_focus(self): - self.memory(available=1700) - self.assertEqual(['send:1:client'], self.run_policy(''' -DD_ZRAM_IDLE=0 focused=0 -dd_client_pressure -dd_session_pressure -''')) - - def test_disabled_idle_compression_respects_launcher_setting_and_threshold(self): - self.memory(available=1700) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0 DD_ZRAM_CLIENT=0; dd_client_pressure; dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_game_reclaim_requires_focus(self): - self.assertEqual([], self.run_policy('focused=0; dd_session_pressure')) - - def test_game_reclaim_runs_when_focus_is_unknown(self): - launch = self.root / 'launch' - (launch / 'agent').mkdir(parents=True) - body = function_source('dd_game_focused') + f'\nDD_LAUNCH_DIR={launch} _dd_apps=7\n' - self.assertEqual(['send:1:session'], self.run_policy(body + 'dd_session_pressure')) - (launch / 'agent' / 'focus.json').write_text('{"focusedApp": 9}') - self.assertEqual([], self.run_policy(body + 'dd_session_pressure')) - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - (launch / 'agent' / 'focus.json').unlink() - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - - def test_launcher_pressure_remains_available_on_larger_devices(self): - self.memory(total=15360, available=1400) - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_enough_available_memory_does_not_compress_even_with_stalls(self): - self.memory(available=3072, psi='5.00') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_stalls_with_moderate_headroom_compress_before_the_hard_limit(self): - self.memory(available=2048, psi='1.50') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_moderate_headroom_without_stalls_waits(self): - self.memory(available=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_same_second_memory_read_preserves_the_pressure_baseline(self): - self.memory(available=2048) - meminfo = self.root / 'meminfo' - self.assertEqual(['1048576:524288:2097152'], self.run_policy(f''' -SECONDS=100 -_dd_sample_at=100 _dd_sample_available=2097152 _dd_growth=0 _dd_fall=524288 -sed -i 's/MemAvailable: 2097152 kB/MemAvailable: 1048576 kB/' {meminfo} -dd_memory_read -echo "$_dd_available:$_dd_fall:$_dd_sample_available" -''')) - - def test_game_reading_back_most_of_a_pageout_skips_and_doubles_the_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:60', - 'send:1:session', 'backoff:30'], self.run_policy(''' -pushed=$((512 * 1024)) -SECONDS=0; dd_session_pressure -swap=$((swap / 4)) -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=150; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_repeated_read_back_keeps_doubling_up_to_five_minutes(self): - self.assertEqual(['backoff:300'], self.run_policy(''' -_dd_tier_backoff=240 _dd_tier_at=0 _dd_tier_targets=(999) _dd_tier_swaps=($((1024 * 1024))) _dd_tier_starts=(100) _dd_tier_pushed=$((1024 * 1024)) swap=0 -SECONDS=240; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_no_gain_pageout_doubles_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:120'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_meaningful_available_gain_keeps_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:30', 'send:1:session', 'backoff:30'], self.run_policy(''' -available_after=1300 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1600 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_recovered_available_memory_resets_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'backoff:30', 'send:1:session'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=2000 -sed -i "s/^MemAvailable:.*/MemAvailable: 2048000 kB/" "$meminfo" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1024 -sed -i "s/^MemAvailable:.*/MemAvailable: 1048576 kB/" "$meminfo" -SECONDS=60; dd_session_pressure -''')) - - def test_critical_memory_still_compresses_after_a_no_gain_pass(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_a_no_gain_pass_still_skips_memory_the_game_read_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -_dd_tier_backoff=300 -SECONDS=0; dd_session_pressure -SECONDS=20; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_still_backs_off_when_the_game_reads_its_pageout_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=59; dd_session_pressure -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -''')) - - def test_nearly_out_of_memory_retries_a_skipped_pageout_after_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -_dd_tier_backoff=300 -saved=$rss; rss=$((128 * 1024)) -SECONDS=330; dd_session_pressure -rss=$saved -SECONDS=359; dd_session_pressure -SECONDS=360; dd_session_pressure -''')) - - def test_small_swap_headroom_skips_the_pageout(self): - self.memory(swap_free=1536, swap_total=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_file_backed_resident_memory_does_not_consume_the_swap_budget(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual(['send:1:session'], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1024 * 1024)) -dd_session_pressure -''')) - - def test_anonymous_memory_and_pending_client_still_need_the_full_swap_reserve(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((2048 * 1024)) -dd_session_pressure -''')) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1536 * 1024)) _dd_client_reserve=$((512 * 1024)) -dd_session_pressure -''')) - - def test_small_session_is_left_alone(self): - self.assertEqual([], self.run_policy('rss=$((128 * 1024)); dd_session_pressure')) - - def test_watch_polls_every_second_near_the_limit_and_stops_when_critical(self): - self.memory(available=2560) - self.assertEqual(['nap:1', 'nap:1', 'nap:1', 'nap:1', 'nap:1'], self.run_policy('dd_watch_nap')) - self.memory(available=1024) - self.assertEqual(['nap:1'], self.run_policy('_dd_available=$((2560 * 1024)); dd_watch_nap')) - self.memory(available=4096) - self.assertEqual(['nap:5'], self.run_policy('dd_watch_nap')) - self.assertEqual(['nap:5'], self.run_policy('_dd_game=0; dd_watch_nap')) - - def test_session_push_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'pids:321 654', 'client:-1:-1'], self.run_policy(''' -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_launcher_compression_turned_off_keeps_the_launcher_out(self): - self.assertEqual(['pids:321 654', 'client:-1:-1'], self.run_policy(''' -DD_ZRAM_CLIENT=0 -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')[1:]) - - def test_low_ram_devices_compress_with_a_quarter_of_memory_left(self): - self.memory(available=1700) - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - - def test_a_compressed_process_that_exits_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -alive=""; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_a_process_that_starts_after_a_pageout_is_not_in_its_read_back(self): - self.assertEqual(['send:1:session', 'targets:321 654', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -echo "targets:${_dd_tier_targets[*]}" -alive="999 1234" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_read_back_wait_holds_above_the_critical_level(self): - self.assertEqual(['send:1:session', 't:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure; echo t:60 -SECONDS=90; dd_session_pressure -''')) - - def test_a_no_gain_pageout_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'backoff:60', 'client:-1:-1'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): - self.assertEqual(['send:1:session', 'client:-1:-1'], self.run_policy(''' -complete=0 -SECONDS=0; dd_session_pressure -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - - def test_a_reused_process_id_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -started=200; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_process_start_comes_from_stat_and_zombies_have_none(self): - stat = self.root / 'stat' - source = function_source('dd_proc_start').replace('/proc/$1/stat', str(stat)) - fields = ' '.join(['0'] * 17) - for state, expected in (('S', ['ok:4242']), ('Z', ['gone:'])): - with self.subTest(state=state): - stat.write_text(f'77 (Wow (arm64).exe) {state} 1 {fields} 4242 99 0\n') - result = run_bash(source + '\nif dd_proc_start 77; then echo "ok:$_dd_start"; else echo "gone:$_dd_start"; fi') - self.assertEqual(expected, result.stdout.split()) - stat.unlink() - result = run_bash(source + '\ndd_proc_start 77 || echo gone') - self.assertEqual(['gone'], result.stdout.split()) - - -class ReclaimDispatchTest(unittest.TestCase): - def run_cycle(self, client=1, game=1, anonymous=384, complete=1, reclaimed=128, body=None, available=1024, fall=0, tick=0): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - (root / 'meminfo').write_text( - f'MemTotal: 7340032 kB\nMemAvailable: {available * 1024} kB\n' - 'SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - (root / 'pressure').write_text('some avg10=0.00 avg60=0.00 avg300=0.00 total=0\n') - names = ('dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_zram_has_room', 'dd_client_can_pageout', 'dd_client_pressure', - 'dd_client_pressure_result', 'dd_client_pressure_finish', - 'dd_session_pressure', 'dd_zram_send', 'dd_zram_finish', 'dd_zram_pick') - source = '\n'.join(function_source(name) for name in names) - source = source.replace('/proc/meminfo', str(root / 'meminfo')) - source = source.replace('/proc/pressure/memory', str(root / 'pressure')) - source = source.replace('/tmp/.dd-zram', str(root / 'ctl')) - monitor = SCRIPT.read_text() - start = monitor.index(' _dd_preserved_growth=$_dd_growth', monitor.index('while kill -0 $$')) - stop = monitor.index(' _dd_focus=1\n', start) - cycle = monitor[start:stop] if body is None else body - script = f''' -set -u -DD_ZRAM_CLIENT={client} _dd_game={game} _dd_pids=(123) _dd_others=(321) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -_dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 -_dd_client_reserve=0 client_rss=393216 client_anon={anonymous * 1024} -step() {{ :; }} -dd_session_others() {{ _dd_session=(321); }} -dd_zram_scan() {{ _dd_pids=(456); }} -nap() {{ echo "nap:$*:at:$NOW"; }} -dd_zram_usage() {{ - if [ "$1" = 123 ]; then - _dd_rss=$client_rss _dd_anon=$client_anon _dd_swap=0 - else - _dd_rss=3145728 _dd_anon=1572864 _dd_swap=0 - fi -}} -kill() {{ echo "signal:$*:at:$NOW"; NOW=$((NOW + {tick})); }} -dd_zram_wait() {{ - echo "wait:$*:at:$NOW" - NOW=$((NOW + 12)) - _dd_pageout_complete={complete} - [ "$1" != 123 ] || client_rss=$((client_rss - {reclaimed * 1024})) -}} -dd_tier_note() {{ :; }} -dd_game_focused() {{ :; }} -''' + source + f''' -dd_memory_read -_dd_fall={fall * 1024} -''' + cycle + ''' -echo "client:$_dd_pressure_backoff:${_dd_client_reserve:-0}:${_dd_client_pending:-0}" + def test_the_floor_follows_device_memory_within_limits(self): + body = ''.join(self.sample(total=total) + 'dd_memory_read; echo $((_dd_floor / 1024))\n' + for total in (3584, 7168, 15360)) + self.assertEqual(['640', '896', '1280'], self.run_policy(body)) + + def test_the_target_grows_with_how_fast_memory_is_falling(self): + body = (self.sample(available=3000) + 'dd_memory_read; echo $_dd_rate $((_dd_target / 1024))\n' + + self.sample(available=2800) + 'NOW=1; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + self.sample(available=3400) + 'NOW=3; dd_memory_read; echo $((_dd_rate / 1024))\n') + self.assertEqual(['0 896', '200 2896', '150 2396', '112'], self.run_policy(body)) + + def test_memory_the_monitor_freed_itself_does_not_hide_a_fall(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=$((300 * 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $_dd_freed\n') + self.assertEqual(['150 0'], self.run_policy(body)) + + def test_two_reads_in_the_same_second_keep_the_sample(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=4096\n' + + self.sample(available=1000) + 'dd_memory_read; echo $_dd_rate $_dd_freed $_dd_sample_available\n') + self.assertEqual([f'0 4096 {2000 * MB}'], self.run_policy(body)) + + def test_stall_time_becomes_a_share_of_the_interval(self): + body = (self.sample(stall=1000) + 'dd_memory_read; echo $_dd_psi\n' + + self.sample(stall=41000) + 'NOW=2; dd_memory_read; echo $_dd_psi\n' + + 'NOW=3; dd_memory_read; echo $_dd_psi\n') + self.assertEqual(['0', '200', '0'], self.run_policy(body)) + + def test_room_counts_zram_only_and_keeps_a_reserve(self): + body = (self.sample(zram=(6144, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(6144, 5632)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(512, 0), other=(0, 0)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + f'rm {self.root}/swaps\n' + + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n') + self.assertEqual(['4352', '-256', '-128', '384', '2560'], self.run_policy(body)) + + def test_memory_read_back_from_swap_is_remembered_for_half_a_minute(self): + body = '_dd_page_kb=4\n' + ''.join( + f'NOW={now}\n' + self.sample(swapped_in=total) + 'dd_memory_read; echo $((_dd_returned / 1024))\n' + for now, total in ((0, 500), (1, 800), (2, 800), (16, 800), (17, None), (18, 900), (19, 1000), (60, 1000))) + self.assertEqual(['0', '300', '290', '154', '149', '144', '239', '0'], self.run_policy(body)) + + def test_saving_comes_from_what_zram_really_stores(self): + body = ''.join(self.sample(stored=stored) + 'dd_memory_read; echo $_dd_saving\n' + for stored in (None, (32, 30), (1000, 250), (1000, 950), (1000, 20))) + self.assertEqual(['600', '600', '750', '167', '833'], self.run_policy(body)) + + def need(self, available, rate=0, psi=0): + return (self.sample(available=available) + + f'dd_memory_read; _dd_rate=$(({rate} * 1024)) _dd_psi={psi}\n' + '_dd_target=$((_dd_floor + _dd_rate * 10))\n' + 'dd_memory_need; echo $((_dd_need / 1024)) $((_dd_hard / 1024)) $_dd_force\n') + + def test_steady_memory_above_the_floor_needs_nothing(self): + self.assertEqual(['0 0 0'], self.run_policy(self.need(2000))) + + def test_memory_under_the_floor_must_be_freed(self): + self.assertEqual(['96 96 0'], self.run_policy(self.need(800))) + + def test_a_slow_fall_is_met_ten_seconds_ahead(self): + self.assertEqual(['196 0 0'], self.run_policy(self.need(1000, rate=30))) + + def test_a_fast_fall_is_matched_once_memory_is_under_two_fifths(self): + self.assertEqual(['0 0 0', '200 0 0', '0 0 0'], + self.run_policy(self.need(2500, rate=20) + self.need(2500, rate=100) + self.need(4000, rate=100))) + + def test_stalls_make_a_fall_urgent(self): + self.assertEqual(['200 0 0', '200 200 0', '0 0 0'], + self.run_policy(self.need(2500, rate=100) + self.need(2500, rate=100, psi=100) + + self.need(2000, psi=900))) + + def test_half_the_floor_forces(self): + self.assertEqual(['446 446 0', '456 456 1'], self.run_policy(self.need(450) + self.need(440))) + + RELIEVE = ''' +step() { echo "step:$*"; } +dd_session_others() { echo others; _dd_session=(70 80); } +dd_zram_trim() { echo "trim:$1:$(($2 / 1024)):${*:3}"; _dd_trimmed=${paged:-$2}; } +relieve() { dd_memory_read; _dd_returned=${returned:-0}; _dd_rate=$((${2:-0} * 1024)) _dd_target=$((_dd_floor + ${2:-0} * 10240)); dd_memory_relieve; } +_dd_pids=(10 20) _dd_game=1 _dd_focus=0 _dd_saving=500 ''' - result = run_bash('NOW=0\n' + script.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - def test_both_requests_are_sent_before_either_wait(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], self.run_cycle()) + def relieve(self, body): + return self.run_policy(self.RELIEVE + body, 'dd_memory_relieve', 'dd_memory_note') - def test_disabled_client_is_never_signalled_or_waited_for(self): - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0)) + def test_a_fall_trims_the_client_behind_a_game_by_what_zram_gives_back(self): + self.assertEqual(['trim:2:326:10 20', f'{196 * MB} {334506 * 600 // 1000} 334506'], self.relieve( + self.sample(available=1000) + 'relieve 1000 30; echo $_dd_need $_dd_freed $_dd_client_out\n')) - def test_no_game_requests_nothing(self): - self.assertEqual(['client:30:0:0'], self.run_cycle(game=0)) + def test_the_client_in_front_is_left_alone_until_memory_is_under_the_floor(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_a_client_with_no_anonymous_pages_still_finishes_its_request(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], - self.run_cycle(anonymous=0)) + def test_unknown_focus_still_trims_the_client(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve(self.sample(available=1000) + '_dd_focus=2; relieve 1000 30\n')) - def test_falling_headroom_survives_a_tick_between_requests(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:1', - 'wait:321:at:2', 'wait:123:at:14', 'client:30:0:0'], - self.run_cycle(available=2304, fall=512, tick=1)) + def test_the_client_is_not_trimmed_right_after_it_was_read_back(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve( + self.sample(available=1000) + 'NOW=100 _dd_back_at=80; relieve 1000 30\nNOW=110; relieve 1000 30\n')) - def test_deferred_ineffective_reclaim_still_doubles_the_backoff(self): - self.assertEqual('client:60:0:0', self.run_cycle(reclaimed=0)[-1]) + def test_without_a_game_only_the_floor_trims(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_game=0 _dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_deferred_incomplete_reclaim_does_not_double_the_backoff(self): - self.assertEqual('client:30:0:0', self.run_cycle(reclaimed=0, complete=0)[-1]) + def test_the_session_gives_what_the_client_could_not(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:256:70 80', 'trim:2:660:10 20', 'trim:2:256:70 80'], + self.relieve(self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) - def test_explicit_combined_send_keeps_its_synchronous_wait(self): - self.assertEqual(['signal:-URG 321 123:at:0', 'wait:321 123:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 1 cap game\n')) - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0, body='dd_zram_send 1 cap game\n')) + def test_the_session_gets_what_the_client_left_of_the_pass(self): + self.assertEqual(['trim:3:1024:10 20', 'others', 'trim:3:24:70 80'], self.relieve( + self.sample(available=100) + f'paged={1000 * MB}; relieve 100\n')) - def test_readback_keeps_its_synchronous_delay(self): - self.assertEqual(['signal:-URG 123:at:0', 'nap:5:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 0 readback client\n')) + def test_memory_that_keeps_coming_back_is_taken_off_what_a_pass_may_move(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:156:70 80', 'trim:2:660:10 20', 'trim:2:24:10 20'], self.relieve( + self.sample(available=500) + f'paged={256 * MB}\nreturned={100 * MB}; relieve 500\n' + + f'NOW=1 returned={300 * MB}; relieve 500\nNOW=2 returned={1000 * MB}; relieve 500\n')) - def test_usage_sums_anonymous_rss_and_falls_back_per_process(self): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - for pid, contents in ((123, 'VmRSS: 2000 kB\nRssAnon: 300 kB\nVmSwap: 100 kB\n'), - (321, 'VmRSS: 4000 kB\nVmSwap: 200 kB\n'), - (654, 'VmRSS: 1000 kB\nRssAnon: 0 kB\n')): - (root / str(pid)).mkdir() - (root / str(pid) / 'status').write_text(contents) - source = function_source('dd_zram_usage').replace('/proc/', str(root) + '/') - result = run_bash(source + '\ndd_zram_usage 123 321 654 > /dev/null; echo "$_dd_rss:$_dd_anon:$_dd_swap"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('7000:4300:300', result.stdout.strip()) + def test_forcing_moves_memory_whatever_came_back(self): + self.assertEqual(['trim:3:993:10 20', 'others', 'trim:3:993:70 80'], self.relieve( + self.sample(available=300) + f'paged=0 returned={2048 * MB}; relieve 300\n')) + + def test_the_session_is_scanned_again_after_a_new_process_scan(self): + self.assertEqual(['others', 'others'], [line for line in self.relieve( + self.sample(available=500) + f'paged={256 * MB}; relieve 500\n_dd_scan_at=5; relieve 500\n') if line == 'others']) + + def test_forcing_ignores_heat_once_in_ten_seconds(self): + lines = self.relieve(self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=5; relieve 300\nNOW=10; relieve 300\n') + self.assertEqual(['3', '3', '2', '2', '3', '3'], [line.split(':')[1] for line in lines if line.startswith('trim')]) + self.assertIn('trim:3:993:70 80', lines) + + def trims(self, body): + return [line.split(':')[2] for line in self.relieve(body) if line.startswith('trim') and line.endswith('10 20')] + + def test_passes_that_free_little_come_further_and_further_apart(self): + passes = ''.join(f'NOW={now}; relieve 500; echo at:{now}\n' for now in (0, 4, 5, 14, 15, 34, 35)) + lines = self.relieve(self.sample(available=500) + f'paged={8 * MB}\n' + passes) + self.assertEqual(['0', '5', '15', '35'], + [after.split(':')[1] for line, after in zip(lines, lines[1:] + ['']) if line == 'trim:2:256:70 80']) + + def test_the_wait_between_passes_stops_at_a_minute(self): + self.assertEqual(['60 195'], self.relieve( + self.sample(available=500) + f'paged={8 * MB}\nfor NOW in 0 5 15 35 75 135; do relieve 500; done > /dev/null\n' + 'echo $_dd_rest $_dd_rest_until\n')) + + def test_a_pass_that_frees_enough_is_followed_at_once(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) + + def test_memory_that_keeps_falling_ends_the_wait(self): + self.assertEqual(['326', '526'], self.trims( + self.sample(available=700) + f'paged={8 * MB}; relieve 700\nNOW=1; relieve 700\n' + + self.sample(available=600) + 'NOW=2; relieve 600\n' + self.sample(available=580) + 'NOW=3; relieve 580\n')) + + def test_forcing_does_not_wait(self): + self.assertEqual(['993', '993'], self.trims( + self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=1; relieve 300\n')) + + def test_the_wait_is_forgotten_once_memory_is_back(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={8 * MB}; relieve 500\n' + + self.sample(available=3000) + 'NOW=1; relieve 3000\n' + self.sample(available=500) + 'NOW=2; relieve 500\n')) + + def test_trims_stop_at_the_room_zram_has(self): + self.assertEqual(['trim:2:100:10 20', 'step:memory: available 800 MB and zRAM has no room left'], self.relieve( + self.sample(available=800, zram=(6144, 5276)) + 'relieve 800\n' + + self.sample(available=800, zram=(6144, 5400)) + 'relieve 800\nNOW=30; relieve 800\n')) + + def test_small_trims_are_not_logged(self): + self.assertEqual(['step:memory: available 1000 MB, falling 30 MB/s, compressed 20 MB of the client and 0 MB of the session'], + [line for line in self.relieve( + self.sample(available=1000) + f'paged={10 * MB}\nrelieve 1000 30; dd_memory_note\n' + 'NOW=1; relieve 1000 30; dd_memory_note\nNOW=2; dd_memory_note\n') + if line.startswith('step')]) + + TRIM = ''' +declare -A anon=() reply=() born=() +nap() { :; } +dd_pid_key() { _dd_key=$1.${born[$1]:-0}; } +dd_zram_usage() { _dd_anon=${anon[$1]}; } +kill() { + echo "signal:$2:$(< "$ROOT/ctl")" + case ${reply[$2]} in + deaf) ;; + gone) return 1 ;; + *) printf %s "${reply[$2]}" > "$ROOT/ctl.trim.$2" ;; + esac +} +''' + + def trim(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.TRIM + body + '\nls "$ROOT"; cat "$ROOT/ctl"', 'dd_memory_relieved', 'dd_zram_trim') + + def test_a_trim_spends_its_budget_across_processes_in_order(self): + self.assertEqual(['signal:10:2 100000', 'signal:20:2 60000', '100000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=40000 [20]=60000 [30]=1) +dd_zram_trim 2 100000 10 20 30 +echo $_dd_trimmed''')) + + def test_a_trim_skips_small_and_gone_processes_and_stops_when_little_is_left(self): + self.assertEqual(['signal:20:3 50000', 'signal:30:3 50000', 'signal:40:3 50000', '47000', 'ctl', '2 0'], self.trim(''' +anon=([10]=4096 [20]=500000 [30]=500000 [40]=500000 [50]=500000) reply=([20]=gone [30]=0 [40]=47000 [50]=1) +dd_zram_trim 3 50000 10 20 30 40 50 +echo $_dd_trimmed''')) + + def test_a_process_that_never_answers_is_left_alone_for_a_minute(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', '500', 'signal:20:2 9000', 'signal:10:2 9000', + 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +NOW=59 _dd_pass_at=59; dd_zram_trim 2 9000 10 20 +NOW=60 _dd_pass_at=60; dd_zram_trim 2 9000 10 20''')) + + def test_a_new_process_with_a_silent_ones_number_is_asked(self): + self.assertEqual(['signal:10:2 9000', 'signal:10:2 9000', '1', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=deaf) +dd_zram_trim 2 9000 10 +NOW=5 _dd_pass_at=5; dd_zram_trim 2 9000 10 +born[10]=7 +dd_zram_trim 2 9000 10 +NOW=62 _dd_pass_at=62 anon=(); dd_zram_trim 2 9000 +echo ${#_dd_deaf[@]}''')) + + def test_one_pass_waits_five_seconds_in_all(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=- [20]=deaf [30]=deaf) +_dd_polls=215 +dd_zram_trim 2 9000 10 +dd_zram_trim 2 9000 20 30''')) + + def test_one_pass_ends_six_seconds_after_it_began_however_slow_the_polls(self): + self.assertEqual(['signal:10:2 9000', '6', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +nap() { NOW=$((NOW + 1)); } +dd_zram_trim 2 9000 10 20 +echo $_dd_polls''')) + + def test_a_trim_stops_once_memory_is_back_where_it_should_be(self): + self.assertEqual(['signal:10:2 9000', '500', 'signal:10:2 9000', 'signal:20:2 8500', '1000', 'ctl', 'meminfo', '2 0'], + self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=500 [20]=500) +available() { echo "MemAvailable: $1 kB" > "$ROOT/meminfo"; } +signal=$(declare -f kill) +eval "raw_${signal}" +kill() { raw_kill "$@"; available $((after)); } +available 800000 +_dd_goal=900000 after=900000 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +available 800000 +after=899999 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed''')) + + def test_a_held_control_file_keeps_its_acknowledgements(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.hold', 'ctl.trim.10', '2 9000'], self.trim(''' +anon=([10]=500000) +kill() { echo "signal:$2:$(< "$ROOT/ctl")"; : > "$ROOT/ctl.hold"; printf 1 > "$ROOT/ctl.trim.$2"; } +dd_zram_trim 2 9000 10''')) + + def test_a_trim_leaves_the_acknowledgement_of_a_suspend_page_out_alone(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.ack.10', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=9000) +: > "$ROOT/ctl.ack.10" +dd_zram_trim 2 9000 10''')) + + READBACK = ''' +step() { echo "step:$*"; } +kill() { echo "signal:$*:$(< "$ROOT/ctl")"; } +dd_zram_usage() { _dd_swap=$((swap * 1024)); } +back() { dd_memory_read; _dd_rate=0 _dd_target=$_dd_floor; dd_client_readback; } +_dd_pids=(10 20) _dd_game=0 _dd_client_out=4096 _dd_trim_at=0 swap=400 NOW=30 +''' + + def readback(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.READBACK + body, 'dd_client_readback') + + def test_the_client_is_read_back_once_memory_can_hold_it_with_a_floor_to_spare(self): + self.assertEqual(['step:memory: available 2192 MB, reading 400 MB of the client back', 'signal:-URG 10 20:0', + f'0 {-400 * MB * 600 // 1000} 30'], self.readback( + self.sample(available=2191) + 'back\n' + self.sample(available=2192) + 'back\n' + + 'echo $_dd_client_out $_dd_freed $_dd_back_at\nback\n')) + + def test_nothing_is_read_back_right_after_a_trim(self): + self.assertEqual([], self.readback(self.sample(available=4000) + 'NOW=29; back\n')) + + def test_a_running_game_keeps_the_client_compressed_until_the_client_is_in_front(self): + self.assertEqual(['signal:-URG 10 20:0'], [line for line in self.readback( + self.sample(available=4000) + '_dd_game=1\nback\n_dd_away=27; back\n_dd_away=25; back\n') + if line.startswith('signal')]) + + def test_a_client_the_kernel_already_brought_back_needs_no_request(self): + self.assertEqual(['0'], self.readback(self.sample(available=4000) + 'swap=8; back; echo $_dd_client_out\n')) if __name__ == '__main__': diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index 8e4af1aa26..bf1e8391cd 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -60,6 +60,19 @@ static long status(const char *key) { return v; } +static long resident(char *start, size_t size) { + long page = sysconf(_SC_PAGESIZE), kb = 0; + int fd = open("/proc/self/pagemap", O_RDONLY); + if (fd < 0) exit(8); + for (size_t i = 0; i < size; i += page) { + uint64_t entry; + if (pread(fd, &entry, sizeof(entry), ((uintptr_t)start + i) / page * sizeof(entry)) != sizeof(entry)) exit(8); + if (entry >> 63) kb += page / 1024; + } + close(fd); + return kb; +} + static void send_request(char mode) { int fd = open(ctl, O_WRONLY | O_TRUNC); if (fd < 0 || write(fd, &mode, 1) != 1) exit(3); @@ -91,6 +104,25 @@ static void request(char mode) { usleep(1000000); } +static long trim(char mode, long kb) { + char ack[256], text[32]; + snprintf(ack, sizeof(ack), "%s.trim.%d", ctl, getpid()); + unlink(ack); + FILE *f = fopen(ctl, "w"); + if (!f) exit(3); + fprintf(f, "%c %ld\n", mode, kb); + fclose(f); + kill(getpid(), SIGURG); + for (int i = 0; i < 1200; i++) { + f = fopen(ack, "r"); + char *line = f ? fgets(text, sizeof(text), f) : NULL; + if (f) fclose(f); + if (line) return atol(text); + usleep(10000); + } + exit(5); +} + static uint64_t sum(const unsigned char *p, size_t n) { uint64_t s = 0; for (size_t i = 0; i < n; i += 64) s = s * 31 + p[i]; @@ -167,6 +199,80 @@ int main(int argc, char **argv) { int status_code; waitpid(child, &status_code, 0); printf("childack %d\n", WIFEXITED(status_code) && WEXITSTATUS(status_code) == 0); + } else if (!strcmp(argv[4], "trim")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + printf("first %ld\n", trim('2', 8192)); + printf("second %ld\n", trim('2', 8192)); + printf("swapped %ld\n", status("VmSwap:")); + printf("rest %ld\n", trim('2', 1L << 30)); + printf("touched %d\n", sum(shared, size) != 0); + printf("hot %ld\n", trim('2', 1L << 30)); + printf("forced %ld\n", trim('3', 1L << 30)); + request('0'); + printf("again %ld\n", trim('2', 1L << 30)); + printf("intact %d\n", sum(data, size) == before); + return 0; + } else if (!strcmp(argv[4], "trim-small")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + long total = 0, largest = 0; + for (int i = 0; i < 112; i++) { + long step = trim('2', 512); + total += step; + if (step > largest) largest = step; + } + printf("small %ld\n", total); + printf("largest %ld\n", largest); + return 0; + } else if (!strcmp(argv[4], "trim-sparse")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + size_t wide = 32UL << 20; + char *thin = mmap(NULL, wide, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (thin == MAP_FAILED) exit(7); + for (size_t i = 0; i < wide; i += 2 * page) thin[i] = 1; + printf("sparse %ld\n", resident(thin, wide)); + for (int i = 0; i < 240; i++) trim('2', 512); + printf("kept %ld\n", resident(thin, wide)); + return 0; + } else if (!strcmp(argv[4], "hold")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + char hold[256]; + snprintf(hold, sizeof(hold), "%s.hold", ctl); + FILE *f = fopen(hold, "w"); + if (!f) exit(3); + fclose(f); + printf("empty %ld\n", trim('2', 512)); + f = fopen(hold, "w"); + if (!f) exit(3); + fputs("1", f); + fclose(f); + f = fopen(ctl, "w"); + if (!f) exit(3); + fputs("2 512\n", f); + fclose(f); + kill(getpid(), SIGURG); + wait_ack(); + printf("held %ld\n", status("VmSwap:")); + unlink(hold); + return 0; + } else if (!strcmp(argv[4], "trim-fork")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + fflush(stdout); + pid_t child = fork(); + if (child < 0) exit(6); + if (child == 0) { + for (size_t i = 0; i < size; i += page) data[i]++; + printf("inline_trim %ld\n", trim('2', 1L << 30)); + fflush(stdout); + _exit(0); + } + waitpid(child, NULL, 0); + printf("worker_trim %ld\n", trim('2', 1L << 30)); + return 0; } else if (!strcmp(argv[4], "burst")) { send_request('0'); usleep(10000); @@ -280,8 +386,9 @@ class ZramPreloadTest(unittest.TestCase): def setUp(self): self.ctl.write_text("0") - for ack in self.dir.glob("ctl.ack.*"): + for ack in [*self.dir.glob("ctl.ack.*"), *self.dir.glob("ctl.trim.*")]: ack.unlink() + (self.dir / "ctl.hold").unlink(missing_ok=True) def run_program(self, program=None, mb=48, cycles=1, *extra): environment = dict(os.environ, LD_PRELOAD=str(self.lib)) @@ -347,7 +454,9 @@ class ZramPreloadTest(unittest.TestCase): os.kill(process.pid, signal.SIGURG) os.kill(process.pid, signal.SIGUSR1) self.assertEqual(f"received {_ + 1}", process.stdout.readline().strip()) - output, _ = process.communicate(timeout=10) + process.stdin.close() + process.wait(timeout=10) + output = process.stdout.read() values = dict(line.split() for line in output.splitlines()) self.assertNotEqual(0, int(values["urg"])) self.assertNotEqual(0, int(values["usr"])) @@ -388,6 +497,50 @@ class ZramPreloadTest(unittest.TestCase): out = self.run_program(None, 48, 0, "fork") self.assertEqual([1], out["childack"]) + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_stops_at_its_budget_and_continues_where_it_stopped(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(7168 < out["first"][0] <= 8192, out) + self.assertTrue(7168 < out["second"][0] <= 8192, out) + self.assertGreater(out["swapped"][0], 15 * 1024) + self.assertGreater(out["rest"][0], 40 * 1024) + self.assertEqual([1], out["intact"]) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_leaves_memory_that_came_straight_back(self): + out = self.run_program(None, 32, 0, "trim") + self.assertLess(out["hot"][0], 4 * 1024, out) + self.assertGreater(out["forced"][0], 28 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_requested_read_back_does_not_count_as_heat(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(28 * 1024 < out["again"][0] < 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_budgets_smaller_than_a_chunk_still_reach_all_of_it(self): + out = self.run_program(None, 32, 0, "trim-small") + self.assertLessEqual(out["largest"][0], 512) + self.assertGreater(out["small"][0], 52 * 1024) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_small_budgets_reach_the_end_of_a_thinly_used_chunk(self): + out = self.run_program(None, 8, 0, "trim-sparse") + self.assertEqual([16 * 1024], out["sparse"]) + self.assertLess(out["kept"][0], 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_a_request_in_the_hold_file_wins_over_the_control_file(self): + out = self.run_program(None, 32, 0, "hold") + self.assertTrue(0 < out["empty"][0] <= 512, out) + self.assertGreater(out["held"][0], 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_process_without_a_worker_trims_in_small_steps(self): + out = self.run_program(None, 48, 0, "trim-fork") + self.assertTrue(16 * 1024 < out["inline_trim"][0] <= 32 * 1024, out) + self.assertGreater(out["worker_trim"][0], 64 * 1024, out) + def test_worker_acknowledges_back_to_back_requests(self): out = self.run_program(None, 48, 0, "burst") self.assertEqual([1], out["burstack"])