mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
zRAM: compress Battle.net with the Steam client while one of its games runs (#1882)
This commit is contained in:
1 parent
b07eca3c06
commit
85dd8beae1
2 files changed
+57
-2
No files matched your search
@@ -540,7 +540,7 @@ case $mode in
|
||||
fi
|
||||
if [ "${BL_ZRAM:-0}" = 1 ]; then
|
||||
step "zRAM compression: on"
|
||||
[ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam and the hidden Epic Games Launcher are not compressed while games run (turned off in Performance)"
|
||||
[ "${BL_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)"
|
||||
_bl_ram_cap=0
|
||||
case ${BL_RAM_CAP_MB:-} in
|
||||
''|0) ;;
|
||||
@@ -550,7 +550,7 @@ case $mode in
|
||||
(
|
||||
bl_zram_scan() {
|
||||
_bl_game=0 _bl_pids=() _bl_others=() _bl_apps=
|
||||
local _d _c _args _name _a _id _fex
|
||||
local _d _c _args _name _a _id _fex _lower _bnet=() _bnet_game=0
|
||||
for _d in /proc/[0-9]*; do
|
||||
[ "${_d##*/}" != "$BASHPID" ] || continue
|
||||
_args=()
|
||||
@@ -575,14 +575,34 @@ case $mode in
|
||||
;;
|
||||
steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;;
|
||||
*)
|
||||
_lower=${_name,,}
|
||||
if [ "$_fex" = 1 ] && grep -qz '^DROIDDECK_EPIC_HIDDEN=1$' "$_d/environ" 2>/dev/null; then
|
||||
_bl_pids+=("${_d##*/}")
|
||||
elif [[ $_lower == [a-z]:[\\/]'program files (x86)'[\\/]battle.net[\\/]* ||
|
||||
$_lower == [a-z]:[\\/]programdata[\\/]battle.net[\\/]* ]]; then
|
||||
_bnet+=("${_d##*/}")
|
||||
else
|
||||
_bl_others+=("${_d##*/}")
|
||||
if [[ $_lower == [a-z]:[\\/]* ]]; then
|
||||
case ${_lower##*[\\/]} in
|
||||
agent.exe|conhost.exe|explorer.exe|lsass.exe|plugplay.exe|rpcss.exe|services.exe|start.exe|\
|
||||
steam.exe|svchost.exe|tabtip.exe|winedevice.exe|rundll32.exe|wineboot.exe|winemenubuilder.exe) ;;
|
||||
*)
|
||||
for _a in "${_args[@]:1}"; do
|
||||
[ "${_a,,}" = -uid ] && _bnet_game=1
|
||||
done
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
if [ "$_bnet_game" = 1 ]; then
|
||||
_bl_pids+=("${_bnet[@]}")
|
||||
else
|
||||
_bl_others+=("${_bnet[@]}")
|
||||
fi
|
||||
}
|
||||
bl_zram_usage() {
|
||||
local _p _k _v _u _rss=0 _swap=0
|
||||
|
||||
@@ -43,6 +43,41 @@ class ClientZramFocusTest(unittest.TestCase):
|
||||
self.assertEqual('', result.stderr)
|
||||
self.assertEqual('5000010 5000011 5000012|5000013 5000014 5000015|1| 413150', result.stdout.strip())
|
||||
|
||||
def scan_fake(self, tasks):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
for pid, argv in tasks:
|
||||
self.write_cmd(Path(tmp), pid, argv)
|
||||
source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*')
|
||||
return run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game"')
|
||||
|
||||
def test_battlenet_is_compressed_with_the_client_while_one_of_its_games_runs(self):
|
||||
launcher = [
|
||||
(6000010, ['/s/steamrtarm64/steam', '-gamepadui']),
|
||||
(6000011, ['/s/reaper', 'SteamLaunch', 'AppId=2899116412', '--', 'droiddeck-battlenet']),
|
||||
(6000012, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe', '--exec=launch S1']),
|
||||
(6000013, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.15511\\Battle.net Helper.exe', '--type=renderer']),
|
||||
(6000014, ['C:\\ProgramData\\Battle.net\\Agent\\Agent.9324\\Agent.exe', '--internalclienttools']),
|
||||
(6000015, ['C:\\windows\\system32\\services.exe']),
|
||||
(6000016, ['C:\\windows\\system32\\winedevice.exe', '-uid']),
|
||||
]
|
||||
game = [(6000017, ['S:\\Games\\StarCraft\\x86\\StarCraft.exe', '-launch', '-uid', 's1'])]
|
||||
before = self.scan_fake(launcher)
|
||||
during = self.scan_fake(launcher + game)
|
||||
for result in (before, during):
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual('', result.stderr)
|
||||
self.assertEqual('6000010|6000015 6000016 6000012 6000013 6000014|1', before.stdout.strip())
|
||||
self.assertEqual('6000010 6000012 6000013 6000014|6000015 6000016 6000017|1', during.stdout.strip())
|
||||
|
||||
def test_a_game_without_a_battlenet_uid_leaves_battlenet_alone(self):
|
||||
result = self.scan_fake([
|
||||
(6000020, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe']),
|
||||
(6000021, ['D:\\Games\\Other\\Game.exe', '-windowed']),
|
||||
(6000022, ['/usr/bin/wine', 'game.exe', '-uid']),
|
||||
])
|
||||
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(' if [ "$_bl_game" = 1 ] && bl_game_focused; then')
|
||||
|
||||
Reference in new issue
Block a user