mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 13:55:58 +00:00
fix: compress only while the running game is focused
This commit is contained in:
1 parent
0a8358d11f
commit
73e158ab3b
2 files changed
+93
-12
No files matched your search
@@ -447,14 +447,30 @@ case $mode in
|
||||
step "zRAM compression: on"
|
||||
(
|
||||
bl_zram_scan() {
|
||||
_bl_game=0 _bl_pids=()
|
||||
_bl_game=0 _bl_pids=() _bl_apps=
|
||||
local _d _c _args _name _a _id
|
||||
for _d in /proc/[0-9]*; do
|
||||
# Under FEX the program is FEX's first argument.
|
||||
{ IFS= read -r -d '' _c && case ${_c##*/} in FEX|FEXInterpreter) IFS= read -r -d '' _c ;; esac; } \
|
||||
2>/dev/null < "$_d/cmdline" || continue
|
||||
case ${_c##*/} in
|
||||
reaper) _bl_game=1 ;;
|
||||
steam|steamwebhelper) _bl_pids+=("${_d#/proc/}") ;;
|
||||
_args=()
|
||||
# Under FEX the program is FEX's first argument. AppId= is its own argument.
|
||||
while IFS= read -r -d '' _c; do _args+=("$_c"); done 2>/dev/null < "$_d/cmdline" || true
|
||||
[ "${#_args[@]}" -gt 0 ] || continue
|
||||
_name=${_args[0]}
|
||||
if [ "${#_args[@]}" -gt 1 ]; then
|
||||
case ${_name##*/} in FEX|FEXInterpreter) _name=${_args[1]} ;; esac
|
||||
fi
|
||||
case ${_name##*/} in
|
||||
reaper)
|
||||
for _a in "${_args[@]}"; do
|
||||
case $_a in
|
||||
AppId=769) ;;
|
||||
AppId=[0-9]*)
|
||||
_id=${_a#AppId=}
|
||||
case $_id in *[!0-9]*) ;; *) _bl_game=1; _bl_apps="$_bl_apps $_id" ;; esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
;;
|
||||
steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
@@ -475,14 +491,22 @@ case $mode in
|
||||
bl_zram_scan
|
||||
step "zRAM: done ($(bl_zram_usage))"
|
||||
}
|
||||
# The game process exists for the whole Proton launch. Compressing then stalls the
|
||||
# launch, so the clock starts only once the game window has focus, and waits 20 s more.
|
||||
# Proton's reaper exists before the game window does, and compressing then stalls the
|
||||
# launch. focusedApp uses the same 32-bit id as that reaper's AppId= (769 is Steam; a
|
||||
# shortcut's CGameID keeps this id in its high half). The clock starts on a match, then
|
||||
# waits 20 s more. Desktop Steam never writes focus.json, so the game process is enough.
|
||||
bl_game_focused() {
|
||||
[ -n "${BL_LAUNCH_DIR:-}" ] || return 1
|
||||
if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then
|
||||
return 0
|
||||
fi
|
||||
local id
|
||||
id=$(sed -n 's/.*"focusedApp"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\).*/\1/p' \
|
||||
"$BL_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1)
|
||||
[ -n "$id" ] && [ "$id" != 769 ]
|
||||
[ -n "$id" ] || return 1
|
||||
case " ${_bl_apps-} " in
|
||||
*" $id "*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
_bl_since=-1 _bl_packed=-1
|
||||
while kill -0 $$ 2>/dev/null; do
|
||||
|
||||
@@ -1,11 +1,23 @@
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
|
||||
SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session'
|
||||
|
||||
|
||||
def function_source(name):
|
||||
source = SCRIPT.read_text()
|
||||
start = source.index('%s() {' % name)
|
||||
end = source.index('\n }', start)
|
||||
return source[start:end + len('\n }')]
|
||||
|
||||
|
||||
def run_bash(script, env=None):
|
||||
return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env)
|
||||
|
||||
|
||||
class ClientZramFocusTest(unittest.TestCase):
|
||||
def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self):
|
||||
source = SCRIPT.read_text()
|
||||
@@ -30,10 +42,55 @@ tick 50 1 1
|
||||
tick 55 1 0
|
||||
tick 60 0 0
|
||||
'''
|
||||
result = subprocess.run(['bash', '-c', harness], capture_output=True, text=True, timeout=10)
|
||||
result = run_bash(harness)
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines())
|
||||
|
||||
def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self):
|
||||
temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(temp.cleanup)
|
||||
root = Path(temp.name)
|
||||
self.write_cmd(root, 10, ['/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=769', '--'])
|
||||
self.write_cmd(root, 20, ['/usr/bin/FEX', '/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=1245620', '--'])
|
||||
self.write_cmd(root, 30, ['/home/deck/.local/share/Steam/steamrtarm64/steam'])
|
||||
scan = function_source('bl_zram_scan').replace('for _d in /proc/[0-9]*', 'for _d in "$FAKE"/[0-9]*')
|
||||
result = run_bash('FAKE=%s\n%s\nbl_zram_scan\necho "game=$_bl_game"\necho "apps=${_bl_apps# }"\necho "pids=${_bl_pids[*]}"' % (root, scan))
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(['game=1', 'apps=1245620', 'pids=30'], result.stdout.splitlines())
|
||||
|
||||
def test_focus_must_be_the_running_game(self):
|
||||
focus = function_source('bl_game_focused')
|
||||
script = '''
|
||||
%s
|
||||
check() {
|
||||
BL_DESKTOP=$1 BL_LAUNCH_DIR=$2 _bl_apps=$3
|
||||
if bl_game_focused; then echo yes; else echo no; fi
|
||||
}
|
||||
check "" "$dir" " 413150"
|
||||
check "" "$dir" " 1245620"
|
||||
printf '%%s\\n' '{"focusedApp": 999}' > "$dir/agent/focus.json"
|
||||
check "" "$dir" " 413150"
|
||||
printf '%%s\\n' '{"focusedApp": 769}' > "$dir/agent/focus.json"
|
||||
check "" "$dir" " 413150"
|
||||
rm -f "$dir/agent/focus.json"
|
||||
check 1 "$dir" " 413150"
|
||||
check "" "" " 413150"
|
||||
''' % focus
|
||||
temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(temp.cleanup)
|
||||
launch = Path(temp.name)
|
||||
(launch / 'agent').mkdir()
|
||||
(launch / 'agent' / 'focus.json').write_text('{"t": 1, "focusedApp": 413150}\n')
|
||||
result = run_bash('dir=%s\n%s' % (launch, script))
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(['yes', 'no', 'no', 'no', 'yes', 'yes'], result.stdout.splitlines())
|
||||
|
||||
@staticmethod
|
||||
def write_cmd(root, pid, args):
|
||||
proc = root / str(pid)
|
||||
proc.mkdir()
|
||||
(proc / 'cmdline').write_bytes(b'\0'.join(arg.encode() for arg in args) + b'\0')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user