diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52c70b7d8f..ba8049c2ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -195,17 +195,17 @@ jobs: app/src/main/assets/linuxfs !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox - !app/src/main/assets/linuxfs/i386/libblsession.so + !app/src/main/assets/linuxfs/i386/libddsession.so !app/src/main/assets/linuxfs/i386/libfakeinput.so !app/src/main/assets/linuxfs/i386/libfaultreport.so - !app/src/main/assets/linuxfs/libblaudit.so - !app/src/main/assets/linuxfs/libblfastpath.so + !app/src/main/assets/linuxfs/libddaudit.so + !app/src/main/assets/linuxfs/libddfastpath.so !app/src/main/assets/linuxfs/libddnatv-hook.so - !app/src/main/assets/linuxfs/libblsession.so + !app/src/main/assets/linuxfs/libddsession.so !app/src/main/assets/linuxfs/libfakeinput.so !app/src/main/assets/linuxfs/libssbs.so !app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard - !app/src/main/assets/linuxfs/x86_64/libblsession.so + !app/src/main/assets/linuxfs/x86_64/libddsession.so !app/src/main/assets/linuxfs/x86_64/libfakeinput.so !app/src/main/assets/linuxfs/x86_64/libfaultreport.so !app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so diff --git a/README.md b/README.md index 54311796da..444107fa32 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,8 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - x86 programs linking OpenSSL 3 use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt). x86 Linux games get the `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes. - `WriteProcessMemory` hooks fall back to `/proc//mem` the way [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` did before Wine 11. - Windows programs on noexec storage get executable copies of their image pages, following [@yujikaido](https://github.com/yujikaido)'s finding in [droiddeck-rp4pro](https://github.com/yujikaido/droiddeck-rp4pro) that Wine's own processes need the noexec shim. -- Wine write watches use userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later). libblsession supplies the arm64 syscall number and answers `PAGEMAP_SCAN` from `/proc/self/pagemap`. -- libblsession runs Wine's arm64 `SIGUSR2` context handler (`dlls/ntdll/unix/signal_arm64.c`, LGPL-2.1-or-later) in place on a frame laid out like [Linux](https://github.com/torvalds/linux)'s `arch/arm64/kernel/signal.c`, and serves `fill_vm_counters` in `dlls/ntdll/unix/process.c` the kernel's own `/proc//status`. +- Wine write watches use userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later). libddsession supplies the arm64 syscall number and answers `PAGEMAP_SCAN` from `/proc/self/pagemap`. +- libddsession runs Wine's arm64 `SIGUSR2` context handler (`dlls/ntdll/unix/signal_arm64.c`, LGPL-2.1-or-later) in place on a frame laid out like [Linux](https://github.com/torvalds/linux)'s `arch/arm64/kernel/signal.c`, and serves `fill_vm_counters` in `dlls/ntdll/unix/process.c` the kernel's own `/proc//status`. - droiddeck-ntsync follows the [Linux](https://github.com/torvalds/linux) ntsync semantics in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). - The proot fast path orders bindings like [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later). - DiRT 3 and DiRT Showdown keep their telemetry socket the way RoccoC's DiRTTelemetryErrorFix (MIT) does, based on the fix by Carsten Gottschling. diff --git a/app/src/main/cpp/fakeinput_steam.cpp b/app/src/main/cpp/fakeinput_steam.cpp index ee54f5b660..75609e5b73 100644 --- a/app/src/main/cpp/fakeinput_steam.cpp +++ b/app/src/main/cpp/fakeinput_steam.cpp @@ -2312,7 +2312,7 @@ __attribute__((visibility("hidden"))) static int inject_uevent(const char *actio const char *subsystem, const char *devname, unsigned major, unsigned minor) { using inject_fn = int (*)(const char *, const char *, const char *, const char *, unsigned, unsigned); - static auto inject = reinterpret_cast(dlsym(RTLD_DEFAULT, "bl_udevmon_inject")); + static auto inject = reinterpret_cast(dlsym(RTLD_DEFAULT, "dd_udevmon_inject")); return inject ? inject(action, devpath, subsystem, devname, major, minor) : -1; } diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index c7aa1b0eb4..13e9e1b3e0 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -26,7 +26,7 @@ add_library(droiddeckwayland SHARED generated/linux-dmabuf-v1-protocol.c generated/wayland-android-protocol.c generated/viewporter-protocol.c - generated/banner-desktop-v1-protocol.c + generated/droiddeck-desktop-v1-protocol.c generated/presentation-time-protocol.c generated/pointer-constraints-unstable-v1-protocol.c generated/relative-pointer-unstable-v1-protocol.c diff --git a/app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-protocol.c b/app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-protocol.c similarity index 76% rename from app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-protocol.c rename to app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-protocol.c index ae0a87daa1..c96d2aa689 100644 --- a/app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-protocol.c +++ b/app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-protocol.c @@ -38,7 +38,7 @@ extern const struct wl_interface wl_surface_interface; -static const struct wl_interface *banner_desktop_v1_types[] = { +static const struct wl_interface *droiddeck_desktop_v1_types[] = { NULL, &wl_surface_interface, &wl_surface_interface, @@ -47,16 +47,16 @@ static const struct wl_interface *banner_desktop_v1_types[] = { NULL, }; -static const struct wl_message banner_desktop_v1_requests[] = { - { "destroy", "", banner_desktop_v1_types + 0 }, - { "set_desktop", "o", banner_desktop_v1_types + 1 }, - { "set_window", "ouii", banner_desktop_v1_types + 2 }, - { "set_zorder", "a", banner_desktop_v1_types + 0 }, +static const struct wl_message droiddeck_desktop_v1_requests[] = { + { "destroy", "", droiddeck_desktop_v1_types + 0 }, + { "set_desktop", "o", droiddeck_desktop_v1_types + 1 }, + { "set_window", "ouii", droiddeck_desktop_v1_types + 2 }, + { "set_zorder", "a", droiddeck_desktop_v1_types + 0 }, }; -WL_PRIVATE const struct wl_interface banner_desktop_v1_interface = { - "banner_desktop_v1", 1, - 4, banner_desktop_v1_requests, +WL_PRIVATE const struct wl_interface droiddeck_desktop_v1_interface = { + "droiddeck_desktop_v1", 1, + 4, droiddeck_desktop_v1_requests, 0, NULL, }; diff --git a/app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-server-protocol.h b/app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-server-protocol.h similarity index 76% rename from app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-server-protocol.h rename to app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-server-protocol.h index 78f65e7fbb..37e704f3bf 100644 --- a/app/src/main/cpp/waylandcomp/generated/banner-desktop-v1-server-protocol.h +++ b/app/src/main/cpp/waylandcomp/generated/droiddeck-desktop-v1-server-protocol.h @@ -1,6 +1,6 @@ -#ifndef BANNER_DESKTOP_V1_SERVER_PROTOCOL_H -#define BANNER_DESKTOP_V1_SERVER_PROTOCOL_H +#ifndef DROIDDECK_DESKTOP_V1_SERVER_PROTOCOL_H +#define DROIDDECK_DESKTOP_V1_SERVER_PROTOCOL_H #include #include @@ -14,7 +14,7 @@ struct wl_client; struct wl_resource; /* - * @section page_copyright_banner_desktop_v1 Copyright + * @section page_copyright_droiddeck_desktop_v1 Copyright * * Copyright 2026 The412Banner * @@ -42,15 +42,15 @@ struct wl_resource; -struct banner_desktop_v1; +struct droiddeck_desktop_v1; struct wl_surface; -#ifndef BANNER_DESKTOP_V1_INTERFACE -#define BANNER_DESKTOP_V1_INTERFACE -extern const struct wl_interface banner_desktop_v1_interface; +#ifndef DROIDDECK_DESKTOP_V1_INTERFACE +#define DROIDDECK_DESKTOP_V1_INTERFACE +extern const struct wl_interface droiddeck_desktop_v1_interface; #endif -struct banner_desktop_v1_interface { +struct droiddeck_desktop_v1_interface { void (*destroy)(struct wl_client *client, struct wl_resource *resource); void (*set_desktop)(struct wl_client *client, @@ -68,10 +68,10 @@ struct banner_desktop_v1_interface { }; -#define BANNER_DESKTOP_V1_DESTROY_SINCE_VERSION 1 -#define BANNER_DESKTOP_V1_SET_DESKTOP_SINCE_VERSION 1 -#define BANNER_DESKTOP_V1_SET_WINDOW_SINCE_VERSION 1 -#define BANNER_DESKTOP_V1_SET_ZORDER_SINCE_VERSION 1 +#define DROIDDECK_DESKTOP_V1_DESTROY_SINCE_VERSION 1 +#define DROIDDECK_DESKTOP_V1_SET_DESKTOP_SINCE_VERSION 1 +#define DROIDDECK_DESKTOP_V1_SET_WINDOW_SINCE_VERSION 1 +#define DROIDDECK_DESKTOP_V1_SET_ZORDER_SINCE_VERSION 1 #ifdef __cplusplus } diff --git a/app/src/main/cpp/waylandcomp/protocols/banner-desktop-v1.xml b/app/src/main/cpp/waylandcomp/protocols/droiddeck-desktop-v1.xml similarity index 96% rename from app/src/main/cpp/waylandcomp/protocols/banner-desktop-v1.xml rename to app/src/main/cpp/waylandcomp/protocols/droiddeck-desktop-v1.xml index 7c62b2a2e2..45ba5572a1 100644 --- a/app/src/main/cpp/waylandcomp/protocols/banner-desktop-v1.xml +++ b/app/src/main/cpp/waylandcomp/protocols/droiddeck-desktop-v1.xml @@ -1,5 +1,5 @@ - + Copyright 2026 The412Banner @@ -23,7 +23,7 @@ DEALINGS IN THE SOFTWARE. - + Each Wine process is a separate Wayland client, so a Windows virtual desktop can't be built from subsurfaces. Instead the process that owns diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 94ec75d26e..c2c26d63fe 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -24,7 +24,7 @@ #include "sc_layer.h" #include "ahb_swapchain.h" #include "viewporter-server-protocol.h" -#include "banner-desktop-v1-server-protocol.h" +#include "droiddeck-desktop-v1-server-protocol.h" #include "presentation-time-server-protocol.h" #include "pointer-constraints-unstable-v1-server-protocol.h" #include "relative-pointer-unstable-v1-server-protocol.h" @@ -79,7 +79,7 @@ static void open_session_log(void) { localtime_r(&now, &tm); strftime(stamp, sizeof(stamp), "%Y-%m-%d_%H-%M-%S", &tm); - const char *given = getenv("BL_WAYLAND_LOG"); + const char *given = getenv("DD_WAYLAND_LOG"); if (given && *given) { snprintf(path, sizeof(path), "%s", given); } else { @@ -1796,14 +1796,14 @@ static void desktop_set_zorder(struct wl_client *c, struct wl_resource *r, struc apply_zorder(); schedule_render(); } -static const struct banner_desktop_v1_interface desktop_impl = { +static const struct droiddeck_desktop_v1_interface desktop_impl = { .destroy = desktop_destroy_req, .set_desktop = desktop_set_desktop, .set_window = desktop_set_window, .set_zorder = desktop_set_zorder, }; static void bind_desktop(struct wl_client *c, void *data, uint32_t ver, uint32_t id) { - struct wl_resource *r = wl_resource_create(c, &banner_desktop_v1_interface, ver, id); + struct wl_resource *r = wl_resource_create(c, &droiddeck_desktop_v1_interface, ver, id); wl_resource_set_implementation(r, &desktop_impl, NULL, NULL); } @@ -4083,7 +4083,7 @@ int droiddeck_wayland_run(void) { wl_global_create(display, &zwp_linux_dmabuf_v1_interface, 4, NULL, bind_dmabuf); droiddeck_android_wlegl_init(display); wl_global_create(display, &wl_seat_interface, 9, NULL, bind_seat); - wl_global_create(display, &banner_desktop_v1_interface, 1, NULL, bind_desktop); + wl_global_create(display, &droiddeck_desktop_v1_interface, 1, NULL, bind_desktop); wl_global_create(display, &wp_presentation_interface, 2, NULL, bind_presentation); wl_global_create(display, &zwp_pointer_constraints_v1_interface, 1, NULL, bind_pointer_constraints); wl_global_create(display, &zwp_relative_pointer_manager_v1_interface, 1, NULL, bind_relative_pointer_manager); diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6d734a91e7..e7c5c38e77 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2745,7 +2745,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val waylandLog = File(SessionPaths.beginOrCurrent(this), "wayland.log") WaylandCompositor.setSessionLogFile(waylandLog) try { - android.system.Os.setenv("BL_WAYLAND_LOG", waylandLog.path, true) + android.system.Os.setenv("DD_WAYLAND_LOG", waylandLog.path, true) } catch (e: Exception) { Log.w(TAG, "could not point the compositor's log at $waylandLog", e) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index 05d5d4e77b..b1b4406520 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -58,7 +58,8 @@ object AgentEnv { fun override(context: Context, name: String): JSONObject = synchronized(lock) { AgentAccess.requireCommands(context) if (NAME.matchEntire(name) == null || name in setOf(".", "..")) throw AgentException("INVALID_NAME", "Override names are letters, digits, '.', '_' and '-'") - if (name == "libblfastpath.so" && (SessionState.running || SessionState.guestPid > 0 || SessionState.phase == SessionPhase.STOPPING)) { + if (name == LEGACY_FAST_PATH) throw AgentException("INVALID_NAME", "The fast-path library is now $FAST_PATH") + if (name == "libddfastpath.so" && (SessionState.running || SessionState.guestPid > 0 || SessionState.phase == SessionPhase.STOPPING)) { throw AgentException("SESSION_ACTIVE", "Stop the session before installing a fast-path library") } val source = File(inbox(context), name) @@ -73,7 +74,7 @@ object AgentEnv { staged.delete() throw AgentException("OVERRIDE_FAILED", "Could not stage the override") } - if (name == "libblfastpath.so" && !arm64SharedLibrary(staged)) { + if (name == "libddfastpath.so" && !arm64SharedLibrary(staged)) { staged.delete() throw AgentException("INVALID_LIBRARY", "The fast path must be a 64-bit little-endian ARM64 ELF shared library") } @@ -86,7 +87,7 @@ object AgentEnv { state.put("pendingOverrides", JSONArray(merge(strings(state.optJSONArray("pendingOverrides")), listOf(name)))) save(context, state) state.put("installed", "$GUEST_BIN/$name") - if (name == "libblfastpath.so") { + if (name == "libddfastpath.so") { val digest = MessageDigest.getInstance("SHA-256") target.inputStream().use { input -> val buffer = ByteArray(65536) @@ -103,10 +104,10 @@ object AgentEnv { fun fastPathLibrary(context: Context): String = synchronized(lock) { if (!AgentAccess.commandsAllowed(context)) return@synchronized ProotFastPath.LIBRARY - if ("libblfastpath.so" !in strings(load(context).optJSONArray("activeOverrides"))) return@synchronized ProotFastPath.LIBRARY - val file = File(bin(context), "libblfastpath.so") + if ("libddfastpath.so" !in strings(load(context).optJSONArray("activeOverrides"))) return@synchronized ProotFastPath.LIBRARY + val file = File(bin(context), "libddfastpath.so") if (!file.isFile || Files.isSymbolicLink(file.toPath())) return@synchronized ProotFastPath.LIBRARY - "$GUEST_BIN/libblfastpath.so" + "$GUEST_BIN/libddfastpath.so" } private fun arm64SharedLibrary(file: File): Boolean = file.inputStream().use { input -> @@ -129,13 +130,18 @@ object AgentEnv { } val state = load(context) val active = strings(state.optJSONArray("pending")) - val overrides = strings(state.optJSONArray("pendingOverrides")) + val queued = strings(state.optJSONArray("pendingOverrides")) + val legacy = File(bin(context), LEGACY_FAST_PATH) + val stranded = FAST_PATH in queued && legacy.isFile && !File(bin(context), FAST_PATH).exists() && + !legacy.renameTo(File(bin(context), FAST_PATH)) + if (stranded) Log.w(TAG, "could not rename the queued $LEGACY_FAST_PATH; it stays queued for the next session") + val overrides = if (stranded) queued - FAST_PATH else queued bin(context).listFiles() - ?.filter { it.name !in overrides }?.forEach { it.delete() } + ?.filter { it.name !in overrides && !(stranded && it.name == LEGACY_FAST_PATH) }?.forEach { it.delete() } val lines = strings(state.optJSONArray("persistent")) + active - val withPath = if (overrides.none { it != "libblfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" + val withPath = if (overrides.none { it != "libddfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" state.put("active", JSONArray(active)).put("pending", JSONArray()) - state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray()) + state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray(if (stranded) listOf(FAST_PATH) else emptyList())) save(context, state) if (withPath.isNotEmpty()) Log.i(TAG, "agent environment keys for this session: ${withPath.map { it.substringBefore('=') }}") withPath @@ -158,6 +164,9 @@ object AgentEnv { save(context, state) } + private const val FAST_PATH = "libddfastpath.so" + private const val LEGACY_FAST_PATH = "libblfastpath.so" + private fun pathOf(lines: List) = lines.lastOrNull { it.startsWith("PATH=") }?.substringAfter('=')?.takeIf { it.isNotBlank() } ?: LinuxRuntime.GUEST_PATH @@ -186,6 +195,9 @@ object AgentEnv { for (key in listOf("pending", "active", "persistent", "pendingOverrides", "activeOverrides")) { if (!state.has(key)) state.put(key, JSONArray()) } + for (key in listOf("pendingOverrides", "activeOverrides")) { + state.put(key, JSONArray(strings(state.optJSONArray(key)).map { if (it == LEGACY_FAST_PATH) FAST_PATH else it }.distinct())) + } return state } diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt index 53f152a60b..55e7e61284 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt @@ -23,6 +23,7 @@ object GameEnvironment { ) fun validName(name: String) = namePattern.matches(name) + fun currentName(name: String) = if (name.startsWith("BL_")) "DD_" + name.removePrefix("BL_") else name fun supported(name: String) = name !in unused && !name.startsWith("BOX64_") && !name.startsWith("BOX86_") fun validValue(value: String) = '\u0000' !in value && value.length <= 8192 fun validScope(scope: String) = scope.isEmpty() || (Regex("[1-9][0-9]*").matches(scope) && scope.toLongOrNull()?.let { it in 1..4294967295L } == true) @@ -97,14 +98,14 @@ object GameEnvironment { val syncBackends = listOf(SessionPrefs.SYNC_NTSYNC, SessionPrefs.SYNC_FSYNC, SessionPrefs.SYNC_ESYNC, SessionPrefs.SYNC_WINESERVER) - val syncKeys = listOf("BL_SYNC", "BL_FSYNC_FIRST", "BL_SYNC_FALLBACK", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") + val syncKeys = listOf("DD_SYNC", "DD_FSYNC_FIRST", "DD_SYNC_FALLBACK", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") fun syncEnvironment(backend: String): Map { require(backend in syncBackends) { "unknown sync $backend" } return buildMap { - put("BL_SYNC", if (backend == SessionPrefs.SYNC_NTSYNC) "1" else "0") - put("BL_FSYNC_FIRST", if (backend == SessionPrefs.SYNC_FSYNC) "1" else "0") - put("BL_SYNC_FALLBACK", if (backend == SessionPrefs.SYNC_WINESERVER) "0" else "1") + put("DD_SYNC", if (backend == SessionPrefs.SYNC_NTSYNC) "1" else "0") + put("DD_FSYNC_FIRST", if (backend == SessionPrefs.SYNC_FSYNC) "1" else "0") + put("DD_SYNC_FALLBACK", if (backend == SessionPrefs.SYNC_WINESERVER) "0" else "1") if (backend == SessionPrefs.SYNC_FSYNC) put("PROTON_NO_ESYNC", "1") } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index 5958c5e99b..ab7fed7c27 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -20,7 +20,7 @@ object GameEnvironmentOptions { Option("PROTON_NO_NTSYNC", "1", R.string.game_env_no_ntsync, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_ESYNC", "1", R.string.game_env_no_esync, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_FSYNC", "1", R.string.game_env_no_fsync, Type.TOGGLE, listOf("0", "1")), - Option("BL_FSYNC_FIRST", "1", R.string.game_env_fsync_first, Type.TOGGLE, listOf("0", "1")), + Option("DD_FSYNC_FIRST", "1", R.string.game_env_fsync_first, Type.TOGGLE, listOf("0", "1")), Option("DXVK_HUD", "fps", R.string.game_env_hud, Type.MULTIPLE, listOf("scale=0.5", "scale=0.7", "opacity=0.5", "opacity=0.7", "devinfo", "fps", "frametimes", "submissions", "drawcalls", "pipelines", "descriptors", "memory", "gpuload", "version", "api", "cs", "compiler", "samplers")), Option("DXVK_CONFIG", "dxvk.maxFrameRate = 60", R.string.game_env_dxvk_config, Type.TEXT), Option("VKD3D_FRAME_RATE", "60", R.string.game_env_vkd3d_limit, Type.NUMBER), diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java index 25dd68b4d9..13adf1f129 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java @@ -12,7 +12,7 @@ import java.util.function.Supplier; public final class LinuxVulkanDriver { private static final String TAG = "LinuxVulkanDriver"; - public static final String ENV = "BL_VK_DRIVER"; + public static final String ENV = "DD_VK_DRIVER"; public static final String HELP_TEXT = "The driver the Steam client, the games it launches and the desktop's programs render on, " diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java index 1106ac9602..77f735e094 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java @@ -256,12 +256,12 @@ public final class SystemVulkanDriver { if (xclipse) environment.add("DROIDDECK_HYBRIS_DXVK=dxvk-2.6.2"); // The Android driver has a render node, but no KMS primary node. SDL presents // through the wrapper's Wayland Vulkan swapchain instead of a KMS-style path. - environment.add("BL_GAMESCOPE_BACKEND=sdl"); + environment.add("DD_GAMESCOPE_BACKEND=sdl"); // The Android pvr kernel accepts Vulkan DMA-BUF imports but rejects PRIME GEM handles. - environment.add("BL_POWERVR_DRM_HANDLES=1"); - environment.add("BL_POWERVR_RENDER_NODE=" + node); + environment.add("DD_POWERVR_DRM_HANDLES=1"); + environment.add("DD_POWERVR_RENDER_NODE=" + node); // Inner Gamescope/Xwayland lacks the bridge's Android-buffer WSI protocols. - environment.add("BL_STEAM_GL_PRESENT=1"); + environment.add("DD_STEAM_GL_PRESENT=1"); // Only actual Proton game launches use the bundled DXVK and X11 WSI layer. environment.add("DROIDDECK_POWERVR_RUNTIME=" + directory.getPath()); } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt index db5f74e4cf..3c996a03f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt @@ -275,7 +275,7 @@ internal class GameFrameFeed( private const val INFO_NS = 500_000_000L private const val SHIFT_NS = 1_000_000_000L private const val SHIFT_RECHECK_NS = 100_000_000L - private const val CLOCK_CONTROL_PATH = "tmp/.bl-clock" + private const val CLOCK_CONTROL_PATH = "tmp/.dd-clock" fun forRoot(root: File) = GameFrameFeed(File(root, HudFrames.PATH), clockControl = File(root, CLOCK_CONTROL_PATH)) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt index 3febbfd1fa..3f4589ae13 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt @@ -21,6 +21,10 @@ object LegacyNames { "etc/bannerlator-network.json" to "etc/droiddeck-network.json", "etc/bannerlator-wifi-scan-request" to "etc/droiddeck-wifi-scan-request", ) + private val RETIRED_FILES = listOf("libblsession.so", "libblfastpath.so", "libblaudit.so").map { "usr/local/lib/$it" } + + listOf("x86_64", "i386").map { "usr/local/lib/droiddeck-fex/$it/libblsession.so" } + private const val LEGACY_MARKER = ".bl-" + private val QUEUED_MARKERS = setOf(".bl-proton-extra", ".bl-steam-urls") private val MENU_REWRITES = listOf( Triple("usr/local/share/applications", "/usr/local/bin/bannerlator-", "/usr/local/bin/droiddeck-"), Triple("usr/share/applications", "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/", @@ -38,6 +42,20 @@ object LegacyNames { fun migrateRootfs(root: File) { migrateEtc(root) for ((old, new) in MOVED_FILES) move(File(root, old), File(root, new)) + for (path in RETIRED_FILES) File(root, path).delete() + File(root, "root").listFiles { f -> f.name.startsWith(LEGACY_MARKER) }?.forEach { + val target = File(it.parentFile, ".dd-" + it.name.removePrefix(LEGACY_MARKER)) + if (it.name in QUEUED_MARKERS && it.isFile && !isLink(it) && target.isFile && !isLink(target)) { + val queued = it.readText() + if (queued.isNotBlank()) { + val separator = if (target.length() > 0 && !target.readText().endsWith("\n")) "\n" else "" + target.appendText(separator + if (queued.endsWith("\n")) queued else queued + "\n") + } + FileUtils.delete(it) + } else { + move(it, target) + } + } linkScripts(root) rewriteMenuEntries(root) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt index 11265bd8ae..27ef86f086 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt @@ -9,7 +9,7 @@ import java.security.MessageDigest object ProotFastPath { private const val TAG = "ProotFastPath" - const val LIBRARY = "/usr/local/lib/libblfastpath.so" + const val LIBRARY = "/usr/local/lib/libddfastpath.so" const val MAX_BINDS = 256 fun allows(preference: Boolean, noSeccomp: Boolean, source: String, nativeUserland: Boolean = false): Boolean = diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt index 32225c3f95..5300b24720 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -315,11 +315,11 @@ object BottomDesktop { main.post { if (generation == guestGeneration) watchIme(imeDir) } val binds = LinuxRuntime.binds(context, current.sessionRoot, runtime, Environment.getExternalStorageDirectory(), current.binds) val guest = ArrayList(current.guest).apply { - add("BL_WIDTH=$width") - add("BL_HEIGHT=$height") - add("BL_DEBUG_DIR=" + dir.path) - add("BL_TOP_SESSION=" + SessionState.mode) - add("BL_IME_DIR=" + imeDir.path) + add("DD_WIDTH=$width") + add("DD_HEIGHT=$height") + add("DD_DEBUG_DIR=" + dir.path) + add("DD_TOP_SESSION=" + SessionState.mode) + add("DD_IME_DIR=" + imeDir.path) add(SCRIPT) } val command = if (current.nativeUserland) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt b/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt index 60044ccb84..a6d281701e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt @@ -440,7 +440,7 @@ object EsyncPacks { fun enabled(context: Context): Boolean = SessionPrefs.syncFallback(context) || try { GameEnvironmentStore.read(context).let { config -> - (listOf(config.shared) + config.games.values).any { it["BL_SYNC_FALLBACK"] == "1" } + (listOf(config.shared) + config.games.values).any { it["DD_SYNC_FALLBACK"] == "1" } } } catch (t: Throwable) { false diff --git a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt index d3471283e8..40fc1d323c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt @@ -57,8 +57,8 @@ object FexCatalog { } fun environment(build: Build, sources: List = DownloadSource.candidates(build.url)): List = listOf( - "BL_FEX_TAG=${build.tag}", - "BL_FEX_SHA256=${build.sha256}", - "BL_FEX_URLS=" + sources.joinToString(" "), + "DD_FEX_TAG=${build.tag}", + "DD_FEX_SHA256=${build.sha256}", + "DD_FEX_URLS=" + sources.joinToString(" "), ) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index 81dc109d67..e00b1912fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -29,7 +29,8 @@ object GameEnvironmentStore { require(GameEnvironment.validName(name)) val entry = value.get(name) require(entry == JSONObject.NULL || entry is String && GameEnvironment.validValue(entry)) - put(name, if (entry == JSONObject.NULL) null else entry as String) + val current = GameEnvironment.currentName(name) + if (current == name || !value.has(current)) put(current, if (entry == JSONObject.NULL) null else entry as String) } } val games = json.optJSONObject("games") @@ -52,10 +53,9 @@ object GameEnvironmentStore { @Synchronized fun save(context: Context, config: GameEnvironment.Config) { - val json = encode(config) - decode(json) - write(File(context.filesDir, SETTINGS), json.toString()) - publish(context, config) + val normalized = decode(encode(config)) + write(File(context.filesDir, SETTINGS), encode(normalized).toString()) + publish(context, normalized) } @Synchronized diff --git a/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt b/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt index 8caa1e6f8e..c84d8353d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt @@ -34,8 +34,8 @@ object GraphicsReport { /** The guest keys the report repeats: everything that decides which Vulkan driver loads. */ private val ENV_PREFIXES = listOf( - "VK_", "BL_VK", "BL_DRM", "BL_VKBRIDGE", "VKBRIDGE", "MESA_", "GALLIUM_", "ZINK", "TU_", "PANVK", - "DROIDDECK_POWERVR", "DROIDDECK_HYBRIS", "BL_GAME_LOGS", "LIBGL_", "GAMESCOPE_DISABLE", "XWAYLAND", + "VK_", "DD_VK", "DD_DRM", "DD_VKBRIDGE", "VKBRIDGE", "MESA_", "GALLIUM_", "ZINK", "TU_", "PANVK", + "DROIDDECK_POWERVR", "DROIDDECK_HYBRIS", "DD_GAME_LOGS", "LIBGL_", "GAMESCOPE_DISABLE", "XWAYLAND", ) /** Per-game graphics logs and the guest's Vulkan summary: on for a non-Adreno GPU, or by Setup's switch. */ diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 94334f4dc9..b27326969c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -37,7 +37,7 @@ object ProtonExtras { ) private fun home(context: Context) = File(LinuxRuntime.rootDir(context), "root") - private fun requests(context: Context) = File(home(context), ".bl-proton-extra") + private fun requests(context: Context) = File(home(context), ".dd-proton-extra") private fun toolsDir(context: Context) = File(home(context), ".local/share/Steam/compatibilitytools.d") private fun releasesFile(context: Context) = File(context.filesDir, "proton-extras.json") private fun latestFile(context: Context) = File(context.filesDir, "proton-latest.json") diff --git a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt index dc992c5bfc..3fe95fc815 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt @@ -68,7 +68,7 @@ object QuestExperimental { appendLine("driverMode=${SessionPrefs.gpuDriverMode(context)}") appendLine("androidDriver=${SessionPrefs.androidDriver(context)}") appendLine("steamSurfaceControlWorkaround=${SessionPrefs.hdr(context, "steam")}") - appendLine("GPUOBJ fallback installed in Android driver and ARM64 libblsession") + appendLine("GPUOBJ fallback installed in Android driver and ARM64 libddsession") appendLine("Experimental Quest 2/3/3S compatibility; 2D panel application") } Log.i(TAG, report) 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 7b3e520907..9501915fe5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -109,11 +109,11 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-compat" to "usr/local/bin/droiddeck-steam-compat", "usr/local/bin/droiddeck-steam-taskset" to "usr/local/libexec/droiddeck-steam/taskset", "usr/local/bin/droiddeck-fex" to "usr/local/bin/droiddeck-fex", - "libblsession.so" to "usr/local/lib/libblsession.so", + "libddsession.so" to "usr/local/lib/libddsession.so", "libfakeinput.so" to "usr/local/lib/libfakeinput.so", - "libblfastpath.so" to "usr/local/lib/libblfastpath.so", + "libddfastpath.so" to "usr/local/lib/libddfastpath.so", "libddnatv-hook.so" to "usr/lib/libddnatv-hook.so", - "libblaudit.so" to "usr/local/lib/libblaudit.so", + "libddaudit.so" to "usr/local/lib/libddaudit.so", "libssbs.so" to "usr/local/lib/libssbs.so", "usr/local/bin/droiddeck-session" to "usr/local/bin/droiddeck-session", "usr/local/bin/droiddeck-fonts" to "usr/local/bin/droiddeck-fonts", @@ -238,7 +238,7 @@ object SessionFiles { "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("libblsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } + listOf("libddsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } } + listOf("libvulkan-thunk.so", "libwebkitinput.so").map { "x86_64/$it" to "usr/local/lib/droiddeck-fex/x86_64/$it" } // The Mali compatibility layer (tools/venus/layer, David Cimo): an implicit Vulkan layer that // fills in the features DXVK requires and Mali lacks. Idle outside Wine and on GPUs that have them. @@ -315,7 +315,7 @@ object SessionFiles { for (pack in SERVICE_PACKS.keys) stageStoreService(context, root, pack, ledger) ledger.save() for (old in arrayOf("aarch64-unix", "aarch64-windows", "i386-windows")) File(root, "$DIRECTAUDIO_DIR/lib/wine/$old").deleteRecursively() - val preload = StringBuilder("/usr/local/lib/libblsession.so\n") + val preload = StringBuilder("/usr/local/lib/libddsession.so\n") if (!File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists()) { preload.append("/usr/local/lib/libfakeinput.so\n") } 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 8089bfec04..f05e2fbca7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -694,7 +694,7 @@ object SessionPrefs { } private fun shaderPrecacheApplied(context: Context) = - java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.bl-shader-precache-applied") + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.dd-shader-precache-applied") fun pendingShaderPrecache(context: Context): Boolean? { val prefs = prefs(context) 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 afdd58d98a..26b024aefc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -612,7 +612,7 @@ class SessionService : Service() { stopSession(-1, gen) return } - if (steamHere) guest.add("BL_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) + if (steamHere) guest.add("DD_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) val fastPathAt = guest.size val pulse = SessionEvents.step("audio") { startAudio(guest, sessionDir, directAudioPack) } @@ -624,36 +624,36 @@ class SessionService : Service() { val encoder = VideoEncodeBridge(File(filesDir, "venc/venc.sock")) encoder.attach(this) components.add(encoder) - guest.add("BL_VENC_SOCKET=" + encoder.socket.absolutePath) + guest.add("DD_VENC_SOCKET=" + encoder.socket.absolutePath) } com.droiddeck.launcher.gpu.ClockLogComponent(File(sessionDir, "clocks.log")).let { it.attach(this) components.add(it) } - guest.add("BL_WIDTH=" + size.first) - guest.add("BL_HEIGHT=" + size.second) + guest.add("DD_WIDTH=" + size.first) + guest.add("DD_HEIGHT=" + size.second) if (noSteamGame()) runCatching { val scope = NoSteamLaunch.scopeOf(SessionState.program, SessionState.programArgs) { NoSteamLaunch.battleNetTitleScope(this, it) } NoSteamLaunch.resolution(GameEnvironmentStore.read(this), scope, size) }.onFailure { Log.w(TAG, "game resolution", it) }.getOrNull()?.let { (w, h) -> - guest.add("BL_GAME_WIDTH=$w") - guest.add("BL_GAME_HEIGHT=$h") + guest.add("DD_GAME_WIDTH=$w") + guest.add("DD_GAME_HEIGHT=$h") Log.i(TAG, "game resolution: ${w}x$h on a ${size.first}x${size.second} output") } if (SessionState.followScreen || size.first < size.second || SessionPrefs.orientation(this) == android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) - guest.add("BL_FOLLOW_OUTPUT=1") + guest.add("DD_FOLLOW_OUTPUT=1") if (SessionState.hdr) { - guest.add("BL_HDR=1") + guest.add("DD_HDR=1") guest.add("DXVK_HDR=1") Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=100") guest.add("WINE_OFFSCREEN_CHECK_MS=100") - guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) - guest.add("BL_LOG=" + sessionLog.path) - guest.add("BL_DEBUG_DIR=" + sessionDir.path) + guest.add("DD_REFRESH=" + Math.round(SessionState.refreshHz)) + guest.add("DD_LOG=" + sessionLog.path) + guest.add("DD_DEBUG_DIR=" + sessionDir.path) if (EnhancedDiagnostics.isActive(this, sessionDir)) guest.add("DROIDDECK_ENHANCED_DIAGNOSTICS=1") val fakeInputDir = File(sessionRoot, "dev/input").apply { mkdirs() } @@ -666,7 +666,7 @@ class SessionService : Service() { SessionEvents.step("controller-sync") { SessionState.padBridge?.syncConnectedControllers() } } val noSteamGame = noSteamGame() - if (noSteamGame) guest.add("BL_PIN_CORES=0") + if (noSteamGame) guest.add("DD_PIN_CORES=0") if ((steamHere || SessionState.program == NoSteamLaunch.EPIC) && com.droiddeck.launcher.stores.epic.EpicClient.read(this).installed) { runCatching { SessionEvents.step("epic-library") { com.droiddeck.launcher.stores.epic.EpicClientLibrary.sync(this) } } .onFailure { Log.w(TAG, "Epic library sync failed", it) } @@ -676,17 +676,19 @@ class SessionService : Service() { if (steamHere || noSteamGame) { val added = SessionEvents.step("added-games-scan") { com.droiddeck.launcher.frontend.AddedGames.scan(this) } val listing = SessionEvents.step("added-games-listing") { com.droiddeck.launcher.frontend.AddedGames.writeListing(this, added) } - guest.add("BL_ADDED_GAMES=" + listing.path) - if (OfflineMode.enabled(this)) guest.add("BL_STEAM_OFFLINE=1") - if (com.droiddeck.launcher.gpu.Lossless.owned(this)) guest.add("BL_LOSSLESS_OWNED=1") + guest.add("DD_ADDED_GAMES=" + listing.path) + if (OfflineMode.enabled(this)) guest.add("DD_STEAM_OFFLINE=1") + if (com.droiddeck.launcher.gpu.Lossless.owned(this)) guest.add("DD_LOSSLESS_OWNED=1") if (added.isNotEmpty()) Log.i(TAG, "added games: " + added.joinToString { "${it.name} (${it.exe.name})" }) } + guest.add("DD_LAUNCH_DIR=" + sessionRoot.path) + // Proton builds up to 11.12 report X11 text fields under this name. guest.add("BL_LAUNCH_DIR=" + sessionRoot.path) - GameStorage.effective(this)?.let { guest.add("BL_LIBRARY_LABEL=" + it.label.replace('"', ' ')) } - if (SessionState.mode == MODE_STEAM && SessionState.steamUi == "desktop") guest.add("BL_STEAM_UI=desktop") + GameStorage.effective(this)?.let { guest.add("DD_LIBRARY_LABEL=" + it.label.replace('"', ' ')) } + if (SessionState.mode == MODE_STEAM && SessionState.steamUi == "desktop") guest.add("DD_STEAM_UI=desktop") // Detailed graphics logs: per-game logs and the guest's Vulkan summary (a GPU that is not // an Adreno, or Setup's switch), and graphics-report.txt for every session. - if (GraphicsReport.detailed(this)) guest.add("BL_GAME_LOGS=1") + if (GraphicsReport.detailed(this)) guest.add("DD_GAME_LOGS=1") SessionEvents.step("graphics-report") { GraphicsReport.begin(this, sessionDir, guest) } val shellGuest = ArrayList(guest).apply { add("SHELL=/bin/bash") @@ -873,8 +875,8 @@ class SessionService : Service() { if (!pulse.setSinkSuspended(false)) Log.w(TAG, "could not resume audio sink") if (!pulse.setMicSuspended(false)) Log.w(TAG, "could not resume microphone source") }, - zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-zram"), - clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-clock"), + zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.dd-zram"), + clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.dd-clock"), mapClockControl = { WaylandCompositor.nativeSetClockControl(it.path) }, pagedOut = { processes, unacknowledged, residentKb, swapKb, swapBeforeKb, millis -> Log.i(TAG, "paged out $processes processes ($unacknowledged unacknowledged) in $millis ms: " + @@ -943,16 +945,16 @@ class SessionService : Service() { } else { guest.add("LANG=C.UTF-8") } - guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( + guest.add("DD_STEAM_LANGUAGE=" + SteamLanguage.forLocale( com.droiddeck.launcher.core.AppLanguage.effective(this), com.droiddeck.launcher.core.AppLanguage.system(this).country, )) guest.add("TZ=" + java.util.TimeZone.getDefault().id) - if (SessionState.mode == MODE_STEAM) SessionPrefs.pendingShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } + if (SessionState.mode == MODE_STEAM) SessionPrefs.pendingShaderPrecache(this)?.let { guest.add("DD_SHADER_PRECACHE=" + if (it) "1" else "0") } guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR) guest.add("XDG_SESSION_TYPE=wayland") guest.add("WAYLAND_DISPLAY=wayland-0") - guest.add("BL_ANDROID_CLIPBOARD=" + File(filesDir, "session/android-clipboard").path) + guest.add("DD_ANDROID_CLIPBOARD=" + File(filesDir, "session/android-clipboard").path) guest.add("GAMESCOPE_FORCE_GENERAL_QUEUE=1") guest.add("MESA_LOADER_DRIVER_OVERRIDE=zink") guest.add("GALLIUM_DRIVER=zink") @@ -981,7 +983,7 @@ class SessionService : Service() { guest.add("XWAYLAND_NO_GLAMOR=1") Log.w(TAG, "xwayland: the last session's Xwayland crashed; glamor off for this one (XWAYLAND_NO_GLAMOR=1)") } - if (!com.droiddeck.launcher.core.DeviceSupport.adreno()) guest.add("BL_RAISE_NOFILE=1") + if (!com.droiddeck.launcher.core.DeviceSupport.adreno()) guest.add("DD_RAISE_NOFILE=1") if (!com.droiddeck.launcher.core.DeviceSupport.adreno()) { val kernel = System.getProperty("os.version").orEmpty() val old = kernelBefore(kernel, 6, 6) @@ -995,11 +997,11 @@ class SessionService : Service() { if (SessionPrefs.steamGpuCompositing(this)) { Log.i(TAG, "steam: GPU web compositing (Setup's \"Steam interface: GPU drawing\")") } else { - guest.add("BL_STEAM_SOFT_COMPOSITING=1") + guest.add("DD_STEAM_SOFT_COMPOSITING=1") Log.i(TAG, "steam: software web compositing for the open driver pair (GPU raster kept)") } - guest.add("BL_OPEN_DRIVER=1") - LinuxRuntime.gpuStandIn(this)?.takeIf { it == LinuxRuntime.MALI_DEVICE }?.let { guest.add("BL_DRM_STANDIN=$it") } + guest.add("DD_OPEN_DRIVER=1") + LinuxRuntime.gpuStandIn(this)?.takeIf { it == LinuxRuntime.MALI_DEVICE }?.let { guest.add("DD_DRM_STANDIN=$it") } } val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) @@ -1013,10 +1015,10 @@ class SessionService : Service() { guest.add("MESA_DISK_CACHE_DATABASE=1") guest.addAll(GpuStatsComponent.guestEnv(LinuxRuntime.rootDir(this))) guest.add("GLIBC_TUNABLES=glibc.pthread.rseq=0:glibc.malloc.top_pad=16777216") - if (SessionState.mode == MODE_STEAM) guest.add("BL_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0")) + if (SessionState.mode == MODE_STEAM) guest.add("DD_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0")) SessionState.steamClientArch = if (steamHere) SessionPrefs.steamClientArch(this) else null SessionState.steamClientArch?.let { arch -> - guest.add("BL_STEAM_CLIENT_ARCH=$arch") + guest.add("DD_STEAM_CLIENT_ARCH=$arch") SessionPaths.current()?.let { SessionArtifacts.recordClient(it, arch) SessionArtifacts.markSteamLogs(it, File(SessionPrefs.steamRoot(this, arch), "logs")) @@ -1024,23 +1026,23 @@ class SessionService : Service() { } FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } if (SessionState.mode == MODE_STEAM) { - guest.add("BL_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0")) + guest.add("DD_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0")) } if (SessionPrefs.noXalia(this)) guest.add("PROTON_USE_XALIA=0") - guest.add("BL_SYNC=" + (if (SessionPrefs.fastSync(this)) "1" else "0")) - guest.add("BL_SYNC_FALLBACK=" + (if (SessionPrefs.syncFallback(this)) "1" else "0")) - guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) - guest.add("BL_PACE_CORES=" + (if (SessionPrefs.paceCores(this)) "1" else "0")) - guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) - if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") + guest.add("DD_SYNC=" + (if (SessionPrefs.fastSync(this)) "1" else "0")) + guest.add("DD_SYNC_FALLBACK=" + (if (SessionPrefs.syncFallback(this)) "1" else "0")) + guest.add("DD_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) + guest.add("DD_PACE_CORES=" + (if (SessionPrefs.paceCores(this)) "1" else "0")) + guest.add("DD_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) + if (SessionPrefs.cursorComposite(this)) guest.add("DD_CURSOR_COMPOSITE=1") relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { - guest.add("BL_ZRAM=1") - if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } - if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0") - if (!SessionPrefs.zramIdle(this)) guest.add("BL_ZRAM_IDLE=0") + 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("BL_VRAM_MB=$it") } + 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)) @@ -1049,10 +1051,10 @@ class SessionService : Service() { com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } val clientPinned = steamHere && SessionPrefs.clientCpusOverride(this) if (clientPinned) { - guest.add("BL_CLIENT_CPUS=" + CpuCores.listOrAll(SessionPrefs.clientCpus(this))) + guest.add("DD_CLIENT_CPUS=" + CpuCores.listOrAll(SessionPrefs.clientCpus(this))) } CpuCores.gameLaunchList(SessionPrefs.gameCpus(this), clientPinned) - .takeIf { it.isNotEmpty() }?.let { guest.add("BL_GAME_CPUS=$it") } + .takeIf { it.isNotEmpty() }?.let { guest.add("DD_GAME_CPUS=$it") } } private fun startVkBridge(guest: MutableList, sessionDir: File) { @@ -1061,16 +1063,16 @@ class SessionService : Service() { val bridge = com.droiddeck.launcher.gpu.VkBridgeComponent(socket, File(sessionDir, "vkbridge-server.log")) bridge.attach(this) components.add(bridge) - guest.add("BL_VKBRIDGE=1") - if (SessionPrefs.steamGpuCompositing(this)) guest.add("BL_STEAM_GPU_COMPOSITING=1") + guest.add("DD_VKBRIDGE=1") + if (SessionPrefs.steamGpuCompositing(this)) guest.add("DD_STEAM_GPU_COMPOSITING=1") SessionPrefs.linuxDriver(this).takeIf { it.isNotEmpty() } ?.let { runCatching { LinuxVulkanDriver.resolveIcdPath(this, it) }.getOrNull() } - ?.let { guest.add("BL_VKBRIDGE_FALLBACK_ICD=$it") } + ?.let { guest.add("DD_VKBRIDGE_FALLBACK_ICD=$it") } guest.add("VKBRIDGE_SOCKET=" + socket.path) guest.add("VKBRIDGE_CLIENT_LOG=" + File(sessionDir, "vkbridge-client.log").path) guest.add("VKBRIDGE_MODE=" + SessionPrefs.vkBridgeMode(this)) LinuxRuntime.gpuStandIn(this)?.let { node -> - guest.add("BL_DRM_STANDIN=$node") + guest.add("DD_DRM_STANDIN=$node") LinuxRuntime.deviceNumbers(node)?.let { guest.add("VKBRIDGE_DRM_RENDER=$it") } } Log.i(TAG, "vkbridge: on (${com.droiddeck.launcher.core.DeviceSupport.gpuName(this)}, ${SessionPrefs.vkBridgeMode(this)} mode), socket $socket") @@ -1084,7 +1086,7 @@ class SessionService : Service() { SessionPrefs.directAudio(this) val wantsMic = SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED - guest.add("BL_MIC_ENABLED=" + if (wantsMic) "1" else "0") + guest.add("DD_MIC_ENABLED=" + if (wantsMic) "1" else "0") guest.add("AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") val audioDir = File(filesDir, "directaudio").apply { mkdirs() } val relaySocket = File(audioDir, "relay.sock") @@ -1112,7 +1114,7 @@ class SessionService : Service() { components.add(relay) } if (wantsDirectAudio) { - guest.add("BL_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR) + guest.add("DD_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR) guest.add("AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) val lowLatency = com.droiddeck.launcher.audio.DirectAudioTiming.lowLatencyOutput() val timing = com.droiddeck.launcher.audio.DirectAudioTiming.environment(lowLatency) @@ -1268,9 +1270,9 @@ class SessionService : Service() { ) if (device != null) { val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size - guest.add(envAt, "BL_STORAGE_DIAGNOSTICS=1") - guest.add(envAt + 1, "BL_STORAGE_DEVICE=$device") - guest.add(envAt + 2, "BL_STORAGE_LOG=${File(sessionDir, "storage.log").absolutePath}") + guest.add(envAt, "DD_STORAGE_DIAGNOSTICS=1") + guest.add(envAt + 1, "DD_STORAGE_DEVICE=$device") + guest.add(envAt + 2, "DD_STORAGE_LOG=${File(sessionDir, "storage.log").absolutePath}") } else { Log.w(TAG, "storage diagnostics: selected library could not be identified; metadata snapshot only") } @@ -1415,7 +1417,7 @@ class SessionService : Service() { val listing = File(filesDir, "session/steam-libraries-x64.json").apply { parentFile?.mkdirs() } listing.writeText(x64Libraries.toString()) val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size - guest.add(envAt, "BL_X64_STEAM_LIBRARIES=" + listing.path) + guest.add(envAt, "DD_X64_STEAM_LIBRARIES=" + listing.path) } catch (e: Exception) { Log.w(TAG, "x86-64 steam library: the list could not be written; internal storage alone this session", e) } @@ -1425,7 +1427,7 @@ class SessionService : Service() { for ((path, label) in libraries) json.put(org.json.JSONObject().put("path", path).put("label", label.replace('"', ' ').replace('\\', ' '))) listing.writeText(json.toString()) val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size - guest.add(envAt, "BL_STEAM_LIBRARIES=" + listing.path) + guest.add(envAt, "DD_STEAM_LIBRARIES=" + listing.path) } catch (e: Exception) { Log.w(TAG, "steam library: the list could not be written; the card alone this session", e) } @@ -1446,7 +1448,7 @@ class SessionService : Service() { } listing.writeText(volumes.toString()) val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size - guest.add(envAt, "BL_DESKTOP_VOLUMES=" + listing.path) + guest.add(envAt, "DD_DESKTOP_VOLUMES=" + listing.path) } catch (e: Exception) { Log.w(TAG, "desktop volumes: the list could not be written", e) } 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 ad7360d8ee..221a1e78c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -286,7 +286,7 @@ internal class SessionSuspendController( } val targets = records.values.filter { record -> try { - File(procRoot, "${record.pid}/maps").useLines { lines -> lines.any { it.endsWith("/libblsession.so") } } + File(procRoot, "${record.pid}/maps").useLines { lines -> lines.any { it.endsWith("/libddsession.so") } } } catch (_: IOException) { false } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index ccc8693c33..133514d643 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -115,7 +115,7 @@ internal class SteamDownloadMonitor { val steam = File(home, ".local/share/Steam") val stamped = File(steam, "package/droiddeck-installed").isFile || File(steam, "package/bannerlator-installed").isFile - return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists() + return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".dd-steam-repair").exists() } internal fun manifests(runtimeRoot: File, mounts: Map): List { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamRepair.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamRepair.kt index 9cd25d6856..e6d22749ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamRepair.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamRepair.kt @@ -6,7 +6,7 @@ import java.io.File object SteamRepair { private fun home(context: Context) = File(LinuxRuntime.rootDir(context), "root") - private fun request(context: Context) = File(home(context), ".bl-steam-repair") + private fun request(context: Context) = File(home(context), ".dd-steam-repair") private fun unconfirmed(context: Context) = File(home(context), ".local/share/Steam/package/droiddeck-unconfirmed") private fun x64Unconfirmed(context: Context) = File(home(context), ".droiddeck-x64/.local/share/Steam/package/droiddeck-unconfirmed") diff --git a/app/src/main/java/com/droiddeck/launcher/session/VenusComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/VenusComponent.kt index a1856a6a9c..a9ab0f58d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/VenusComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/VenusComponent.kt @@ -102,7 +102,7 @@ class VenusComponent(private val logFile: File?) : SessionPart() { // (Steam's GL, Xwayland's glamor) requires robustness2's nullDescriptor, which the // layer stands in for. The session script checks it and falls back to llvmpipe. "DROIDDECK_MALI_COMPAT=1", - "BL_VENUS=1", + "DD_VENUS=1", // gamescope's composite layout without immutable YCbCr samplers from the start // (patch 0930): a Mali-G615 refused every composite pipeline with them, and testing // that through Venus took the render server down. diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt index 26faded94c..d1c64b4b39 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -70,7 +70,7 @@ class BottomDesktopCompositorService : Service() { FileUtils.copyAsset(this, "wayland/keymap.xkb", File(runtimeDir, "keymap.xkb")) data.getString(KEY_LOG)?.let { path -> WaylandCompositor.setSessionLogFile(File(path)) - runCatching { android.system.Os.setenv("BL_WAYLAND_LOG", path, true) } + runCatching { android.system.Os.setenv("DD_WAYLAND_LOG", path, true) } .onFailure { Log.w(TAG, "could not point the compositor's log at $path", it) } } WaylandCompositor.setFirstFrameListener { reply(MSG_FIRST_FRAME) } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index ad4878b2ef..4ad4263161 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -50,7 +50,7 @@ object CompositorHost { refreshHz: Float, fpsLimit: Int, ): Boolean { - WaylandCompositor.nativeSetClockControl(java.io.File(context.filesDir, "${com.droiddeck.launcher.runtime.LinuxRuntime.DIR}/tmp/.bl-clock").path) + WaylandCompositor.nativeSetClockControl(java.io.File(context.filesDir, "${com.droiddeck.launcher.runtime.LinuxRuntime.DIR}/tmp/.dd-clock").path) ownVsyncThread = SessionPrefs.vsyncThread(context) WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) blackFrameInsertion = SessionPrefs.blackFrameInsertion(context) diff --git a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java index c26b295e84..b0277f2fd8 100644 --- a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java +++ b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java @@ -84,7 +84,7 @@ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { private Surface standInSurface() { if (standIn == null) { - standInThread = new HandlerThread("bl-decoder-standin"); + standInThread = new HandlerThread("dd-decoder-standin"); standInThread.start(); standIn = ImageReader.newInstance(Math.max(width, 16), Math.max(height, 16), ImageFormat.PRIVATE, 3); standIn.setOnImageAvailableListener(reader -> { diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt index 7fe76acc98..98e2722386 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt @@ -209,7 +209,7 @@ class AgentSecurityTest { @Test fun fastPathLibraryIsValidatedAndSelectedForOneSession() { AgentAccess.setCommandsEnabled(context, true) - val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so") + val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libddfastpath.so") source.writeText("wrong architecture") refused("INVALID_LIBRARY") { AgentEnv.override(context, source.name) } val header = ByteArray(64) @@ -227,11 +227,43 @@ class AgentSecurityTest { assertEquals(64, response.getString("sha256").length) assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) AgentEnv.beginSession(context) - assertEquals("/opt/droiddeck-agent/bin/libblfastpath.so", AgentEnv.fastPathLibrary(context)) + assertEquals("/opt/droiddeck-agent/bin/libddfastpath.so", AgentEnv.fastPathLibrary(context)) AgentEnv.endSession(context) assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) } + @Test fun aFastPathOverrideQueuedUnderTheOldNameStillApplies() { + AgentAccess.setCommandsEnabled(context, true) + File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so").writeText("old") + refused("INVALID_NAME") { AgentEnv.override(context, "libblfastpath.so") } + val bin = File(LinuxRuntime.rootDir(context), "opt/droiddeck-agent/bin").apply { mkdirs() } + File(bin, "libblfastpath.so").writeText("queued") + File(context.filesDir, "agent-env.json").writeText("""{"pendingOverrides":["libblfastpath.so"]}""") + AgentEnv.beginSession(context) + assertEquals("/opt/droiddeck-agent/bin/libddfastpath.so", AgentEnv.fastPathLibrary(context)) + assertEquals("queued", File(bin, "libddfastpath.so").readText()) + assertFalse(File(bin, "libblfastpath.so").exists()) + AgentEnv.endSession(context) + } + + @Test fun aQueuedOldNameOverrideThatCannotBeRenamedWaits() { + AgentAccess.setCommandsEnabled(context, true) + val bin = File(LinuxRuntime.rootDir(context), "opt/droiddeck-agent/bin").apply { mkdirs() } + File(bin, "libblfastpath.so").writeText("queued") + File(context.filesDir, "agent-env.json").writeText("""{"pendingOverrides":["libblfastpath.so"]}""") + bin.setWritable(false) + try { + org.junit.Assume.assumeFalse(bin.canWrite()) + AgentEnv.beginSession(context) + assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) + assertTrue(File(bin, "libblfastpath.so").isFile) + val state = JSONObject(File(context.filesDir, "agent-env.json").readText()) + assertEquals("libddfastpath.so", state.getJSONArray("pendingOverrides").getString(0)) + } finally { + bin.setWritable(true) + } + } + @Test fun environmentValuesAreNotLogged() { AgentAccess.setCommandsEnabled(context, true) AgentEnv.set(context, listOf("CUSTOM=synthetic-private-value"), false) diff --git a/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt b/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt index cd9d785d8c..219ecad5a1 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt @@ -134,12 +134,12 @@ class GameEnvironmentTest { assertEquals("1", chosen.games["42"]!!["FEX_TSOENABLED"]) } val ntsync = GameEnvironment.withGameSync(base, "42", "ntsync").games["42"]!! - assertEquals(listOf("1", "0", "1"), listOf(ntsync["BL_SYNC"], ntsync["BL_FSYNC_FIRST"], ntsync["BL_SYNC_FALLBACK"])) + assertEquals(listOf("1", "0", "1"), listOf(ntsync["DD_SYNC"], ntsync["DD_FSYNC_FIRST"], ntsync["DD_SYNC_FALLBACK"])) assertFalse(ntsync.containsKey("PROTON_NO_ESYNC")) val fsync = GameEnvironment.withGameSync(base, "42", "fsync").games["42"]!! - assertEquals(listOf("0", "1", "1", "1"), listOf(fsync["BL_SYNC"], fsync["BL_FSYNC_FIRST"], fsync["BL_SYNC_FALLBACK"], fsync["PROTON_NO_ESYNC"])) + assertEquals(listOf("0", "1", "1", "1"), listOf(fsync["DD_SYNC"], fsync["DD_FSYNC_FIRST"], fsync["DD_SYNC_FALLBACK"], fsync["PROTON_NO_ESYNC"])) val wineserver = GameEnvironment.withGameSync(base, "42", "wineserver").games["42"]!! - assertEquals(listOf("0", "0", "0"), listOf(wineserver["BL_SYNC"], wineserver["BL_FSYNC_FIRST"], wineserver["BL_SYNC_FALLBACK"])) + assertEquals(listOf("0", "0", "0"), listOf(wineserver["DD_SYNC"], wineserver["DD_FSYNC_FIRST"], wineserver["DD_SYNC_FALLBACK"])) val inherited = GameEnvironment.withGameSync(base, "42", null) assertNull(GameEnvironment.gameSync(inherited, "42")) assertEquals(mapOf("FEX_TSOENABLED" to "1"), inherited.games["42"]) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt index d9c0dd8f38..4f1be7eac0 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt @@ -35,7 +35,7 @@ class ModeSettingsLoadingTest { @Test fun desktopDoesNotConsumeSteamsAppliedShaderChoice() { val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() SessionPrefs.setShaderPrecache(activity, false) - val applied = File(LinuxRuntime.rootDir(activity), "root/.bl-shader-precache-applied") + val applied = File(LinuxRuntime.rootDir(activity), "root/.dd-shader-precache-applied") applied.parentFile!!.mkdirs() applied.writeText("0") load(activity, SessionService.MODE_DESKTOP) diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt index 20e83499e8..4f029316f2 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt @@ -82,7 +82,7 @@ class FrameStatsTest { } @Test fun guestFrameTimesMoveByThePausedSessionsClockShift() { - val control = java.io.File.createTempFile("bl-clock", null) + val control = java.io.File.createTempFile("dd-clock", null) try { control.writeBytes(java.nio.ByteBuffer.allocate(8).order(java.nio.ByteOrder.LITTLE_ENDIAN).putLong(62_283_930_706L).array()) val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames"), clockControl = control) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index 2534a85dd1..cf78bed84f 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -60,10 +60,10 @@ class BwrapSpawnerTest { val env = mutableMapOf( "DDNATV_ROOT" to rootfs, "DDNATV_BINDS" to "/dev:/dev", "HOME" to "/root", "SPA_PLUGIN_DIR" to "/usr/local/lib/droiddeck-pipewire/lib/spa-0.2", - "LD_PRELOAD" to "/run/droiddeck-preload/libblsession.so:$rootfs/usr/local/lib/libblsession.so:$rootfs/usr/lib/libddnatv-hook.so", + "LD_PRELOAD" to "/run/droiddeck-preload/libddsession.so:$rootfs/usr/local/lib/libddsession.so:$rootfs/usr/lib/libddnatv-hook.so", ) BwrapSpawner.withoutRootfsSettings(env, rootfs) - assertEquals(mapOf("HOME" to "/root", "LD_PRELOAD" to "/run/droiddeck-preload/libblsession.so"), env) + assertEquals(mapOf("HOME" to "/root", "LD_PRELOAD" to "/run/droiddeck-preload/libddsession.so"), env) val onlySession = mutableMapOf("LD_PRELOAD" to "$rootfs/usr/lib/libddnatv-hook.so") BwrapSpawner.withoutRootfsSettings(onlySession, rootfs) assertTrue(onlySession.isEmpty()) @@ -117,33 +117,33 @@ class BwrapSpawnerPlanTest { lib.parentFile!!.mkdirs() lib.writeText("") val root = File(dir, "root").apply { mkdirs() } - for (session in listOf(emptyMap(), mapOf("BL_DESKTOP" to "1"), - mapOf("BL_DESKTOP" to "1", "GALLIUM_DRIVER" to "zink", "MESA_LOADER_DRIVER_OVERRIDE" to "zink"))) { + for (session in listOf(emptyMap(), mapOf("DD_DESKTOP" to "1"), + mapOf("DD_DESKTOP" to "1", "GALLIUM_DRIVER" to "zink", "MESA_LOADER_DRIVER_OVERRIDE" to "zink"))) { val env = session.toMutableMap() val binds = BwrapSpawner.gpu(runtime.path, root, env, true)!! assertTrue(binds.any { it.host == lib.canonicalPath && it.guest == "/run/droiddeck-gpu/libvulkan_freedreno.so" }) assertEquals("/run/droiddeck-gpu/freedreno_icd.json", env["VK_DRIVER_FILES"]) assertEquals("zink", env["GALLIUM_DRIVER"]) - assertEquals(session["BL_DESKTOP"], env["BL_DESKTOP"]) + assertEquals(session["DD_DESKTOP"], env["DD_DESKTOP"]) } for (choice in listOf(mapOf("VK_DRIVER_FILES" to "/custom/icd.json"), mapOf("VK_ICD_FILENAMES" to ""), mapOf("LIBGL_ALWAYS_SOFTWARE" to "1"))) { - val env = (choice + ("BL_DESKTOP" to "1")).toMutableMap() + val env = (choice + ("DD_DESKTOP" to "1")).toMutableMap() val original = env.toMap() assertEquals(null, BwrapSpawner.gpu(runtime.path, root, env, true)) assertEquals(original, env) } - val env = mutableMapOf("BL_DESKTOP" to "1", "GALLIUM_DRIVER" to "llvmpipe") + val env = mutableMapOf("DD_DESKTOP" to "1", "GALLIUM_DRIVER" to "llvmpipe") assertTrue(BwrapSpawner.gpu(runtime.path, root, env, true)!!.isNotEmpty()) assertEquals("llvmpipe", env["GALLIUM_DRIVER"]) - val gamescope = mutableMapOf("BL_DESKTOP" to "1", "LIBGL_ALWAYS_SOFTWARE" to "1", "GAMESCOPE_WAYLAND_DISPLAY" to "gamescope-0") + val gamescope = mutableMapOf("DD_DESKTOP" to "1", "LIBGL_ALWAYS_SOFTWARE" to "1", "GAMESCOPE_WAYLAND_DISPLAY" to "gamescope-0") assertTrue(BwrapSpawner.gpu(runtime.path, root, gamescope, true)!!.isNotEmpty()) - val unavailable = mutableMapOf("BL_DESKTOP" to "1") + val unavailable = mutableMapOf("DD_DESKTOP" to "1") assertEquals(null, BwrapSpawner.gpu(runtime.path, root, unavailable, false)) - assertEquals(mapOf("BL_DESKTOP" to "1"), unavailable) + assertEquals(mapOf("DD_DESKTOP" to "1"), unavailable) assertTrue(lib.delete()) assertEquals(null, BwrapSpawner.gpu(runtime.path, root, unavailable, true)) - assertEquals(mapOf("BL_DESKTOP" to "1"), unavailable) + assertEquals(mapOf("DD_DESKTOP" to "1"), unavailable) } @Test fun buildsTheTreeFlatpakAsksFor() { @@ -181,8 +181,8 @@ class BwrapSpawnerPlanTest { @Test fun fexSandboxesStartThroughTheEnvTheyBringAndSkipArmPreloads() { val context = RuntimeEnvironment.getApplication() val rootfs = LinuxRuntime.rootDir(context) - val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } - val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + val lib = File(rootfs, "usr/local/lib/libddsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libddsession.so\n") } try { val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")) .put("envTool", "/run/droiddeck-fex/bin/env"), dir) @@ -197,12 +197,12 @@ class BwrapSpawnerPlanTest { @Test fun sandboxedAppsSeeTheSessionsNetworkLink() { val context = RuntimeEnvironment.getApplication() val rootfs = LinuxRuntime.rootDir(context) - val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } - val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + val lib = File(rootfs, "usr/local/lib/libddsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libddsession.so\n") } val link = File(rootfs, "etc/droiddeck-net").apply { writeText("if wlan0 2 1500\n") } try { val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) - assertEquals("/run/droiddeck-preload/libblsession.so", plan.env["LD_PRELOAD"]) + assertEquals("/run/droiddeck-preload/libddsession.so", plan.env["LD_PRELOAD"]) assertEquals(link.path, plan.binds.single { it.guest == "/etc/droiddeck-net" }.host) } finally { listOf(lib, preload, link).forEach { it.delete() } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt index a921259b16..027ed9359b 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt @@ -93,4 +93,41 @@ class LegacyNamesTest { assertEquals("Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/other.AppImage\n", File(root, "usr/share/applications/other.desktop").readText()) } + + @Test fun homeMarkersKeepTheirStateAndRetiredLibrariesGo() { + write("root/.bl-lossless-asked", "1") + write("root/.bl-compat-pending", "550\n") + write("root/.dd-seed-beat", "new") + write("root/.bl-seed-beat", "old") + write("usr/local/lib/libblsession.so", "old") + write("usr/local/lib/droiddeck-fex/x86_64/libblsession.so", "old") + write("usr/local/lib/libddsession.so", "new") + LegacyNames.migrateRootfs(root) + assertEquals("1", File(root, "root/.dd-lossless-asked").readText()) + assertEquals("550\n", File(root, "root/.dd-compat-pending").readText()) + assertEquals("new", File(root, "root/.dd-seed-beat").readText()) + assertFalse(File(root, "root/.bl-lossless-asked").exists()) + assertFalse(File(root, "root/.bl-seed-beat").exists()) + assertFalse(File(root, "usr/local/lib/libblsession.so").exists()) + assertFalse(File(root, "usr/local/lib/droiddeck-fex/x86_64/libblsession.so").exists()) + assertEquals("new", File(root, "usr/local/lib/libddsession.so").readText()) + } + + @Test fun queuedRequestsUnderBothNamesAreAllKept() { + write("root/.bl-proton-extra", "ge") + write("root/.dd-proton-extra", "em\n") + LegacyNames.migrateRootfs(root) + assertEquals("em\nge\n", File(root, "root/.dd-proton-extra").readText()) + assertFalse(File(root, "root/.bl-proton-extra").exists()) + } + + @Test fun queuedRequestsStaySeparateWhenTheNewQueueIsUnterminated() { + write("root/.bl-proton-extra", "ge\n") + write("root/.dd-proton-extra", "cachyos") + write("root/.bl-steam-urls", "steam://run/440") + write("root/.dd-steam-urls", "steam://run/570") + LegacyNames.migrateRootfs(root) + assertEquals("cachyos\nge\n", File(root, "root/.dd-proton-extra").readText()) + assertEquals("steam://run/570\nsteam://run/440\n", File(root, "root/.dd-steam-urls").readText()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt b/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt index 7d44b10873..06e9073b3c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt @@ -679,11 +679,11 @@ class EsyncPacksTest { val root = temp.newFolder("rootfs") EsyncPacks.store(root).mkdirs() assertEquals(0, EsyncPacks.fetchWanted(context, root)) - GameEnvironmentStore.save(context, GameEnvironment.Config(games = mapOf("42" to mapOf("BL_SYNC_FALLBACK" to "1")))) + GameEnvironmentStore.save(context, GameEnvironment.Config(games = mapOf("42" to mapOf("DD_SYNC_FALLBACK" to "1")))) assertTrue(EsyncPacks.enabled(context)) - GameEnvironmentStore.save(context, GameEnvironment.Config(shared = mapOf("BL_SYNC_FALLBACK" to "1"))) + GameEnvironmentStore.save(context, GameEnvironment.Config(shared = mapOf("DD_SYNC_FALLBACK" to "1"))) assertTrue(EsyncPacks.enabled(context)) - GameEnvironmentStore.save(context, GameEnvironment.Config(games = mapOf("42" to mapOf("BL_SYNC_FALLBACK" to "0")))) + GameEnvironmentStore.save(context, GameEnvironment.Config(games = mapOf("42" to mapOf("DD_SYNC_FALLBACK" to "0")))) assertFalse(EsyncPacks.enabled(context)) SessionPrefs.setSyncFallback(context, true) assertTrue(EsyncPacks.enabled(context)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt index 3f4fa2f75d..8d01ba52eb 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt @@ -41,6 +41,6 @@ class FexCatalogTest { @Test fun theSessionGetsTheBuildAndEverySource() { val env = FexCatalog.environment(FexCatalog.Build("fex-2610-r5", url, sha), listOf(url, "https://ghfast.top/$url")) - assertEquals(listOf("BL_FEX_TAG=fex-2610-r5", "BL_FEX_SHA256=$sha", "BL_FEX_URLS=$url https://ghfast.top/$url"), env) + assertEquals(listOf("DD_FEX_TAG=fex-2610-r5", "DD_FEX_SHA256=$sha", "DD_FEX_URLS=$url https://ghfast.top/$url"), env) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt index da16928da6..3cae943151 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt @@ -315,4 +315,12 @@ class GameEnvironmentStoreTest { GameEnvironmentStore.save(context, config) assertEquals(config, GameEnvironmentStore.read(context)) } + + @Test fun savedSettingsFromBeforeTheRenameKeepTheirValues() { + val json = JSONObject("""{"version":1,"shared":{"BL_SYNC":"1","DXVK_HUD":"fps"}, + "games":{"440":{"BL_FSYNC_FIRST":"1","BL_SYNC_FALLBACK":"0","DD_SYNC_FALLBACK":"1"}}}""") + val config = GameEnvironmentStore.decode(json) + assertEquals(mapOf("DD_SYNC" to "1", "DXVK_HUD" to "fps"), config.shared) + assertEquals(mapOf("DD_FSYNC_FIRST" to "1", "DD_SYNC_FALLBACK" to "1"), config.games["440"]) + } } 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 44aa6c73cd..7d2087f6fc 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -39,7 +39,7 @@ class SessionSuspendControllerTest { assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) assertEquals(0, fixture.unacknowledged) assertTrue(fixture.game.threads.all { it.state == 't' }) - assertFalse(File(fixture.control.parentFile, ".bl-zram.ack.$GAME").exists()) + assertFalse(File(fixture.control.parentFile, ".dd-zram.ack.$GAME").exists()) } @Test fun unchangedSwapIsNotTakenForAFinishedPageOut() { @@ -478,8 +478,8 @@ class SessionSuspendControllerTest { var emptyGameTasks = false var rootGone = false var afterSleep: (() -> Unit)? = null - val control = File(tmp, ".bl-zram") - val clock = File(tmp, ".bl-clock") + val control = File(tmp, ".dd-zram") + val clock = File(tmp, ".dd-clock") var clockAtContinue: Long? = null var clockAtMapping: Long? = null val pagedOut = mutableListOf>() @@ -582,7 +582,7 @@ class SessionSuspendControllerTest { "TracerPid: ${group.tracer}\n" + if (group == game) "VmRSS:\t$gameResidentKb kB\nVmSwap:\t$gameSwapKb kB\n" else "", ) - if (group == game) File(dir, "maps").writeText("7f00000000-7f00001000 r-xp 00000000 fe:05 42 /usr/local/lib/libblsession.so\n") + if (group == game) File(dir, "maps").writeText("7f00000000-7f00001000 r-xp 00000000 fe:05 42 /usr/local/lib/libddsession.so\n") val taskDir = File(dir, "task") if (group == game && missingGameTasks) { taskDir.deleteRecursively(); continue } taskDir.mkdirs() diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index 52920aefca..99bbba886f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -250,7 +250,7 @@ class SteamDownloadMonitorTest { File(steam, "package").mkdirs() File(steam, "package/bannerlator-installed").writeText("1\n") assertFalse(SteamDownloadMonitor.clientInstallPending(root)) - File(root, "root/.bl-steam-repair").writeText("1\n") + File(root, "root/.dd-steam-repair").writeText("1\n") assertTrue(SteamDownloadMonitor.clientInstallPending(root)) } finally { root.deleteRecursively() diff --git a/docs/agent-control.md b/docs/agent-control.md index 171f0960c7..ed9fbcf1e3 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -151,7 +151,7 @@ tools/droiddeckctl env set DXVK_HUD=fps tools/droiddeckctl env list tools/droiddeckctl env clear [next|persistent|all] tools/droiddeckctl override gamescope ./gamescope -tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl override libddfastpath.so ./libddfastpath.so tools/droiddeckctl proot-profile enable --slow-us 1000 tools/droiddeckctl proot-profile disable tools/droiddeckctl proot-profile report ./session.log --sort wall @@ -436,7 +436,7 @@ through first, since the launcher window carries the game's app id too: `proot-profile enable` queues handler profiling for the next session using the existing debugging consent gate. Counters and bounded slow samples appear in `session.log`; `proot-profile report` ranks a saved local log without ADB. This measures PRoot handler work, not full syscall latency. -`override libblfastpath.so FILE` selects a glibc ARM64 shared library in the next session's preload +`override libddfastpath.so FILE` selects a glibc ARM64 shared library in the next session's preload list, reports its SHA-256, and refuses installation until the current session stops. It lasts for one session; the next session stages the bundled library again. See [the profiling workflow](development/proot-performance.md#finding-the-next-fast-path) for timing diff --git a/docs/development/arm64-steam-client.md b/docs/development/arm64-steam-client.md index bb9120017b..9fd6ed8177 100644 --- a/docs/development/arm64-steam-client.md +++ b/docs/development/arm64-steam-client.md @@ -10,7 +10,7 @@ publishes it on the Steam Deck client channels. `droiddeck-steam-install` instal Valve also publishes `steam_client_steamdeck_stable_linuxarm64`. - `droiddeck-steam-install --channel` prints the channel in use. The session passes that value as `-clientbeta` and writes it to `package/beta`. The two must match, or the client loops on rc 42. -- Setting: `BL_STEAM_CHANNEL`, otherwise `~/.config/droiddeck/steam-channel`, set to `beta` or +- Setting: `DD_STEAM_CHANNEL`, otherwise `~/.config/droiddeck/steam-channel`, set to `beta` or `stable`. A set channel never changes on its own. - With no setting, the client falls back to `steamdeck_stable` automatically. It stays on stable (`package/droiddeck-channel`) until a setting says otherwise. The fallback happens: diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 48fd915cf3..434aa22679 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -1,6 +1,6 @@ # Low-memory reclaim and userspace compression -The Steam session monitor uses the existing `libblsession.so` page-out request to reclaim +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. @@ -58,7 +58,7 @@ percentage: Android's `lmkd` killed a session on a 7.5 GiB device with 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 (`BL_ZRAM_IDLE=0`); launcher compression +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 @@ -71,7 +71,7 @@ for either to complete, so a slow launcher acknowledgement does not delay the ga 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 -`libblsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. +`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, diff --git a/docs/development/mali-venus.md b/docs/development/mali-venus.md index fa72294e42..caf0d2db70 100644 --- a/docs/development/mali-venus.md +++ b/docs/development/mali-venus.md @@ -164,7 +164,7 @@ App (Kotlin/C): - Gives a zero row pitch a packed 64-byte row (gamescope's 1x1 root buffer). - `gpu/GpuInfo.kt`, `FrontEndActivity.kt`, `core/DeviceReport.kt`: wording, plus a "Venus" line in `device.txt`. - `session/SessionFiles.kt`: stages the Mali compatibility layer when the APK carries it. -- `tools/linuxfs/preload/venus.c` (new, part of `libblsession`): unsets `LIBGL_KOPPER_DISABLE` when `VN_DEBUG` has `vtest`. +- `tools/linuxfs/preload/venus.c` (new, part of `libddsession`): unsets `LIBGL_KOPPER_DISABLE` when `VN_DEBUG` has `vtest`. - Steam's `steamwebhelper.sh` sets it unconditionally. - Without kopper and without DRI3, Zink gets no GL context, and the Steam UI crash-loops. - Steam restores that script when it verifies its install, so it cannot be edited. diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 634b7bc63a..254106016a 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -47,7 +47,7 @@ waits; it does not establish a full-install PRoot overhead percentage. ``` SessionService ─HostProcess─▶ libproot.so (ONE tracer process, nice -6 after 2 s) └─ /usr/bin/env -i … droiddeck-session steam - └─ gamescope ─▶ droiddeck-session (BL_INSIDE) ─▶ steamrtarm64/steam (+ steamwebhelper/CEF tree) + └─ gamescope ─▶ droiddeck-session (DD_INSIDE) ─▶ steamrtarm64/steam (+ steamwebhelper/CEF tree) └─ reaper ─▶ droiddeck-game-env ─▶ droiddeck-proton ─▶ Valve ARM64 Proton (python) └─ wine (arm64ec, FEX loaded in-process as a DLL) ─▶ wineserver, game.exe, … ``` @@ -56,7 +56,7 @@ SessionService ─HostProcess─▶ libproot.so (ONE tracer process, nice -6 aft - The options are `--kill-on-exit`, `--kernel-release=…` (kompat, for the hostname), `-i uid:uid` (fake_id0, for Xwayland's `setgid`/`setuid`), and about 25 binds: `/dev`, `/proc`, `/sys`, fake `/proc` and `/sys` files, the GPU node, `/dev/shm`, storage and the game libraries. -- `/etc/ld.so.preload` loads `libblsession.so` (the `tools/linuxfs/preload/*.c` shims) into every +- `/etc/ld.so.preload` loads `libddsession.so` (the `tools/linuxfs/preload/*.c` shims) into every guest process. - The Flatpak sandboxes (`BwrapSpawner`) already run in **separate** proot instances, started from the Android side. @@ -187,9 +187,9 @@ Checked against bionic `android16-release`: |---|---|---| | `rseq`, `set_robust_list` | **blocked** | glibc, at the start of every thread, while all signals are blocked | | `faccessat2` | **blocked** | glibc's `faccessat()`, which tries it on **every** call before falling back, so 2 round trips (`access()` calls the plain `faccessat` syscall directly) | -| `fchmodat2`, `openat2` | **blocked** | newer glibc, Flatpak/libglnx, FEX's rootfs lookups (`libblsession.so` turns `openat2` into `openat`, resolving `RESOLVE_IN_ROOT` paths component by component inside the root) | +| `fchmodat2`, `openat2` | **blocked** | newer glibc, Flatpak/libglnx, FEX's rootfs lookups (`libddsession.so` turns `openat2` into `openat`, resolving `RESOLVE_IN_ROOT` paths component by component inside the root) | | `setuid`, `setgid` and the rest of the family | **blocked** | Xwayland (hence `-i`) | -| `futex_waitv`, `io_uring_*`, `landlock_*` | **blocked** | Proton's fsync (droiddeck-fsync answers `futex_waitv` in `libblsession.so`), some engines | +| `futex_waitv`, `io_uring_*`, `landlock_*` | **blocked** | Proton's fsync (droiddeck-fsync answers `futex_waitv` in `libddsession.so`), some engines | | `clone3` | blocked before Android 15 | glibc `pthread_create` | | `close_range` | blocked on Android 12 | | | `statx`, `process_vm_readv`/`writev`, `memfd_create`, `pidfd_*`, `seccomp` | allowed | | @@ -300,7 +300,7 @@ it needs `patches/0014`, enabled with `PROOT_FASTPATH=1`. library file itself at the fixed address instead, as proot's loader does for every program. - Nothing claims `0xffff00000` first. - The stub's syscalls pass Android's filter. They should: all are allowed. -- **Integrate into `libblsession.so`** rather than a second preload. `opens.c` and `pathcache.c` +- **Integrate into `libddsession.so`** rather than a second preload. `opens.c` and `pathcache.c` already define `open` and `access`, so their "real" call should become the fast path. That also removes the second library's load cost, about 0.2–0.4 ms per exec that is still unexplained (see the exec row above). @@ -375,19 +375,19 @@ Build a **glibc ARM64** library using the same toolchain as the shipped fast pat docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" \ -v "$PWD:/src" -w /src droiddeck-local-cross:24.04-v3 \ aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o /src/libblfastpath.so tools/proot/fastpath/fastpath.c -ldl + -o /src/libddfastpath.so tools/proot/fastpath/fastpath.c -ldl tools/droiddeckctl stop -tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl override libddfastpath.so ./libddfastpath.so tools/droiddeckctl proot-profile enable tools/droiddeckctl start steam --wait ``` -The existing override bridge now recognizes `libblfastpath.so`: it checks ELF class, endianness, +The existing override bridge now recognizes `libddfastpath.so`: it checks ELF class, endianness, type, and machine, reports SHA-256, and selects that file in `/etc/ld.so.preload` for one session. It rejects installation while a session is active. This is an architecture check, not validation of libc compatibility or the library's behavior. The fast path still requires its normal enabled -setting and the patched PRoot pack. Its basename stays `libblfastpath.so`, so `libblsession`'s FEX +setting and the patched PRoot pack. Its basename stays `libddfastpath.so`, so `libddsession`'s FEX routing finds it. Guest-command restaging retains the active selection. After stopping, the next session stages the bundled preload again; `env clear all` cancels queued overrides. diff --git a/docs/development/proroot-analysis.md b/docs/development/proroot-analysis.md index 7d4139c35a..8136f96e20 100644 --- a/docs/development/proroot-analysis.md +++ b/docs/development/proroot-analysis.md @@ -63,7 +63,7 @@ handles the same constraint with `libproot-loader.so`. ## Compared with DroidDeck -| | DroidDeck (proot + 0001–0018 + `libblfastpath.so`) | proroot | +| | DroidDeck (proot + 0001–0018 + `libddfastpath.so`) | proroot | |---|---|---| | exec, `PT_INTERP`, `/proc/self/exe` | proot's loader under ptrace, 0.4–0.8 ms per exec | Its own loaders, with no tracer; also needs its own ld.so with a glibc offset table | | path calls through libc wrappers | fast path, about 0.6–1.9 µs | runtime hooks | @@ -82,7 +82,7 @@ DroidDeck is as a fast path *in front of* proot. ## What is worth taking -1. **Patch glibc's svc sites from `libblfastpath.so`'s constructor.** This is the largest gain +1. **Patch glibc's svc sites from `libddfastpath.so`'s constructor.** This is the largest gain and the cheapest way to do option 6 in [proot-performance](proot-performance.md) ("a proot-aware glibc") without rebuilding glibc. - For `libc.so.6` (and `ld-linux-aarch64.so.1` for runtime `dlopen`), rewrite each `svc #0` @@ -136,7 +136,7 @@ netlink and SysV shm (`netif.c` and `sysv.c` already cover these); and the long- `tools/proot/fastpath/svc-patch.h`, included by `fastpath.c`, implements the first slice of item 1. It runs automatically in fresh processes using the replacement -`libblfastpath.so` when the ordinary fast-path configuration and tracer-key check +`libddfastpath.so` when the ordinary fast-path configuration and tracer-key check succeed. Set `PROOT_FP_PATCH_SVC=0` to disable it for troubleshooting or comparisons; `PROOT_FP_PATCH_SVC=1` also explicitly enables it. It skips processes that already have multiple threads, and declines SVE/SME hardware because the relay preserves the base ARM64 register state. diff --git a/docs/development/steam-display-scaling.md b/docs/development/steam-display-scaling.md index 496995ad05..a5c5a674f0 100644 --- a/docs/development/steam-display-scaling.md +++ b/docs/development/steam-display-scaling.md @@ -13,7 +13,7 @@ very high-resolution panels and on foldables? ## How the session is sized today (main @ c636eea3) - `droiddeck-session` starts gamescope with `-W/-H` (output) = `-w/-h` (nested, what games and the - client see) = `BL_WIDTH x BL_HEIGHT`, the per-mode "Resolution" setting. The default is + client see) = `DD_WIDTH x DD_HEIGHT`, the per-mode "Resolution" setting. The default is `1280x720` (`SessionDisplay.DEFAULT_RESOLUTION`). One Xwayland server holds both the Steam client and the games. - The Android compositor (`waylandcomp`) draws gamescope's output into a panel-sized swapchain @@ -68,7 +68,7 @@ fullscreen off, with a spike build of `feat/steam-native-output`. Each run sets Steam UI idle: GPU 0%, gamescope 27 dma-bufs, Xwayland 39. Everything renders at 1920x1080. -### Run 2: client height cap (`BL_STEAM_MAX_HEIGHT=720`) +### Run 2: client height cap (`DD_STEAM_MAX_HEIGHT=720`) - Log: `== steam: the client's height capped at 720 (was unset)`. The client never wrote its own value during the run, so a one-time set would hold. @@ -173,15 +173,15 @@ restored): the session starts at `size=1280x720` and the device report shows `72 ### How runs 2 to 6 were driven -Two temporary session-script hooks, not kept on this branch: `BL_STEAM_MAX_HEIGHT=N` wrote -`GAMESCOPE_STEAM_MAX_HEIGHT` on the root window, and `BL_GAME_XWAYLAND_MODE=WxH` wrote +Two temporary session-script hooks, not kept on this branch: `DD_STEAM_MAX_HEIGHT=N` wrote +`GAMESCOPE_STEAM_MAX_HEIGHT` on the root window, and `DD_GAME_XWAYLAND_MODE=WxH` wrote `GAMESCOPE_XWAYLAND_MODE_CONTROL = 1,W,H,0` five seconds after `GAMESCOPE_FOCUSED_APP` showed a game. `--xwayland-count 2` and `STEAM_MULTIPLE_XWAYLANDS=1` went through `Download/droiddeck-env`. ## Two Xwayland servers by default (`feat/steam-dual-xwayland`) Steam sessions now start gamescope with `--xwayland-count 2` and `STEAM_MULTIPLE_XWAYLANDS=1`. -`BL_XWAYLAND_COUNT=1` in `Android/data/com.droiddeck.launcher/files/droiddeck-env` goes back to one. The session script's +`DD_XWAYLAND_COUNT=1` in `Android/data/com.droiddeck.launcher/files/droiddeck-env` goes back to one. The session script's root-window requests that are meant for the game (the drawer's live Force fullscreen, `GAMESCOPE_FORCE_WINDOWS_FULLSCREEN`, and the resume watcher's `GAMESCOPE_RESTORE_FOCUS_WINDOW`) go to both displays, `$DISPLAY` and `STEAM_GAME_DISPLAY_0`. gamescope reads both per server, so @@ -221,8 +221,8 @@ With games on their own Xwayland server, FlatOut 2 no longer shrinks under the Q reason "Force game windows fullscreen" existed. What it still did was make any game whose Game Resolution differs from what it draws fight it (runs 4 and 5). The switch is gone from Steam settings (Games) and the session drawer (Display), along with its preference, the -`BL_GAMESCOPE_FORCE_FULLSCREEN` flag, the `~/.droiddeck-fill` live watcher and the device report -line. `BL_GAMESCOPE_ARGS=--force-windows-fullscreen` in `Android/data/com.droiddeck.launcher/files/droiddeck-env` still passes the +`DD_GAMESCOPE_FORCE_FULLSCREEN` flag, the `~/.droiddeck-fill` live watcher and the device report +line. `DD_GAMESCOPE_ARGS=--force-windows-fullscreen` in `Android/data/com.droiddeck.launcher/files/droiddeck-env` still passes the flag for an experiment. Device check (Thor): Alan Wake's American Nightmare with its 1280x720 Game Resolution runs on `:1` diff --git a/docs/development/steam-touch-controls.md b/docs/development/steam-touch-controls.md index 9cb6bc1bbd..72cea31ce3 100644 --- a/docs/development/steam-touch-controls.md +++ b/docs/development/steam-touch-controls.md @@ -38,7 +38,7 @@ SteamTouchConfig (Steam's configs) ←─── output reports ←── Ste - **Plugging.** The device is plugged in only while Steam's controls are shown: always in a Steam session with that choice, since a handheld's built-in pad would keep Auto off for good. Unplugging ends the device's report stream (the client lets the controller go); either way libfakeinput - sends a udev event through `udevmon.c`'s stand-in monitor (`bl_udevmon_inject`), since the + sends a udev event through `udevmon.c`'s stand-in monitor (`dd_udevmon_inject`), since the sandbox gives the client no kernel uevents and its HID discovery would never look again. ## Layouts diff --git a/docs/development/stores.md b/docs/development/stores.md index e8ff8fcbd0..9776ac8c4c 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -270,7 +270,7 @@ A game's web links reach Android: `droiddeck-store-launch` sets the prefix's `HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also `xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in Android's browser. EOS uses this when a sign-in needs a one-time step ("corrective action"): it -falls back to a browser, the user approves on the phone, and the game signs in. `BL_DEBUG_BROWSER=1` +falls back to a browser, the user approves on the phone, and the game signs in. `DD_DEBUG_BROWSER=1` in droiddeck-env adds `WINEDEBUG=+shell,+winebrowser`. Epic's EOS overlay is not provisioned (with it games exited while loading); an `OverlayPath` an earlier build wrote is removed at launch. The parked overlay work is on the branch `park/epic-eos-overlay`. diff --git a/docs/development/thor-sd-storage-investigation.md b/docs/development/thor-sd-storage-investigation.md index e2cee625a5..e4315616eb 100644 --- a/docs/development/thor-sd-storage-investigation.md +++ b/docs/development/thor-sd-storage-investigation.md @@ -426,7 +426,7 @@ path. still fall back. Same workloads on the Thor, stock library against the new one (session started with -`droiddeckctl override libblfastpath.so`, PRoot profiler on): +`droiddeckctl override libddfastpath.so`, PRoot profiler on): | Workload | Stock | New | |---|---|---| diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index cf25613687..7679a0a6c8 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -2,7 +2,7 @@ Valve's x86-64 Linux Steam client, run unchanged under FEX beside the default arm64 client. It is opt-in: Steam settings, **Steam client: x86-64** (`steamClientArch`, passed to the -session as `BL_STEAM_CLIENT_ARCH=x86_64`, applies from the next session), or the desktop menu entry +session as `DD_STEAM_CLIENT_ARCH=x86_64`, applies from the next session), or the desktop menu entry **Steam x86-64 (FEX, experimental)**. The Library lists the active client's games and tags its header "x86-64" while that client's list is shown. This page records why each workaround exists and what was seen on devices. The timeline is in `docs/progress-log.md`. @@ -11,7 +11,7 @@ on devices. The timeline is in `docs/progress-log.md`. VAC-secured servers ("Connection Blocked ... VAC secured server") and no client log mentions VAC. VAC modules are x86 code. Under FEX the x86-64 client has a module it can run, as SteamLite does in Wine. -**Layout.** Everything lives in its own home, `$X64_HOME` (`BL_X64_HOME`, default `~/.droiddeck-x64`): +**Layout.** Everything lives in its own home, `$X64_HOME` (`DD_X64_HOME`, default `~/.droiddeck-x64`): its own `~/.steam` links, config, libraries, x86 rootfs and log (`steam-x64.log`). Shared with the arm64 client: the sign-in, and its `config/uioverrides` (Steam's startup movie overrides), which the x86 client links. One client runs at a time, since both use the same account; the standalone launcher shuts the @@ -76,7 +76,7 @@ arm64 client down first. - **Tracer.** proot is a tracer, so tier0 believes a debugger is attached and breaks into it with int3 on the first failed assertion: the web helper died of SIGTRAP a second after every start. `preload/tracer.c` exempts web helpers on purpose (Chromium traps on a status fd that is not - procfs); with `BL_WEBHELPER_HIDE_TRACER=1` only opens called from `libtier0_s.so` get the copy + procfs); with `DD_WEBHELPER_HIDE_TRACER=1` only opens called from `libtier0_s.so` get the copy without the tracer. - **FEXServer owns the rootfs.** A FEX process takes its rootfs from FEXServer, and a server started earlier without `FEX_ROOTFS` (any FEX run in the guest) serves none: every x86 library lookup fell @@ -86,7 +86,7 @@ arm64 client down first. never got a browser up. FEX looks in the rootfs first, so an empty `rootfs/dev/dri` hides the node. - **Scout runtime.** Valve ships it as `ubuntu12_32/steam-runtime.tar.xz` and `steam.sh` unpacks it. Since `steam.sh` is not used, `--prepare` unpacks it when its checksum changes. -- **Repair.** Repair Steam (`BL_X64_REPAIR=1`), or two starts in a row that never showed the client +- **Repair.** Repair Steam (`DD_X64_REPAIR=1`), or two starts in a row that never showed the client (`package/droiddeck-unconfirmed`; the app clears the count once the client is on screen), removes the install stamp so the client is reinstalled. Counts from before this was tracked are dropped rather than taken as failed starts. `droiddeck-steam-install` removes the repair request when it is @@ -100,10 +100,10 @@ arm64 client down first. - **FEX settings.** The app's PERFORMANCE_TSO preset (`core/FexPreset.kt`, WinNative's default). FEX's own defaults keep half-barrier TSO and full-precision x87, which cost every x86 program time. Values already in the environment win. -- **Fast path.** libblfastpath, preloaded into every guest process and so into FEX, broke FEX's 32-bit +- **Fast path.** libddfastpath, preloaded into every guest process and so into FEX, broke FEX's 32-bit mode (SIGILL at start). It stands down when FEX is about to run a 32-bit program; 64-bit programs - keep it. `BL_X64_FP_OFF=1` turns it off for everything. -- **Diagnostics.** `BL_FEX` runs another FEX build (a `DEBUG_STRACE` one, say). `BL_FEXSERVER_LOG` + keep it. `DD_X64_FP_OFF=1` turns it off for everything. +- **Diagnostics.** `DD_FEX` runs another FEX build (a `DEBUG_STRACE` one, say). `DD_FEXSERVER_LOG` starts a FEXServer in the foreground logging there; every FEX process that logs to "server" (`FEX_OUTPUTLOG` or an AppConfig) then has its lines tagged with its pid (file logs overwrite each other). @@ -113,18 +113,18 @@ arm64 client down first. The client's web helper draws its whole UI. There are two: - **The arm64 client's helper** (`droiddeck-x64-arm-webhelper`), used when both clients are the same - Steam build (unless `BL_X64_X86_WEBHELPER=1`). FEX hands the arm64 program to the CPU, so it runs + Steam build (unless `DD_X64_X86_WEBHELPER=1`). FEX hands the arm64 program to the CPU, so it runs natively with the session's preloads (KGSL poll fix, fast path) and the arm64 session's GPU settings. It talks to the client over IPC, and a helper of another build never comes up: the client restarted it every 10 s (device: 1790721607 against 1790904859). The session therefore updates the arm64 client's parts on the same channel first (`droiddeck-steam-install --sync steamdeck_publicbeta`). With this helper the client itself gets the GPU: it shows every Big Picture frame the helper draws, and in software (llvmpipe under FEX) that held the UI at about 20 fps - (`BL_X64_CLIENT_SOFTWARE=1` keeps it in software). Device: 144 fps menus. + (`DD_X64_CLIENT_SOFTWARE=1` keeps it in software). Device: 144 fps menus. - **The client's own x86 helper on the GPU** (`droiddeck-x64-webhelper`), otherwise: ANGLE's GL backend through FEX's GL thunk to zink and Turnip. On ANGLE's Vulkan backend the x86 compositor thread was the bottleneck (16 fps against 60). Never `--in-process-gpu`, the preload's default: a - GPU crash there took the whole helper down (102 restarts). `BL_X64_CEF_GPU=0` keeps it in software. + GPU crash there took the whole helper down (102 restarts). `DD_X64_CEF_GPU=0` keeps it in software. Its GPU process loads libpci, which exits when `/sys/bus/pci/devices` lists a device whose files the app may not read (a RedMagic's PCIe root ports): every GPU process exited with status 1 in about 50 ms, software ones too, until Chromium gave up ("GPU process isn't usable") and the menus stayed @@ -132,7 +132,7 @@ The client's web helper draws its whole UI. There are two: 0 GPU process exits, ANGLE on zink and Turnip. The session shim (`preload/net.c`) turns `steamrt64/steamwebhelper.sh`'s exec of `./steamwebhelper` -into `BL_X64_ARM_WEBHELPER`. Nothing in the client's folder is edited: the client checksums its files +into `DD_X64_ARM_WEBHELPER`. Nothing in the client's folder is edited: the client checksums its files as it starts and reinstalled itself over an edited launcher (2-3 minutes) on every start. Quick Access Menu and flicker, x86 helper: @@ -149,7 +149,7 @@ Quick Access Menu and flicker, x86 helper: `LIBGL_KOPPER_DISABLE=true` none did in 60 opens, at 60 fps instead of about 140 (Xwayland's per-window timing for child windows). No flashes was chosen over frame rate. -Software path (no host thunks, or `BL_X64_SOFTWARE=1`): x86 Mesa has no driver for this GPU, so +Software path (no host thunks, or `DD_X64_SOFTWARE=1`): x86 Mesa has no driver for this GPU, so llvmpipe for GL (the client's own window needs GLX) and the rootfs's own Vulkan ICDs (lavapipe). GLX first failed because the desktop exports zink over the arm64 Turnip ICD; those variables are cleared. `LIBGL_DRI3_DISABLE=1`: over DRI3 the X server hands out the GPU node and Mesa's software path then @@ -187,7 +187,7 @@ alone would then read as an installed client. 0008). FEX opened every rootfs path with `openat2(RESOLVE_IN_ROOT)` and fell through to the arm64 guest on anything but EXDEV; x86 bash could not find libtinfo. Since r4 the fallback resolves the path inside the rootfs itself (absolute symlinks restart at the rootfs, as `RESOLVE_IN_ROOT` does); - before, they resolved against the arm64 guest. `libblsession.so` (`preload/robust.c`) answers + before, they resolved against the arm64 guest. `libddsession.so` (`preload/robust.c`) answers `openat2` first in practice and does the same walk for `RESOLVE_IN_ROOT` callers, so Valve's FEX-Emu on the arm64 client gets it too. Each path component is then its own system call. - `0002-thunkgen-newer-clang`: the container's newer clang has no `FileManager::clearStatCache()`, @@ -214,7 +214,7 @@ alone would then read as an installed client. - **Where the app gets it.** The app downloads FEX from Droid-Deck/DroidDeck-Components, where nothing is uploaded by hand. The app follows its `fex.json`: it reads it from Components' `main` (directly, at most every ten minutes) and keeps the last copy, and every session passes - that build to `droiddeck-fex-update` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download + that build to `droiddeck-fex-update` (`DD_FEX_TAG`, `DD_FEX_SHA256`, `DD_FEX_URLS` with the download source's mirrors). The script installs a build only after its archive matches the sha256 and every program in it loads (`ld-linux --list`); the files it replaces are kept aside until the installed copy loads too and put back otherwise, and the tag is written last. Otherwise it keeps the installed one while that still loads, @@ -246,7 +246,7 @@ alone would then read as an installed client. - **Mapping** (`x64_map_direct`): every game the client's appinfo cache shows with a Linux build (type game, oslist with linux; runtime from `config/app_mappings`: SteamLinuxRuntime_sniper or _soldier, none means scout), installed or not, so Steam downloads the Linux depots. A title on a tool chosen in - Properties keeps it, except `BL_X64_DIRECT_APPS` (Left 4 Dead 2, 550, by default), which is always + Properties keeps it, except `DD_X64_DIRECT_APPS` (Left 4 Dead 2, 550, by default), which is always taken back. `direct-auto.json` lists what was mapped. One pass over the mapping: a 2000-title fixture went from 16.5 s to 0.2 s with the same output. - A game whose Windows build is installed (it ran on a Proton before) stays a Windows game on the @@ -270,7 +270,7 @@ alone would then read as an installed client. in its container. - **GPU.** Games get FEX's host thunks and the session's GPU settings (Turnip, Zink), saved by the launcher as `game-gpu.env` and rewritten whenever it runs; `game-gpu.local` is the user's, never - rewritten, and is read after it. `BL_X64_GAME_SOFTWARE=1` keeps a game in software, with + rewritten, and is read after it. `DD_X64_GAME_SOFTWARE=1` keeps a game in software, with `mesa_glthread=false` (GL threading is no help with software GL under FEX). - Source games (`hl2.sh`, `hl2_linux`, `srcds`) get `-condebug` for the VAC diagnostics. - **Controllers.** `libfakeinput` is built for x86-64 and preloaded in the rootfs; Big Picture works @@ -316,7 +316,7 @@ alone would then read as an installed client. written only while no client runs. Shader pre-caching stays each client's own: the x86 client may fetch a shared game's shader cache into its own folder (Valheim, 1.8 GB). - **SD card.** The x86 client's card library is a folder inside the arm64 one (`/mnt/droiddeck-sd/x86-64`, - `GameStorage.X64_CARD_DIR`, passed as `BL_X64_STEAM_LIBRARIES`), so the install dialog offers Internal + `GameStorage.X64_CARD_DIR`, passed as `DD_X64_STEAM_LIBRARIES`), so the install dialog offers Internal Storage and SD card. compatdata, shadercache and runtime tools stay private, as in the arm64 card library. FEX runs x86 programs from the noexec exFAT card. The folder appears with the client's first session on the card and its `steamapps` with the first library write. Desktop sessions prepare it as @@ -378,7 +378,7 @@ alone would then read as an installed client. it. It keeps the game display Steam chose: the saved `DISPLAY=:0` hid the game window and made DiRT Showdown exit after about 7 s. Proton takes its Steam client parts from the client's install folder, and the x86 client's are x86, so `STEAM_COMPAT_CLIENT_INSTALL_PATH` points at the arm64 root - and `BL_X64_STEAM_ROOT` keeps the x86 one for install-script lookups. + and `DD_X64_STEAM_ROOT` keeps the x86 one for install-script lookups. - **Game overlay.** The x86 client preloads its own x86 overlay; the arm64 one takes its place. The overlay marks the game's windows with the Steam app ID, and without it gamescope never shows them (FlatOut ran and played sound behind Steam's launch screen, "steam app id: 0"). The agent also tags @@ -425,7 +425,7 @@ alone would then read as an installed client. to secure servers."). That console reaches a file only with `-condebug`: `//console.log`, or `/game//console.log` for Source 2. At session start the app writes `~/.droiddeck-vac-diagnostics` (start time, client, each console.log's length, since `-condebug` - appends). The launch wrapper (`bl_vacdiag`) then adds `-condebug` to Source titles (found by + appends). The launch wrapper (`dd_vacdiag`) then adds `-condebug` to Source titles (found by `gameinfo.txt` or `gameinfo.gi`), flags `-insecure` in launch options and notes each launch. At the end the session copies what each console.log gained into `vac/`, scrubbed, and writes `vac.txt`: the game's secure/insecure lines, VAC lines in the client's logs, and which client files are present. A @@ -440,7 +440,7 @@ alone would then read as an installed client. ## Session integration, restarts and mapping -- With `BL_STEAM_CLIENT_ARCH=x86_64`, `droiddeck-session` updates the arm64 client's parts +- With `DD_STEAM_CLIENT_ARCH=x86_64`, `droiddeck-session` updates the arm64 client's parts (`droiddeck-steam-install`, then `--sync steamdeck_publicbeta`), runs `droiddeck-steam-x64 --prepare` and starts the client with `droiddeck-steam-x64 --exec`. Steps only for the arm64 client (library registration, the ARM64 Proton fetch, the live compat helper) are skipped; added games, @@ -450,7 +450,7 @@ alone would then read as an installed client. failed at ../src/pulse/operation.c:136 pa_operation_get_state()", the runtime's PulseAudio 13). `preload/pulseguard.c` (x86 builds only; the arm64 client does not hit it) answers a missing operation as cancelled and ignores its unref and cancel. The session passes `-steamdeck -steamos3` unless - `BL_X64_DECK=0`. Switch to Desktop is expected to need no change (an x86 shell under FEX runs + `DD_X64_DECK=0`. Switch to Desktop is expected to need no change (an x86 shell under FEX runs `steamos-session-select`); the full switch has not been tested on a device. - **Process names.** Under FEX a process's argv[0] is FEX and the program is its first argument. The session's game detection, CPU pinning and the zRAM watcher read that argument. Steam pins itself and @@ -459,13 +459,13 @@ alone would then read as an installed client. `steam-compatibility --x64 --live` and `droiddeck-steam-x64 --map-direct --live`, every 15 s and only in the session's first hour (720 beats of 5 s). A title installed after that is mapped when the client exits and takes effect from the next session. Steam reads a - mapping changed while it runs only at its next start, so changed titles go to `.bl-compat-pending`. + mapping changed while it runs only at its next start, so changed titles go to `.dd-compat-pending`. Once they have installed (`StateFlags` 4 in the client's root or its card folder) and no game runs, the client is restarted once per title, at most 3 times a session. - **After exit.** Added games, `steam-compatibility --x64` and `--map-direct` run again: the client wrote its mapping from memory as it exited, over what the live passes set. - The Lossless Scaling ownership probe and the Steam import watcher reach the x86 client through the - arm64 client's `steamclient.so` (`BL_STEAMCLIENT`); the watcher restarts the client with + arm64 client's `steamclient.so` (`DD_STEAMCLIENT`); the watcher restarts the client with `droiddeck-steam-x64 --exec -shutdown`. - Steam logs and the Steam language come from the x86 client's home. On the desktop, `steam` and `steamdeck-steam` start the selected client, and the desktop game entries list its libraries. diff --git a/docs/progress-log.md b/docs/progress-log.md index 30b558b86b..462affde2a 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -58,7 +58,7 @@ the timeline, then lessons and backlog. Companion to the README (what the app *d `mirror-release.yml`, checked against a new `fex.json` catalog there (Components PR #2), and `droiddeck-steam-x64` downloads it from there instead of The412Banner/DroidDeck. - **FEX fex-2610-r4** (PR #71 review): without openat2 (proot) FEX opened rootfs paths with absolute - symlinks resolved against the arm64 guest, and `libblsession.so` converted every openat2 the same way + symlinks resolved against the arm64 guest, and `libddsession.so` converted every openat2 the same way before FEX saw ENOSYS. `preload/robust.c` now resolves `RESOLVE_IN_ROOT` paths component by component inside the root (59 cases; 100,000-path differential fuzz; new `test_openat2_preload.py`), and patch 0001 does the same in FEX. Patch 0003 marks only the host mappings that overlap a failed MAP_32BIT @@ -313,7 +313,7 @@ stay as they were (`afa479ee`). - **Merged main (94 commits).** Main dropped the Steam channel and Deck-mode settings (#546): only the client choice (`steamClientArch`), `activeSteamRoot` and VAC diagnostics remain. Main's web-helper - arguments (#566, `bl_webhelper_argv`) are composed with the x86 client's arm64 web-helper redirect in + arguments (#566, `dd_webhelper_argv`) are composed with the x86 client's arm64 web-helper redirect in `preload/net.c`. Main's single background loop (#575) now carries the x86 hooks: the client's own compat pass (`--x64 --live`), `steamrt64` in the pinning and stale-tmp patterns, Lossless probe off for x86, and the once-per-title restart after a new mapping. The text-strings merge had dropped three of @@ -483,7 +483,7 @@ cache is saved as the round goes, so a sync the user closes the app on still lea paths (`SessionPrefs.gameFolderBinds`), so the listing and every Steam shortcut are unchanged; `addedGamesDirs` is cleared. Log: `games: migrated → N games`. - **Libraries:** `GameStorage.gamesFolderLibraries` returns only a Games folder Steam installed - into (an appmanifest in its `steamapps/`); the others drop out of `BL_STEAM_LIBRARIES` and the + into (an appmanifest in its `steamapps/`); the others drop out of `DD_STEAM_LIBRARIES` and the runtime's `droiddeck-steam-library` forgets the `/root/Games/...` entries it had registered. The user's two folders have `steamapps/` without manifests (checked on the device), so both go. - **Tests:** `GamesFolderMigrationTest` (exe / appid / name / removal kept, guest paths unchanged, @@ -510,7 +510,7 @@ What it took, in order (each step was the next failure on device): could not find libtinfo. `tools/fex/patches/0001-openat2-enosys-fallback.patch`. - **FEXServer owns the rootfs** - a server started before `FEX_ROOTFS` (any earlier FEX run) answers every client with no rootfs. The launcher stops it first. -- **32-bit x86 died with SIGILL** - libblfastpath (the proot fast path, preloaded into every guest +- **32-bit x86 died with SIGILL** - libddfastpath (the proot fast path, preloaded into every guest process, FEX itself included) breaks FEX's 32-bit mode. `PROOT_FP_OFF=1` for FEX. - **"Steam now requires user namespaces"** - steam-runtime-check-requirements' bwrap probe; the arm64 client has no such probe. The SteamRT3 client (`steamrt64/steam`) is started directly, the @@ -518,7 +518,7 @@ What it took, in order (each step was the next failure on device): runtime linked file by file and only the probe replaced. - **tier0 assertion "Function not implemented"** - semget: Android has no System V IPC. Traced with a `-DDEBUG_STRACE` FEX (build-fex.yml `cxxflags` input, artifact only). The session shim - (`preload/*.c`) is now also built natively as `libblsession-x86_64.so`, staged, and preloaded + (`preload/*.c`) is now also built natively as `libddsession-x86_64.so`, staged, and preloaded through the rootfs's own `/etc/ld.so.preload`. - **re-exec into pressure-vessel after self-update** - `STEAM_STEAMRT_RECURSION_GUARD=1`. - **libgtk-x11-2.0 missing / soname links / old glibc shadowing** - Valve's steamrt3c platform @@ -526,10 +526,10 @@ What it took, in order (each step was the next failure on device): and only libraries the rootfs lacks (LD_LIBRARY_PATH beats system folders whatever its order). - **GLX failed** - the desktop exports zink over the arm64 Turnip ICD; cleared, llvmpipe used. - **web helper died of SIGTRAP a second after start** - found with pid-tagged traces (FEX AppConfig - `OutputLog=server` + a foreground FEXServer, `BL_FEXSERVER_LOG`; file logs overwrite each other): + `OutputLog=server` + a foreground FEXServer, `DD_FEXSERVER_LOG`; file logs overwrite each other): every web helper read `/proc/self/status` from libtier0_s.so, saw proot as a tracer, and tier0 broke into the "debugger" with int3. `preload/tracer.c` exempts the web helper on purpose (Chromium traps - on a status fd that is not procfs); with `BL_WEBHELPER_HIDE_TRACER=1` only opens called from + on a status fd that is not procfs); with `DD_WEBHELPER_HIDE_TRACER=1` only opens called from libtier0_s.so get the copy. - `SessionFiles` stages `bannerlator-steam-x64` and the x86-64 shim (they were missing from the list). @@ -545,7 +545,7 @@ Later the same day (device-proven unless noted): - From an audit of `bannerlator-session`: stale lock cleanup, branch sync before every start, core re-pinning, path cache and `perms.c` for `steamrt64`, the app's FEX preset (PERFORMANCE_TSO). - **Play button (built, not yet device-tested)**: Steam settings > Client > "Steam client: ARM64 / - x86-64 (FEX, experimental)" (`BL_STEAM_CLIENT_ARCH`). The session then starts the x86 client via + x86-64 (FEX, experimental)" (`DD_STEAM_CLIENT_ARCH`). The session then starts the x86 client via `bannerlator-steam-x64 --prepare/--exec` and gives it everything it gives the arm64 one; steps only for the arm64 client (ARM64 Proton, mapping, seeding, Decky, steamclient.so probes) are skipped. @@ -908,7 +908,7 @@ without it and Setup says "Stores engine not built"). launch, so it is removed (user decision): no overlay switch, no download, no `OverlayPath`; a launch removes a pointer an earlier build wrote, and the app deletes an earlier 656 MB download once. The work is parked on `park/epic-eos-overlay` (at `bf81104`). Kept: the browser hand-off, - the Epic card (sign-in, offline, Resolve Epic sign-in) and `BL_DEBUG_BROWSER`. + the Epic card (sign-in, offline, Resolve Epic sign-in) and `DD_DEBUG_BROWSER`. - **A game launched from the Games tab with no session running sat at "Launching"** (device, 2026-10-09-04-steam, and 2026-10-08-05 before it). The session put `steam://rungameid/` on the client's command line; the client took it seconds before its interface was up (focus went to @@ -931,9 +931,9 @@ without it and Setup says "Stores engine not built"). browser in the prefix (`"Browsers"="/usr/local/bin/droiddeck-open-url,xdg-open"`, an absolute path that does not depend on Wine's PATH), linked as `xdg-open` first on the game's PATH, and reading the session channel from `/tmp/droiddeck-browser/launch-dir` when Wine does not pass - `BL_LAUNCH_DIR` on. Whether EOS calls ShellExecute at all in its browser flow (rather than handing + `DD_LAUNCH_DIR` on. Whether EOS calls ShellExecute at all in its browser flow (rather than handing a verification URI and code to the game to show) is what the next run's `droiddeck xdg-open:` line, - or `BL_DEBUG_BROWSER=1` in droiddeck-env (`WINEDEBUG=+shell,+winebrowser`), will show. + or `DD_DEBUG_BROWSER=1` in droiddeck-env (`WINEDEBUG=+shell,+winebrowser`), will show. - **Resolve Epic sign-in** (the Epic card): opens Epic's account page behind its sign-in in Android's browser, where a pending corrective action (privacy policy, EULA) is presented. - **Epic overlay off by default** (device A/B, Metalstorm: overlay pointer set → exits while diff --git a/docs/testing/steam-in-kde.md b/docs/testing/steam-in-kde.md index 306e9a20dc..caa1e6a8f9 100644 --- a/docs/testing/steam-in-kde.md +++ b/docs/testing/steam-in-kde.md @@ -2,7 +2,7 @@ The [Discord report](https://discord.com/channels/1552707793247539220/1552707794430459916/1558974992753098874) describes Steam replacing KDE with a gamescope session. The launcher unconditionally wrote `steam-launch`, which tells the Android app to end KDE and start Steam under gamescope. Other desktop applications have a separate GPU wrapper; this change addresses Steam's desktop client. -Desktop Steam now runs the existing session supervisor with `BL_INSIDE=1` on KDE's inherited Xwayland display and authentication. CEF uses software rendering because KDE's QPainter compositor accepts shared-memory buffers. Big Picture continues to request the explicit gaming session. A lock keeps repeated menu clicks from starting another supervisor while Steam is starting or updating; subsequent clicks wait for Steam's live IPC pipe and then forward the Steam URL to the existing client. This also prevents a second click during cold startup from launching a client without software CEF. KDE retains its own agent and clipboard helpers when Steam starts and exits. +Desktop Steam now runs the existing session supervisor with `DD_INSIDE=1` on KDE's inherited Xwayland display and authentication. CEF uses software rendering because KDE's QPainter compositor accepts shared-memory buffers. Big Picture continues to request the explicit gaming session. A lock keeps repeated menu clicks from starting another supervisor while Steam is starting or updating; subsequent clicks wait for Steam's live IPC pipe and then forward the Steam URL to the existing client. This also prevents a second click during cold startup from launching a client without software CEF. KDE retains its own agent and clipboard helpers when Steam starts and exits. Validation on AYN Thor uses the full wireless ADB serial `adb-d234a848-fv2FDl (2)._adb-tls-connect._tcp`. Live script testing displayed the authenticated library, restored the main window from maximized to windowed, opened Settings as a separate window, and forwarded a second launch to Downloads. KDE's panel remained visible, no gamescope process started, and no session handoff file was written. Quitting Steam returned to the running Plasma desktop with its agent still available. An explicit Big Picture launch then switched to a Steam session and reached READY with Steam focused. diff --git a/tools/build_local.sh b/tools/build_local.sh index fa49414b15..6f8d004ffa 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -128,15 +128,15 @@ docker run --rm --platform "${docker_platform}" \ -o "$d/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libfakeinput.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$d/libblsession.so" tools/linuxfs/preload/*.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$d/libblsession.so" + -o "$d/libddsession.so" tools/linuxfs/preload/*.c -ldl + aarch64-linux-gnu-strip --strip-unneeded "$d/libddsession.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$d/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$d/libblfastpath.so" + -o "$d/libddfastpath.so" tools/proot/fastpath/fastpath.c -ldl + aarch64-linux-gnu-strip --strip-unneeded "$d/libddfastpath.so" bash tools/nativeguest/build.sh "$d/libddnatv-hook.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ - -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$d/libblaudit.so" tools/proot/fastpath/audit.c - aarch64-linux-gnu-strip --strip-unneeded "$d/libblaudit.so" + -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$d/libddaudit.so" tools/proot/fastpath/audit.c + aarch64-linux-gnu-strip --strip-unneeded "$d/libddaudit.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$d/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libssbs.so" diff --git a/tools/components/build-arm64-preloads.sh b/tools/components/build-arm64-preloads.sh index e06aa2afc1..7b4cc7d03c 100644 --- a/tools/components/build-arm64-preloads.sh +++ b/tools/components/build-arm64-preloads.sh @@ -7,15 +7,15 @@ aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compa -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl aarch64-linux-gnu-strip --strip-unneeded "$D/libfakeinput.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl -aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" + -o "$D/libddsession.so" tools/linuxfs/preload/*.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libddsession.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl -aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" + -o "$D/libddfastpath.so" tools/proot/fastpath/fastpath.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libddfastpath.so" bash tools/nativeguest/build.sh "$D/libddnatv-hook.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ - -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c -aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" + -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libddaudit.so" tools/proot/fastpath/audit.c +aarch64-linux-gnu-strip --strip-unneeded "$D/libddaudit.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$D/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$D/libssbs.so" diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json index 45beb41529..fdb5640b21 100644 --- a/tools/components/preloads.lock.json +++ b/tools/components/preloads.lock.json @@ -102,16 +102,16 @@ "url": "https://github.com/Droid-Deck/DroidDeck/actions/runs/39992155294" }, "outputs": { - "i386/libblsession.so": "5343cdb704217ddc81ee593e67d5987363dc7b5ac78bd4bd36000219e5063268", + "i386/libddsession.so": "5343cdb704217ddc81ee593e67d5987363dc7b5ac78bd4bd36000219e5063268", "i386/libfakeinput.so": "188d88dfb13b6e2f2df948e7b8b4d9ec604770f55d1ea5b6b9e21ad56a74ce5e", "i386/libfaultreport.so": "95f9ef60f04a13ee60cfbd4d2d2efb60a7063b722e646c78c9dc27162292877b", - "libblaudit.so": "6c6abe89baf5d7309babee0c3372a4b00c2b689e2a63de38c5e9a660626509b5", - "libblfastpath.so": "0e1f151b5c1c5ea9dd380ad58d09f8fe7ba3ae037d0991cb3eef6899e9d5ec83", - "libblsession.so": "29d4b5ea46dba941107e02c0ee544244b137a339cada43bff65c350f2ef2755a", + "libddaudit.so": "6c6abe89baf5d7309babee0c3372a4b00c2b689e2a63de38c5e9a660626509b5", + "libddfastpath.so": "0e1f151b5c1c5ea9dd380ad58d09f8fe7ba3ae037d0991cb3eef6899e9d5ec83", + "libddsession.so": "29d4b5ea46dba941107e02c0ee544244b137a339cada43bff65c350f2ef2755a", "libfakeinput.so": "5f6dc3aea05de2dc1fbe0bbfac2ce4d11e3d47f761c6b06c8badb15fe1904392", "libssbs.so": "c288ed0da26c2481aff270d1cdafe1205061c4a300c2c46ae1b53c6e0c94f44b", "usr/local/bin/droiddeck-clipboard": "ec50e8f67fdf76372927189b0fdb670f9b70fd3484f2fe3e833bc8f9fdc44205", - "x86_64/libblsession.so": "61d19f06aebab6a789f8c99f687af9903376bfc853e46b70c48a2ce5e497accc", + "x86_64/libddsession.so": "61d19f06aebab6a789f8c99f687af9903376bfc853e46b70c48a2ce5e497accc", "x86_64/libfakeinput.so": "8663dd2086bf8ae53069a480dd9ae4619109d32f0947a29e2ce38f07a21ae2e6", "x86_64/libfaultreport.so": "bb0dc9165d0d764473e552508650edd586df16d620fc5b16b8b1c5740a28ce22", "x86_64/libvulkan-thunk.so": "74f01b652d7e8179561a096a552328b68da640cc4bad3981edd38e6afbf90243", diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 92fcc548a4..2ccfff641b 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -62,10 +62,10 @@ ], "outputs": [ "app/src/main/assets/linuxfs/x86_64/libfakeinput.so", - "app/src/main/assets/linuxfs/x86_64/libblsession.so", + "app/src/main/assets/linuxfs/x86_64/libddsession.so", "app/src/main/assets/linuxfs/x86_64/libfaultreport.so", "app/src/main/assets/linuxfs/i386/libfakeinput.so", - "app/src/main/assets/linuxfs/i386/libblsession.so", + "app/src/main/assets/linuxfs/i386/libddsession.so", "app/src/main/assets/linuxfs/i386/libfaultreport.so", "app/src/main/assets/linuxfs/x86_64/libwebkitinput.so", "app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so" @@ -83,10 +83,10 @@ ], "snapshot_outputs": [ "x86_64/libfakeinput.so", - "x86_64/libblsession.so", + "x86_64/libddsession.so", "x86_64/libfaultreport.so", "i386/libfakeinput.so", - "i386/libblsession.so", + "i386/libddsession.so", "i386/libfaultreport.so", "x86_64/libwebkitinput.so", "x86_64/libvulkan-thunk.so" @@ -169,9 +169,9 @@ ], "outputs": [ "app/src/main/assets/linuxfs/libfakeinput.so", - "app/src/main/assets/linuxfs/libblsession.so", - "app/src/main/assets/linuxfs/libblfastpath.so", - "app/src/main/assets/linuxfs/libblaudit.so", + "app/src/main/assets/linuxfs/libddsession.so", + "app/src/main/assets/linuxfs/libddfastpath.so", + "app/src/main/assets/linuxfs/libddaudit.so", "app/src/main/assets/linuxfs/libssbs.so", "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard", "app/src/main/assets/linuxfs/libddnatv-hook.so" @@ -194,9 +194,9 @@ ], "snapshot_outputs": [ "libfakeinput.so", - "libblsession.so", - "libblfastpath.so", - "libblaudit.so", + "libddsession.so", + "libddfastpath.so", + "libddaudit.so", "libssbs.so", "usr/local/bin/droiddeck-clipboard", "libddnatv-hook.so" diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 2ade313d41..15675a1797 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -1355,7 +1355,7 @@ def build_parser() -> argparse.ArgumentParser: env_clear = env_ops.add_parser("clear") env_clear.add_argument("scope", nargs="?", choices=["next", "persistent", "all"], default="next") - override = commands.add_parser("override", help="override a program or libblfastpath.so for the next session (debugging tools)") + override = commands.add_parser("override", help="override a program or libddfastpath.so for the next session (debugging tools)") override.add_argument("name", help="the program name, e.g. gamescope") override.add_argument("path", help="the local file to push") diff --git a/tools/linuxfs/build-x86-preloads.sh b/tools/linuxfs/build-x86-preloads.sh index 0e0abffcde..a9c32a18d6 100755 --- a/tools/linuxfs/build-x86-preloads.sh +++ b/tools/linuxfs/build-x86-preloads.sh @@ -8,12 +8,12 @@ for arch in x86_64 i386; do esac mkdir -p "$out/$arch" gcc $bits -shared -fPIC -O2 -Wall -pthread \ - -o "$out/$arch/libblsession.so" tools/linuxfs/preload/*.c -ldl + -o "$out/$arch/libddsession.so" tools/linuxfs/preload/*.c -ldl g++ $bits -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ -o "$out/$arch/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl - strip --strip-unneeded "$out/$arch/libblsession.so" "$out/$arch/libfakeinput.so" - for lib in "$out/$arch/libblsession.so" "$out/$arch/libfakeinput.so"; do + strip --strip-unneeded "$out/$arch/libddsession.so" "$out/$arch/libfakeinput.so" + for lib in "$out/$arch/libddsession.so" "$out/$arch/libfakeinput.so"; do newest=$(objdump -T "$lib" | grep -o 'GLIBC_2\.[0-9]*' | sort -u -t. -k2,2n | tail -1) minor=${newest#GLIBC_2.} if [ "$minor" -gt 31 ]; then diff --git a/tools/linuxfs/check-preloads.sh b/tools/linuxfs/check-preloads.sh index a21d785ca8..0f801f87a0 100644 --- a/tools/linuxfs/check-preloads.sh +++ b/tools/linuxfs/check-preloads.sh @@ -15,12 +15,12 @@ done if grep -qxE '__gxx_personality_v0|__cxa_throw|_Unwind_Resume' <<<"$FAKE"; then echo "::error::libfakeinput.so exports the C++ runtime"; exit 1 fi -SESSION=$(syms "$D/libblsession.so") +SESSION=$(syms "$D/libddsession.so") for sym in socket bind getsockname setsockopt statfs statvfs syscall shm_open shm_unlink mmap mmap64 munmap mprotect drmPrimeFDToHandle drmCloseBufferHandle; do - grep -qx "$sym" <<<"$SESSION" || { echo "::error::libblsession.so does not export $sym"; exit 1; } + grep -qx "$sym" <<<"$SESSION" || { echo "::error::libddsession.so does not export $sym"; exit 1; } done if grep -qx drmIoctl <<<"$SESSION"; then - echo "::error::libblsession.so exports drmIoctl"; exit 1 + echo "::error::libddsession.so exports drmIoctl"; exit 1 fi SSBS=$(syms "$D/libssbs.so") for sym in sigaction signal bsd_signal sysv_signal; do diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 972a1b607e..d063bab657 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -19,15 +19,15 @@ done 2>/dev/null export DROIDDECK_NESTED_SCALE=1 export DROIDDECK_GLTHREAD=${mesa_glthread:-} unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 mesa_glthread -if [ -n "${BL_DEBUG_DIR:-}" ]; then - mkdir -p "$BL_DEBUG_DIR" 2>/dev/null || true - exec >>"$BL_DEBUG_DIR/desktop.log" 2>&1 - echo "== droiddeck-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${BL_WIDTH:-1280}x${BL_HEIGHT:-720}" +if [ -n "${DD_DEBUG_DIR:-}" ]; then + mkdir -p "$DD_DEBUG_DIR" 2>/dev/null || true + exec >>"$DD_DEBUG_DIR/desktop.log" 2>&1 + echo "== droiddeck-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${DD_WIDTH:-1280}x${DD_HEIGHT:-720}" fi find "$XDG_RUNTIME_DIR" -mindepth 1 -maxdepth 1 ! -name 'wayland-0*' ! -name 'keymap.xkb' -exec rm -rf {} + 2>/dev/null chmod 700 "$XDG_RUNTIME_DIR" 2>/dev/null mkdir -p /tmp/.X11-unix /tmp/.ICE-unix && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix 2>/dev/null -export BL_DESKTOP=1 +export DD_DESKTOP=1 ln -sf /usr/local/bin/droiddeck-steam-launch /usr/local/bin/steamdeck-steam 2>/dev/null ln -sf /usr/local/bin/droiddeck-steam-shim /usr/local/bin/steam 2>/dev/null python3 /usr/local/bin/droiddeck-desktop-games 2>&1 | sed 's/^/[games] /' @@ -134,7 +134,7 @@ dbus-run-session -- startplasma-wayland rc=$? /usr/local/bin/droiddeck-pipewire stop echo "== droiddeck-desktop: Plasma ended ($rc)" -if [ "$rc" -eq 0 ] && [ -z "${BL_BOTTOM_DESKTOP:-}" ]; then +if [ "$rc" -eq 0 ] && [ -z "${DD_BOTTOM_DESKTOP:-}" ]; then /usr/local/bin/droiddeck-steam-launch bigpicture sleep 30 fi diff --git a/tools/linuxfs/desktop/droiddeck-desktop-gpu b/tools/linuxfs/desktop/droiddeck-desktop-gpu index 061d646208..a0173f7b6d 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop-gpu +++ b/tools/linuxfs/desktop/droiddeck-desktop-gpu @@ -15,7 +15,7 @@ CHROMIUM_FLAGS = " --no-sandbox --ozone-platform=x11" def enabled(): - return os.environ.get("BL_DESKTOP_GPU", "on").strip().lower() not in ("off", "0", "no", "false") + return os.environ.get("DD_DESKTOP_GPU", "on").strip().lower() not in ("off", "0", "no", "false") def main_group(text): diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index da4bf7e41c..380caa4d63 100644 --- a/tools/linuxfs/desktop/droiddeck-gpu +++ b/tools/linuxfs/desktop/droiddeck-gpu @@ -1,30 +1,30 @@ #!/bin/bash set -u [ $# -gt 0 ] || { echo "usage: droiddeck-gpu [args...]" >&2; exit 64; } -if [ -n "${BL_DEBUG_DIR:-}" ]; then - exec >>"$BL_DEBUG_DIR/desktop.log" 2>&1 +if [ -n "${DD_DEBUG_DIR:-}" ]; then + exec >>"$DD_DEBUG_DIR/desktop.log" 2>&1 fi -width=${BL_WIDTH:-1280} -height=${BL_HEIGHT:-720} -backend=${BL_GAMESCOPE_BACKEND:-wayland} +width=${DD_WIDTH:-1280} +height=${DD_HEIGHT:-720} +backend=${DD_GAMESCOPE_BACKEND:-wayland} case "$backend" in wayland|sdl) ;; *) echo "== unsupported gamescope backend: $backend" >&2; exit 64 ;; esac window=0 -if [ "$backend" = wayland ] && [ "${BL_DESKTOP_GPU_WINDOW:-1}" != 0 ] && [ -n "${WAYLAND_DISPLAY:-}" ] && [ "$WAYLAND_DISPLAY" != wayland-0 ]; then +if [ "$backend" = wayland ] && [ "${DD_DESKTOP_GPU_WINDOW:-1}" != 0 ] && [ -n "${WAYLAND_DISPLAY:-}" ] && [ "$WAYLAND_DISPLAY" != wayland-0 ]; then window=1 parent=$WAYLAND_DISPLAY args=(--backend sdl --expose-wayland --follow-game-window-mode -W "$width" -H "$height" -w "$width" -h "$height") else args=(--backend "$backend" --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") fi -if [ "${BL_FPS:-0}" -gt 0 ]; then - args+=(-r "$BL_FPS") -elif [ "${BL_REFRESH:-0}" -gt 0 ]; then - args+=(-r "$BL_REFRESH") +if [ "${DD_FPS:-0}" -gt 0 ]; then + args+=(-r "$DD_FPS") +elif [ "${DD_REFRESH:-0}" -gt 0 ]; then + args+=(-r "$DD_REFRESH") fi -[ "${BL_HDR:-0}" = 1 ] && args+=(--hdr-enabled) +[ "${DD_HDR:-0}" = 1 ] && args+=(--hdr-enabled) if [ "$window" = 1 ]; then echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} in a window on $parent)" else @@ -38,7 +38,7 @@ wsi=",${MESA_VK_WSI_DEBUG:-}," while [[ $wsi == *,sw,* ]]; do wsi=${wsi//,sw,/,}; done wsi=${wsi#,}; wsi=${wsi%,} if [ -n "$wsi" ]; then export MESA_VK_WSI_DEBUG=$wsi; else unset MESA_VK_WSI_DEBUG; fi -export BL_DESKTOP_GPU_CHILD=1 +export DD_DESKTOP_GPU_CHILD=1 export MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true [ -n "${DROIDDECK_GLTHREAD:-}" ] && export mesa_glthread=$DROIDDECK_GLTHREAD export APPIMAGE_EXTRACT_AND_RUN=1 @@ -51,7 +51,7 @@ if ! command -v gamescopereaper >/dev/null 2>&1; then done fi if [ "$window" = 1 ]; then - export BL_GPU_CHILD_WSI=${MESA_VK_WSI_DEBUG:-} + export DD_GPU_CHILD_WSI=${MESA_VK_WSI_DEBUG:-} SDL_VIDEODRIVER=wayland MESA_VK_WSI_DEBUG=sw gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" else gamescope "${args[@]}" -- env SDL_VIDEODRIVER=x11 /usr/local/bin/droiddeck-gpu-window "$@" diff --git a/tools/linuxfs/desktop/kwin_wayland_wrapper b/tools/linuxfs/desktop/kwin_wayland_wrapper index a34e7455a0..81753d2a58 100755 --- a/tools/linuxfs/desktop/kwin_wayland_wrapper +++ b/tools/linuxfs/desktop/kwin_wayland_wrapper @@ -1,5 +1,5 @@ #!/bin/bash -if [ "${BL_DESKTOP:-}" = 1 ]; then - set -- --wayland-display wayland-0 --socket wayland-1 --width "${BL_WIDTH:-1280}" --height "${BL_HEIGHT:-720}" --no-lockscreen "$@" +if [ "${DD_DESKTOP:-}" = 1 ]; then + set -- --wayland-display wayland-0 --socket wayland-1 --width "${DD_WIDTH:-1280}" --height "${DD_HEIGHT:-720}" --no-lockscreen "$@" fi exec /usr/bin/kwin_wayland_wrapper "$@" diff --git a/tools/linuxfs/overlay/usr/bin/steamos-session-select b/tools/linuxfs/overlay/usr/bin/steamos-session-select index eaac87341b..35f9bebbaf 100644 --- a/tools/linuxfs/overlay/usr/bin/steamos-session-select +++ b/tools/linuxfs/overlay/usr/bin/steamos-session-select @@ -3,9 +3,9 @@ echo "steamos-session-select: $*" >&2 case "${1:-}" in ""|gamescope) exit 0 ;; esac -dir=${BL_LAUNCH_DIR:-} +dir=${DD_LAUNCH_DIR:-} if [ -z "$dir" ] || [ ! -d "$dir" ]; then - echo "steamos-session-select: not inside a DroidDeck session (BL_LAUNCH_DIR unset)" >&2 + echo "steamos-session-select: not inside a DroidDeck session (DD_LAUNCH_DIR unset)" >&2 exit 1 fi printf 'session=desktop\nui=desktop\nurl=\n' > "$dir/steam-launch.tmp" && mv -f "$dir/steam-launch.tmp" "$dir/steam-launch" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index eb860e3222..114e608e33 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -283,7 +283,7 @@ def sandboxed_apps(proc=Path("/proc")): def window_steam_app(win, flatpaks, proc=Path("/proc")): match = STEAM_APP_CLASS.match(win.get("class") or "") if match: - return match.group(1) if os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" else None + return match.group(1) if os.environ.get("DD_STEAM_CLIENT_ARCH") == "x86_64" else None pid = win.get("pid") if pid: if under_reaper(pid, proc): @@ -529,7 +529,7 @@ def cdp_port(agent_dir): try: port = (agent_dir / "cdp-port").read_text().strip() except OSError: - port = os.environ.get("BL_CDP_PORT", "") + port = os.environ.get("DD_CDP_PORT", "") if not port.isdigit(): raise AgentError("NO_DEVTOOLS", "The Steam client's DevTools port is not known (no Steam client in this session yet)") return int(port) @@ -1218,9 +1218,9 @@ def serve(agent_dir, focus=True, poll=0.1): def main(argv): - base = os.environ.get("BL_LAUNCH_DIR") + base = os.environ.get("DD_LAUNCH_DIR") if not base: - print("BL_LAUNCH_DIR is not set", file=sys.stderr) + print("DD_LAUNCH_DIR is not set", file=sys.stderr) return 2 if argv and argv[0] == "--wait-steam-shortcut-overview": if len(argv) not in (2, 3): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 1e76859e04..1944635308 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -467,7 +467,7 @@ def still_pages(root): def desktop_size(): - width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + width, height = os.environ.get("DD_WIDTH", ""), os.environ.get("DD_HEIGHT", "") if width.isdigit() and height.isdigit() and 0 < int(width) <= 7680 and 0 < int(height) <= 4320: return int(width), int(height) return 1280, 720 @@ -900,18 +900,18 @@ class Tidy: def desktop_gpu(): - if os.environ.get("BL_DESKTOP") != "1" or os.environ.get("BL_DESKTOP_GPU_CHILD"): + if os.environ.get("DD_DESKTOP") != "1" or os.environ.get("DD_DESKTOP_GPU_CHILD"): return None - if os.environ.get("BL_DESKTOP_GPU", "on").strip().lower() in ("off", "0", "no", "false"): + if os.environ.get("DD_DESKTOP_GPU", "on").strip().lower() in ("off", "0", "no", "false"): return None gpu = os.path.join(BIN, "droiddeck-gpu") return gpu if os.access(gpu, os.X_OK) else None def proton_options(): - if os.environ.get("BL_DESKTOP") == "1" and not os.environ.get("BL_DESKTOP_GPU_CHILD"): + if os.environ.get("DD_DESKTOP") == "1" and not os.environ.get("DD_DESKTOP_GPU_CHILD"): return ["--window"] - width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + width, height = os.environ.get("DD_WIDTH", ""), os.environ.get("DD_HEIGHT", "") options = ["--desktop", "%sx%s" % (width, height)] if width.isdigit() and height.isdigit() else [] game = os.environ.get("SteamGameId", "") return options + (["--game-id", game] if game.isdigit() and game != "0" else []) @@ -942,7 +942,7 @@ def queued_requests(launch_dir): def serve_requests(pfx, processes=None, launch_dir=None): - launch_dir = launch_dir or os.environ.get("BL_LAUNCH_DIR") + launch_dir = launch_dir or os.environ.get("DD_LAUNCH_DIR") names = queued_requests(launch_dir) if launch_dir else [] if not names or not agent_up(wine_processes(pfx) if processes is None else processes): return False @@ -1136,7 +1136,7 @@ def stop_leftovers(pfx): def open_client(root, reinstall=False): pfx = os.path.join(prefix(root), "pfx") write_menu() - answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + answer = ask_fex(os.environ.get("DD_LAUNCH_DIR")) say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) if running(pfx): say("Battle.net is already running in its prefix; waiting for it to close") @@ -1226,7 +1226,7 @@ def launch(root, code): try: own = None if lock is not None and not running(pfx): - answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + answer = ask_fex(os.environ.get("DD_LAUNCH_DIR")) say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) verb = None if stop_leftovers(pfx) else "run" configure(root, LIBRARY) @@ -1560,7 +1560,7 @@ def main(argv): if gpu: say("the desktop starts Battle.net on the GPU") os.execv(gpu, [gpu, os.path.abspath(sys.argv[0])] + list(sys.argv[1:])) - os.environ["BL_BATTLENET"] = "1" + os.environ["DD_BATTLENET"] = "1" if launching: say("launch %s" % argv[1]) return launch(root, argv[1]) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop index 2c19c23bed..768ce16942 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop @@ -2,16 +2,16 @@ # KDE Plasma on a dual-screen handheld's bottom screen, next to the session on the top one. set -u export HOME=${HOME:-/root} -if [ -n "${BL_DEBUG_DIR:-}" ]; then - mkdir -p "$BL_DEBUG_DIR" 2>/dev/null || true - exec >>"$BL_DEBUG_DIR/bottom-desktop.log" 2>&1 +if [ -n "${DD_DEBUG_DIR:-}" ]; then + mkdir -p "$DD_DEBUG_DIR" 2>/dev/null || true + exec >>"$DD_DEBUG_DIR/bottom-desktop.log" 2>&1 fi -echo "== droiddeck-bottom-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${BL_WIDTH:-?}x${BL_HEIGHT:-?} beside a ${BL_TOP_SESSION:-?} session" +echo "== droiddeck-bottom-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${DD_WIDTH:-?}x${DD_HEIGHT:-?} beside a ${DD_TOP_SESSION:-?} session" [ -x /usr/local/bin/droiddeck-desktop ] || { echo "== the desktop package is not installed"; exit 66; } # Launch requests would reach the top session's watcher and could replace it. -unset BL_LAUNCH_DIR BL_LOG -export BL_BOTTOM_DESKTOP=1 +unset DD_LAUNCH_DIR BL_LAUNCH_DIR DD_LOG +export DD_BOTTOM_DESKTOP=1 for _ in $(seq 1 100); do wayland-info >/dev/null 2>&1 && break diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks index 411a9c6bda..e91b7090ff 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks @@ -23,7 +23,7 @@ ET.register_namespace("bookmark", ICON_NS) def steam_libraries(home, data): steam = data / "Steam" libraries = {steam: "Internal Storage"} - listing = os.environ.get("BL_STEAM_LIBRARIES") + listing = os.environ.get("DD_STEAM_LIBRARIES") selected = None if listing: try: @@ -46,15 +46,15 @@ def steam_libraries(home, data): managed = path == LIBRARY or path.is_relative_to(home / "Games") or path.is_relative_to(ADDED) if selected is not None and managed and path not in selected: continue - if path == LIBRARY and selected is None and not os.environ.get("BL_LIBRARY_LABEL"): + if path == LIBRARY and selected is None and not os.environ.get("DD_LIBRARY_LABEL"): continue label = entry.get("label") label = re.sub(r'\\(["\\])', r'\1', label) if isinstance(label, str) else "" libraries[path] = label or path.name if selected is not None: libraries.update(selected) - elif os.environ.get("BL_LIBRARY_LABEL"): - libraries[LIBRARY] = os.environ["BL_LIBRARY_LABEL"] + elif os.environ.get("DD_LIBRARY_LABEL"): + libraries[LIBRARY] = os.environ["DD_LIBRARY_LABEL"] libraries[steam] = "Internal Storage" return {path.as_uri(): "Steam (" + (" ".join(label.split()) or path.name) + ")" for path, label in libraries.items() if path.is_absolute() and (path / "steamapps").is_dir()} @@ -68,7 +68,7 @@ def place_uri(uri): def removable_volumes(): - listing = os.environ.get("BL_DESKTOP_VOLUMES") + listing = os.environ.get("DD_DESKTOP_VOLUMES") if not listing: return {} volumes = {} @@ -168,7 +168,7 @@ def atomic_write(path, content): def main(): home = Path.home() config = Path(os.environ.get("XDG_CONFIG_HOME") or home / ".config") - label = os.environ.get("BL_LIBRARY_LABEL") + label = os.environ.get("DD_LIBRARY_LABEL") available = bool(label) and (LIBRARY / "steamapps").is_dir() update_bookmark(bookmarks_file(home, config), label if available else None) data = Path(os.environ.get("XDG_DATA_HOME") or home / ".local/share") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-clipboard b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-clipboard index ccb7768c62..014f305350 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-clipboard +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-clipboard @@ -1,6 +1,6 @@ #!/bin/bash -[ -n "${BL_ANDROID_CLIPBOARD:-}" ] && [ -n "${DISPLAY:-}" ] || exit 0 -/usr/local/bin/droiddeck-clipboard "$BL_ANDROID_CLIPBOARD" & +[ -n "${DD_ANDROID_CLIPBOARD:-}" ] && [ -n "${DISPLAY:-}" ] || exit 0 +/usr/local/bin/droiddeck-clipboard "$DD_ANDROID_CLIPBOARD" & child=$! trap 'kill "$child" 2>/dev/null' EXIT trap 'exit 0' TERM INT diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games index f49a90dd70..15fbee0d39 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games @@ -4,8 +4,8 @@ import re import sys HOME = os.environ.get("HOME", "/root") -X64 = os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" -CLIENT_HOME = (os.environ.get("BL_X64_HOME") or os.path.join(HOME, ".droiddeck-x64")) if X64 else HOME +X64 = os.environ.get("DD_STEAM_CLIENT_ARCH") == "x86_64" +CLIENT_HOME = (os.environ.get("DD_X64_HOME") or os.path.join(HOME, ".droiddeck-x64")) if X64 else HOME STEAM_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.path.join(CLIENT_HOME, ".local/share/Steam") LIBRARIES = ((STEAM_ROOT, "Steam Games"), ("/mnt/droiddeck-sd/x86-64" if X64 else "/mnt/droiddeck-sd", "SD Games")) NOT_GAMES = {228980, 1070560, 1161040, 1391110, 1493710, 1628350, 1826330, 3127680, 4183110, 4185400, 4427310, 4628740} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic index 883996aa7d..9f77cb5ff8 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic @@ -112,7 +112,7 @@ HIDDEN_ENV = { "DROIDDECK_EPIC_HIDDEN": "1", "EGL_DISABLE_STORE_PREWARM": "1", } -KEPT_ENV = ("HOME", "USER", "LOGNAME", "LANG", "LANGUAGE", "LC_ALL", "LC_MESSAGES", "TZ", "XDG_RUNTIME_DIR", "BL_LAUNCH_DIR") +KEPT_ENV = ("HOME", "USER", "LOGNAME", "LANG", "LANGUAGE", "LC_ALL", "LC_MESSAGES", "TZ", "XDG_RUNTIME_DIR", "DD_LAUNCH_DIR", "BL_LAUNCH_DIR") LAUNCH_VERBS = ("waitforexitandrun", "run", "runinprefix") EPIC_ARGS = ("-auth_", "-epic") CMD_SPECIAL = "&|<>^" @@ -720,7 +720,7 @@ def clear_playing(): def launch_dir(): - found = os.environ.get("BL_LAUNCH_DIR", "") + found = os.environ.get("DD_LAUNCH_DIR", "") if not found: try: with open(LAUNCH_DIR_FILE, encoding="utf-8") as f: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-esync b/tools/linuxfs/overlay/usr/local/bin/droiddeck-esync index d4cb5267ad..a817894ef1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-esync +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-esync @@ -39,7 +39,7 @@ MIN_NOFILE = 8192 LOG_LINES = 200 LIVE_FILE = "prefixes.json" LIVE_ROWS = 200 -LIVE_KEYS = ("WINESERVER", "BL_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "BL_SYNC", "BL_FSYNC", "WINEFSYNC") +LIVE_KEYS = ("WINESERVER", "DD_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "DD_SYNC", "DD_FSYNC", "WINEFSYNC") CACHE_ROWS = 512 TEMP_AGE = 3600 GC_GRACE = 600 @@ -637,7 +637,7 @@ def app_id(env): def minimum_nofile(env): try: - return int(env.get("BL_SYNC_MIN_NOFILE") or MIN_NOFILE) + return int(env.get("DD_SYNC_MIN_NOFILE") or MIN_NOFILE) except ValueError: return MIN_NOFILE @@ -650,8 +650,8 @@ def log_launch(root, command, env, tool, pack_id): try: soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE) line = tsv([[int(time.time()), app_id(env) or "-", command[1] if len(command) > 1 else "-", tool, pack_id or "-", - env.get("WINEESYNC") or "-", env.get("BL_SYNC") or "-", "%s/%s" % (limit(soft), limit(hard)), - env.get("BL_FSYNC") or "-"]]) + env.get("WINEESYNC") or "-", env.get("DD_SYNC") or "-", "%s/%s" % (limit(soft), limit(hard)), + env.get("DD_FSYNC") or "-"]]) def append(text): lines = [entry for entry in text.split("\n") if entry] @@ -704,7 +704,7 @@ def select(command, env): if not prefix or last == "0" or last.startswith("0-"): return result if truthy(env.get("PROTON_NO_NTSYNC")): - env["BL_SYNC"] = "0" + env["DD_SYNC"] = "0" result = (list(command), dict(env)) root = store_root(env) if root is None: @@ -796,7 +796,7 @@ def keep_live(root, command, env, tool): return None if not os.path.isfile(kept_command) or not server_running(prefix): return None - kept_pack = row["env"].get("BL_SYNC_PACK") + kept_pack = row["env"].get("DD_SYNC_PACK", row["env"].get("BL_SYNC_PACK")) if isinstance(kept_pack, str) and kept_pack and command[1:2] == ["waitforexitandrun"]: try: cache = HashCache(root) @@ -808,25 +808,28 @@ def keep_live(root, command, env, tool): pack = {"id": kept_pack} if pack is None or pack["id"] != kept_pack: return None + kept = {("DD_" + name[3:] if name.startswith("BL_") else name): value + for name, value in row["env"].items() if name.startswith("BL_")} + kept.update((name, value) for name, value in row["env"].items() if not name.startswith("BL_")) command, env = list(command), dict(env) command[0] = kept_command for name in LIVE_KEYS: - value = row["env"].get(name) + value = kept.get(name) if isinstance(value, str): env[name] = value else: env.pop(name, None) say("droiddeck-esync: Wine is still running in this prefix; keeping its sync choice (%s)" % describe(env)) - log_launch(root, command, env, tool, env.get("BL_SYNC_PACK")) + log_launch(root, command, env, tool, env.get("DD_SYNC_PACK")) return command, env def describe(env): - if env.get("BL_SYNC") == "1": + if env.get("DD_SYNC") == "1": return "droiddeck-ntsync" - if env.get("BL_FSYNC") == "1": + if env.get("DD_FSYNC") == "1": return "droiddeck-fsync" - if env.get("BL_SYNC_PACK") and truthy(env.get("WINEESYNC")): + if env.get("DD_SYNC_PACK") and truthy(env.get("WINEESYNC")): return "droiddeck-esync" if all(truthy(env.get(name)) for name in WINESERVER_ONLY): return "wineserver" @@ -835,13 +838,13 @@ def describe(env): def fsync_ready(env, measured): listed = "PROTON_NO_FSYNC" not in env and app_id(env) in NOSYNC_APPS - return measured["fsync"] and env.get("BL_SYNC") != "1" and not truthy(env.get("PROTON_NO_FSYNC")) and not listed + return measured["fsync"] and env.get("DD_SYNC") != "1" and not truthy(env.get("PROTON_NO_FSYNC")) and not listed def with_fsync(root, command, env, tool, reason): command, env = list(command), dict(env) - env["BL_FSYNC"] = "1" - env["BL_SYNC"] = "0" + env["DD_FSYNC"] = "1" + env["DD_SYNC"] = "0" env["WINEFSYNC"] = "1" say("droiddeck-fsync: %s; stock binaries with Proton's fsync" % reason) log_launch(root, command, env, tool, None) @@ -855,10 +858,10 @@ def stand_in(root, command, env, tool, reason, measured=None): if truthy(env.get("PROTON_NO_NTSYNC")): say("droiddeck-esync: %s; stock binaries" % reason) elif measured is not None and not measured["ntsync"]: - env["BL_SYNC"] = "0" + env["DD_SYNC"] = "0" say("droiddeck-esync: %s; stock binaries (this Wine has no ntsync)" % reason) else: - env["BL_SYNC"] = "1" + env["DD_SYNC"] = "1" say("droiddeck-esync: %s; stock binaries with droiddeck-ntsync" % reason) log_launch(root, command, env, tool, None) return command, env @@ -880,17 +883,17 @@ def wineserver_only(env): if truthy(env["PROTON_NO_FSYNC"]): env["WINEFSYNC"] = "0" if truthy(env["PROTON_NO_NTSYNC"]): - env["BL_SYNC"] = "0" + env["DD_SYNC"] = "0" return env def choose(root, command, env, tool, stock): name = os.path.basename(tool.rstrip("/")) or tool - wants_fsync = env.get("BL_FSYNC_FIRST") == "1" - if "BL_FSYNC" in env: - env["BL_FSYNC"] = "0" - stock = (stock[0], dict(stock[1], BL_FSYNC="0")) - if env.get("BL_SYNC_FALLBACK") != "1" and not wants_fsync and env.get("BL_SYNC") != "1": + wants_fsync = env.get("DD_FSYNC_FIRST") == "1" + if "DD_FSYNC" in env: + env["DD_FSYNC"] = "0" + stock = (stock[0], dict(stock[1], DD_FSYNC="0")) + if env.get("DD_SYNC_FALLBACK") != "1" and not wants_fsync and env.get("DD_SYNC") != "1": stock = (stock[0], wineserver_only(stock[1])) say("droiddeck-esync: off; wineserver sync only") log_launch(root, stock[0], stock[1], tool, None) @@ -898,14 +901,14 @@ def choose(root, command, env, tool, stock): cache = HashCache(root) try: measured = measure(tool, cache) - if env.get("BL_SYNC") == "1" and not measured["ntsync"]: - env["BL_SYNC"] = "0" - stock = (stock[0], dict(stock[1], BL_SYNC="0")) + if env.get("DD_SYNC") == "1" and not measured["ntsync"]: + env["DD_SYNC"] = "0" + stock = (stock[0], dict(stock[1], DD_SYNC="0")) wants_fsync = True say("droiddeck-ntsync: %s has no ntsync; trying droiddeck-fsync" % name) if wants_fsync and fsync_ready(env, measured): return with_fsync(root, command, env, tool, "chosen for %s" % name) - if env.get("BL_SYNC_FALLBACK") != "1": + if env.get("DD_SYNC_FALLBACK") != "1": say("droiddeck-esync: off") log_launch(root, command, env, tool, None) return stock @@ -936,16 +939,16 @@ def choose(root, command, env, tool, stock): env["WINEESYNC"] = "0" env["PROTON_NO_ESYNC"] = "1" if not truthy(env.get("PROTON_NO_NTSYNC")) and measured["ntsync"]: - env["BL_SYNC"] = "1" + env["DD_SYNC"] = "1" elif not env.get("WINEESYNC"): env["WINEESYNC"] = "1" if truthy(env["WINEESYNC"]) and "PROTON_NO_FSYNC" not in env: env["PROTON_NO_FSYNC"] = "1" env["WINESERVER"] = os.path.join(dist, WINESERVER) - env["BL_SYNC_PACK"] = pack["id"] + env["DD_SYNC_PACK"] = pack["id"] command[0] = os.path.join(dist, os.path.basename(command[0])) say("droiddeck-esync: pack %s for %s (%s, %s match); droiddeck-ntsync %s, droiddeck-esync %s, fds %s/%s" - % (pack["id"], name, measured["version_line"], match_kind(pack, measured), "on" if env.get("BL_SYNC") == "1" else "off", + % (pack["id"], name, measured["version_line"], match_kind(pack, measured), "on" if env.get("DD_SYNC") == "1" else "off", "on" if truthy(env["WINEESYNC"]) else "off", limit(soft), limit(hard))) log_launch(root, command, env, tool, pack["id"]) return command, env @@ -1005,7 +1008,7 @@ def update_wanted(root, fresh, scanned, packs, cache): def reconcile_store(root, steam_root, env): cache = HashCache(root) packs = load_packs(root) - enabled = env.get("BL_SYNC_FALLBACK") == "1" + enabled = env.get("DD_SYNC_FALLBACK") == "1" rows = [] fresh = {} scanned = set() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 742cabc91a..e8edb67d5e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -60,7 +60,7 @@ PROVIDED_NEEDS = { } GLIBC_BUILD = re.compile(r"^(?:ld|lib[A-Za-z_]+)-2\.[0-9]+\.so$|^libSegFault\.so$") GUEST_LIBDIRS = (("x86_64", "lib/x86_64-linux-gnu"), ("i386", "lib/i386-linux-gnu")) -PRELOAD_NAMES = ("libblsession.so", "libfakeinput.so") +PRELOAD_NAMES = ("libddsession.so", "libfakeinput.so") FAULT_REPORT = "libfaultreport.so" VULKAN_PIN = "libvulkan-thunk.so" VULKAN_PIN_DIR = "lib/x86_64-linux-gnu/droiddeck/vulkan" @@ -182,7 +182,7 @@ def own_fex_loads(): def update_own_fex(): - wanted = os.environ.get("BL_FEX_TAG") + wanted = os.environ.get("DD_FEX_TAG") if not wanted: return if (read_text(OWN_FEX_TAG) or "").strip() == wanted and own_fex_loads(): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update index d88a4a97e9..5e663308d1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -55,11 +55,11 @@ fex_ready() { local have ok= have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) [ -x /usr/local/bin/FEX ] && fex_loads / && ok=1 - if [ -n "${BL_FEX_TAG:-}" ]; then - if [ -n "$ok" ] && [ "$have" = "$BL_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi - step "downloading FEX ($BL_FEX_TAG)" - if fex_install "$BL_FEX_TAG" "${BL_FEX_SHA256:-}" "${BL_FEX_URLS:-}"; then FEX_NOW=$BL_FEX_TAG FEX_FROM=catalog; return 0; fi - if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $BL_FEX_TAG did not install"; return 0; fi + if [ -n "${DD_FEX_TAG:-}" ]; then + if [ -n "$ok" ] && [ "$have" = "$DD_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi + step "downloading FEX ($DD_FEX_TAG)" + if fex_install "$DD_FEX_TAG" "${DD_FEX_SHA256:-}" "${DD_FEX_URLS:-}"; then FEX_NOW=$DD_FEX_TAG FEX_FROM=catalog; return 0; fi + if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $DD_FEX_TAG did not install"; return 0; fi fi if [ -n "$ok" ] && [ "$have" = "$FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=built-in; return 0; fi step "downloading FEX ($FEX_TAG)" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-run index b8210c3550..38088653d9 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-run @@ -7,7 +7,7 @@ case ":${XDG_DATA_DIRS:-}:" in *) export XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} ;; esac socket=() -if [ -n "${BL_INSIDE:-}" ] || [ -n "${GAMESCOPE_WAYLAND_DISPLAY:-}" ]; then +if [ -n "${DD_INSIDE:-}" ] || [ -n "${GAMESCOPE_WAYLAND_DISPLAY:-}" ]; then unset WAYLAND_DISPLAY export XDG_SESSION_TYPE=x11 socket=(--nosocket=wayland --socket=x11) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug index 4c46cd07e3..9cf741bf87 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug @@ -47,7 +47,7 @@ def load_config(): def session_debug_dir(env): - return env.get("BL_DEBUG_DIR", "") + return env.get("DD_DEBUG_DIR", "") def apply_game_debug_logs(env, config=None, debug_dir=None): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 60edb67a1a..e58bf19790 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -15,9 +15,9 @@ 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 = ("BL_SYNC", "BL_SYNC_FALLBACK", "BL_FSYNC_FIRST", "BL_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") +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", "BL_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") +PACK_KEYS = ("WINESERVER", "DD_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") GAME_DEBUG = runpy.run_path(str(Path(__file__).with_name("droiddeck-game-debug"))) game_debug_channels = GAME_DEBUG["game_debug_channels"] apply_game_debug_logs = GAME_DEBUG["apply_game_debug_logs"] @@ -454,7 +454,7 @@ def game_gpu(env, keep=False): def vram_cap(env): - value = env.get("BL_VRAM_MB", "") + value = env.get("DD_VRAM_MB", "") if not re.fullmatch(r"[1-9][0-9]{0,6}", value): return env result = env.copy() @@ -552,7 +552,7 @@ def cpu_topology(env, command=()): if env["WINE_CPU_TOPOLOGY"]: env["PROTON_CPU_TOPOLOGY"] = env["WINE_CPU_TOPOLOGY"] return - picked = bool(env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()) + picked = bool(env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("DD_GAME_CPUS", "").strip()) fastest = env.get("DROIDDECK_FASTEST_CORES", "").strip() != "0" and game_id(env) is not None if not (picked or fastest): return @@ -633,7 +633,7 @@ def apply_config(env, config, app_id, fixes=None): # An open driver pair (PanVK, RADV) on a GPU that is not an Adreno: vkd3d-proton reports the # driver's own feature level and shader model. The app-wide 12_2 / 6_9 over-promised what PanVK # has, and an Unreal DX12 game took paths that crashed. A game's own setting still wins. - if env.get("BL_OPEN_DRIVER") == "1": + if env.get("DD_OPEN_DRIVER") == "1": game = config.get("games", {}).get(app_id, {}) or {} for name in ("VKD3D_FEATURE_LEVEL", "VKD3D_SHADER_MODEL"): if name not in game and name in result: @@ -668,7 +668,7 @@ def render_path_defaults(command, env): def bridge_feature_level(env): - if env.get("BL_VKBRIDGE") != "1" or env.get("VKD3D_FEATURE_LEVEL") not in ("12_1", "12_2"): + if env.get("DD_VKBRIDGE") != "1" or env.get("VKD3D_FEATURE_LEVEL") not in ("12_1", "12_2"): return None was = env["VKD3D_FEATURE_LEVEL"] env["VKD3D_FEATURE_LEVEL"] = "12_0" @@ -749,7 +749,7 @@ EVALUATOR_SCRIPT = re.compile(r"(?:^|[\\/])evaluatorscript_[0-9]+\.vdf$", re.IGN def mark_install_scripts(command, env): if not any(arg.lower().replace("\\", "/").endswith("iscriptevaluator.exe") for arg in command): return [] - root = env.get("BL_X64_STEAM_ROOT") or env.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or str(Path.home() / ".local/share/Steam") + root = env.get("DD_X64_STEAM_ROOT") or env.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or str(Path.home() / ".local/share/Steam") scripts = [str(Path(root) / arg.replace("\\", "/")) for arg in command if EVALUATOR_SCRIPT.search(arg)] scripts = [path for path in scripts if os.path.isfile(path)] if not scripts: @@ -1001,7 +1001,7 @@ def repair_foreign_system_dlls(prefix, proton, env=None): machine = pe_machine(path) if machine is None or PE["machine_compatible"](path, machines, machine, builtins): continue - link = path.parent / (name + ".bl-new") + link = path.parent / (name + ".dd-new") backup = path.parent / (name + FOREIGN_SUFFIX) if backups: backup = path.parent / (name + FOREIGN_SUFFIX + ".%d" % (backups[-1][0] + 1)) @@ -1270,14 +1270,14 @@ def system_graphics_launch(command, env): def game_logs(command, env, app_id, now=None): """Detailed graphics logs for one game launch, in the session's log folder: Proton's own log, DXVK's and vkd3d-proton's, and the Vulkan driver's startup messages. The app turns this on - (BL_GAME_LOGS=1) on a GPU that is not an Adreno, or with Setup's "Detailed graphics logs".""" - if env.get("BL_GAME_LOGS") != "1" or not env.get("BL_DEBUG_DIR") or len(command) < 3 \ + (DD_GAME_LOGS=1) on a GPU that is not an Adreno, or with Setup's "Detailed graphics logs".""" + if env.get("DD_GAME_LOGS") != "1" or not env.get("DD_DEBUG_DIR") or len(command) < 3 \ or command[1] != "waitforexitandrun": return env import time stamp = time.strftime("%Y%m%d-%H%M%S", time.localtime(now)) name = app_id or re.sub(r"[^A-Za-z0-9._-]+", "_", Path(command[2]).stem)[:40] or "game" - parent = Path(env["BL_DEBUG_DIR"]) / "games" + parent = Path(env["DD_DEBUG_DIR"]) / "games" try: parent.mkdir(parents=True, exist_ok=True) folder = Path(tempfile.mkdtemp(prefix=stamp + "-", suffix="-" + name, dir=parent)) @@ -1303,7 +1303,7 @@ def game_logs(command, env, app_id, now=None): "proton: %s" % command[0], "started: %s" % time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(now)), ] + ["%s=%s" % (key, env[key]) for key in sorted(env) - if key.startswith(("VK_", "BL_VK", "BL_DRM", "BL_OPEN", "MESA_", "PANVK", "DXVK_", "VKD3D", "ZINK", "TU_", "DROIDDECK_VKD3D"))]) + "\n") + if key.startswith(("VK_", "DD_VK", "DD_DRM", "DD_OPEN", "MESA_", "PANVK", "DXVK_", "VKD3D", "ZINK", "TU_", "DROIDDECK_VKD3D"))]) + "\n") except OSError: pass # Whether the game's sound reaches PulseAudio: the streams 20 s and 60 s in, without waiting. @@ -1328,7 +1328,7 @@ def main(): if not command: return 2 env = game_gpu(os.environ.copy()) - mic_enabled = env.get("BL_MIC_ENABLED") + mic_enabled = env.get("DD_MIC_ENABLED") debug_dir = session_debug_dir(env) prefix_path = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") app_id = game_id(env) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance index 1fc6e0f37e..ec2aa51854 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance @@ -99,11 +99,11 @@ def desktop_environment(base, proc=Path("/proc")): if command != b"/usr/bin/plasmashell": continue values = dict(os.fsdecode(item).split("=", 1) for item in (entry / "environ").read_bytes().split(b"\0") if b"=" in item) - if values.get("BL_DESKTOP") != "1" or values.get("XDG_RUNTIME_DIR") != env.get("XDG_RUNTIME_DIR"): + if values.get("DD_DESKTOP") != "1" or values.get("XDG_RUNTIME_DIR") != env.get("XDG_RUNTIME_DIR"): continue if not values.get("DISPLAY") or values.get("WAYLAND_DISPLAY") == env.get("WAYLAND_DISPLAY"): continue - for key in ("DISPLAY", "WAYLAND_DISPLAY", "XAUTHORITY", "DBUS_SESSION_BUS_ADDRESS", "BL_DESKTOP"): + for key in ("DISPLAY", "WAYLAND_DISPLAY", "XAUTHORITY", "DBUS_SESSION_BUS_ADDRESS", "DD_DESKTOP"): if key in values: env[key] = values[key] return env @@ -130,10 +130,10 @@ def runner(folder, appid, game, graphical=False): raise ValueError("No Proton tool is installed for this game") tool, command = available[name] base = desktop_environment(os.environ) if graphical else dict(os.environ) - env = run["environment"](base, target, tool, root, window=base.get("BL_DESKTOP") == "1") + env = run["environment"](base, target, tool, root, window=base.get("DD_DESKTOP") == "1") env["DROIDDECK_GOG_MAINTENANCE"] = "1" env["FEX_X87REDUCEDPRECISION"] = "0" - env.pop("BL_STORE_EXIT", None) + env.pop("DD_STORE_EXIT", None) return str(Path(tool) / command), env, target.compatdata diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window index 5fc4e20a02..9616ea3248 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window @@ -44,8 +44,8 @@ def advertise_compositing(): if __name__ == '__main__': if len(sys.argv) < 2: raise SystemExit('usage: droiddeck-gpu-window [args...]') - if 'BL_GPU_CHILD_WSI' in os.environ: - wsi = os.environ.pop('BL_GPU_CHILD_WSI') + if 'DD_GPU_CHILD_WSI' in os.environ: + wsi = os.environ.pop('DD_GPU_CHILD_WSI') if wsi: os.environ['MESA_VK_WSI_DEBUG'] = wsi else: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime index 4f110cfbc6..d6fd4cd3bc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime @@ -84,8 +84,8 @@ def connect(): def main(): - launch = os.environ.get("BL_LAUNCH_DIR", "") - report = Report(os.environ.get("BL_IME_DIR") or (os.path.join(launch, "agent") if launch else "")) + launch = os.environ.get("DD_LAUNCH_DIR", "") + report = Report(os.environ.get("DD_IME_DIR") or (os.path.join(launch, "agent") if launch else "")) conn = Connection(connect()) conn.send(DISPLAY_ID, 1, struct.pack("/dev/null || true - echo "== open files: soft/hard $bl_nofile_was -> soft $(ulimit -Sn)" - [ -n "${BL_DEBUG_DIR:-}" ] && echo "soft/hard $bl_nofile_was -> soft $(ulimit -Sn) (session tree)" > "$BL_DEBUG_DIR/limits.txt" 2>/dev/null - unset bl_nofile_was + echo "== open files: soft/hard $dd_nofile_was -> soft $(ulimit -Sn)" + [ -n "${DD_DEBUG_DIR:-}" ] && echo "soft/hard $dd_nofile_was -> soft $(ulimit -Sn) (session tree)" > "$DD_DEBUG_DIR/limits.txt" 2>/dev/null + unset dd_nofile_was fi export HOME=${HOME:-/root} mode=${1:-desktop} @@ -16,32 +16,32 @@ shift || true step() { echo "== STEP $(date -u +%H:%M:%S.%3N) $*"; } steam_setup_failed() { echo "== steam: the Steam client could not be set up (status $1)" - [ -z "${BL_STEAM_EXIT_FILE:-}" ] || printf '%s\n' "$1" > "$BL_STEAM_EXIT_FILE" + [ -z "${DD_STEAM_EXIT_FILE:-}" ] || printf '%s\n' "$1" > "$DD_STEAM_EXIT_FILE" exit "$1" } -if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then - mkdir -p "$(dirname "$BL_LOG")" 2>/dev/null - if [ "$(stat -c %s "$BL_LOG" 2>/dev/null || echo 0)" -gt 8388608 ]; then - mv -f "$BL_LOG" "$BL_LOG.1" +if [ -n "${DD_LOG:-}" ] && [ -z "${DD_INSIDE:-}" ]; then + mkdir -p "$(dirname "$DD_LOG")" 2>/dev/null + if [ "$(stat -c %s "$DD_LOG" 2>/dev/null || echo 0)" -gt 8388608 ]; then + mv -f "$DD_LOG" "$DD_LOG.1" fi dd=$(command -v gnudd || echo dd) - exec > >({ "$dd" of="$BL_LOG" oflag=append conv=notrunc iflag=count_bytes count="${BL_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 + exec > >({ "$dd" of="$DD_LOG" oflag=append conv=notrunc iflag=count_bytes count="${DD_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 echo "== droiddeck-session $(date) mode=$mode $*" - echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} icd=${VK_ICD_FILENAMES:-none}" + echo "== uid=$(id -u) size=${DD_WIDTH:-?}x${DD_HEIGHT:-?} icd=${VK_ICD_FILENAMES:-none}" echo "== gamescope: $(gamescope --version 2>&1 | head -1) at $(command -v gamescope)" echo "== rootfs: $(cat /.version 2>/dev/null || echo unversioned)" fi start_diagnostic_inventory() { [ "${DROIDDECK_ENHANCED_DIAGNOSTICS:-0}" = 1 ] || return 0 - [ -z "${BL_INSIDE:-}" ] || return 0 + [ -z "${DD_INSIDE:-}" ] || return 0 if ! command -v droiddeck-diagnostic-inventory >/dev/null 2>&1; then printf '%s\n' 'DROIDDECK_PROCESS_TRACE {"schema":1,"event":"provider","status":"unavailable"}' return 0 fi droiddeck-diagnostic-inventory --watch --root-pid "$$" & - _bl_diagnostic_inventory=$! - trap 'kill "$_bl_diagnostic_inventory" 2>/dev/null || true; wait "$_bl_diagnostic_inventory" 2>/dev/null || true' EXIT + _dd_diagnostic_inventory=$! + trap 'kill "$_dd_diagnostic_inventory" 2>/dev/null || true; wait "$_dd_diagnostic_inventory" 2>/dev/null || true' EXIT } start_diagnostic_inventory @@ -104,7 +104,7 @@ prepare_locale() { printf '%s\n' "$want" > "$stamp" echo "== locale archive built for $want" } -[ -z "${BL_INSIDE:-}" ] && prepare_locale +[ -z "${DD_INSIDE:-}" ] && prepare_locale clear_stale_tmp() { local running names=() n @@ -129,26 +129,26 @@ clear_stale_tmp() { [ "$n" -gt 0 ] && echo "== /tmp: cleared $n entries earlier sessions left" return 0 } -[ -z "${BL_INSIDE:-}" ] && clear_stale_tmp -if [ -z "${BL_INSIDE:-}" ]; then - if [ "${BL_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.bl-zram; else rm -f /tmp/.bl-zram; fi - dd if=/dev/zero of=/tmp/.bl-clock bs=8 count=1 conv=notrunc status=none +[ -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 + dd if=/dev/zero of=/tmp/.dd-clock bs=8 count=1 conv=notrunc status=none fi steam_devtools() { - _bl_cdp=() + _dd_cdp=() if [ -f "$steam_root/.cef-enable-remote-debugging" ]; then if timeout 5 python3 -c 'import socket, sys s = socket.socket() s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) s.bind(("127.0.0.1", int(sys.argv[1])))' "$1" 2>/dev/null; then - BL_CDP_PORT=$1 + DD_CDP_PORT=$1 return 0 fi echo "== steam: port $1 is held by another app; Decky cannot load this session and Steam's devtools use another port" fi - BL_CDP_PORT=$((20000 + RANDOM % 30000)) - _bl_cdp=(-cef-enable-debugging -devtools-port "$BL_CDP_PORT") + DD_CDP_PORT=$((20000 + RANDOM % 30000)) + _dd_cdp=(-cef-enable-debugging -devtools-port "$DD_CDP_PORT") } steam_update_stuck() { @@ -170,7 +170,7 @@ run_gamescope() ( local status_file child_status compositor_status status_file=$(mktemp "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-steam-exit.XXXXXX") || exit 73 trap 'rm -f "$status_file"' EXIT - BL_STEAM_EXIT_FILE="$status_file" gamescope "$@" + DD_STEAM_EXIT_FILE="$status_file" gamescope "$@" compositor_status=$? if read -r child_status < "$status_file" && [[ $child_status =~ ^[0-9]{1,3}$ ]] \ && [ "$child_status" -le 255 ]; then @@ -185,47 +185,47 @@ run_gamescope() ( ) collect_steam_logs() { - [ -n "${BL_DEBUG_DIR:-}" ] || return 0 + [ -n "${DD_DEBUG_DIR:-}" ] || return 0 local sync_store=$HOME/.local/share/droiddeck-esync sync_file - if [ -d "$sync_store" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-esync" 2>/dev/null; then + if [ -d "$sync_store" ] && mkdir -p "$DD_DEBUG_DIR/droiddeck-esync" 2>/dev/null; then for sync_file in launches.log tools.tsv wanted.tsv prefixes.json; do - [ -f "$sync_store/$sync_file" ] && cp "$sync_store/$sync_file" "$BL_DEBUG_DIR/droiddeck-esync/" 2>/dev/null + [ -f "$sync_store/$sync_file" ] && cp "$sync_store/$sync_file" "$DD_DEBUG_DIR/droiddeck-esync/" 2>/dev/null done fi local fex_state=$HOME/.local/share/droiddeck-fex - if [ -d "$fex_state" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-fex" 2>/dev/null; then - cp "$fex_state/status.json" "$fex_state/config/Config.json" "$BL_DEBUG_DIR/droiddeck-fex/" 2>/dev/null + if [ -d "$fex_state" ] && mkdir -p "$DD_DEBUG_DIR/droiddeck-fex" 2>/dev/null; then + cp "$fex_state/status.json" "$fex_state/config/Config.json" "$DD_DEBUG_DIR/droiddeck-fex/" 2>/dev/null fi } -trap 'bl_stopping=1; collect_steam_logs 2>/dev/null || true' TERM INT HUP -if [ -n "${BL_VK_DRIVER:-}" ]; then - bl_icd_lib=$(sed -n 's/.*"library_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$BL_VK_DRIVER" 2>/dev/null | head -1) - bl_icd_lib=$(printf '%s' "$bl_icd_lib" | sed 's|\\/|/|g') - case $bl_icd_lib in +trap 'dd_stopping=1; collect_steam_logs 2>/dev/null || true' TERM INT HUP +if [ -n "${DD_VK_DRIVER:-}" ]; then + dd_icd_lib=$(sed -n 's/.*"library_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$DD_VK_DRIVER" 2>/dev/null | head -1) + dd_icd_lib=$(printf '%s' "$dd_icd_lib" | sed 's|\\/|/|g') + case $dd_icd_lib in /*) ;; - ?*) bl_icd_lib="$(dirname "$BL_VK_DRIVER")/$bl_icd_lib" ;; + ?*) dd_icd_lib="$(dirname "$DD_VK_DRIVER")/$dd_icd_lib" ;; esac - if [ -r "$BL_VK_DRIVER" ] && [ -n "$bl_icd_lib" ] && [ -r "$bl_icd_lib" ]; then - export VK_DRIVER_FILES="$BL_VK_DRIVER" - export VK_ICD_FILENAMES="$BL_VK_DRIVER" - echo "== vulkan driver: imported $bl_icd_lib (via $BL_VK_DRIVER)" + if [ -r "$DD_VK_DRIVER" ] && [ -n "$dd_icd_lib" ] && [ -r "$dd_icd_lib" ]; then + export VK_DRIVER_FILES="$DD_VK_DRIVER" + export VK_ICD_FILENAMES="$DD_VK_DRIVER" + echo "== vulkan driver: imported $dd_icd_lib (via $DD_VK_DRIVER)" else - echo "== vulkan driver: IGNORING $BL_VK_DRIVER (manifest or ${bl_icd_lib:-library} unreadable); using the runtime's own" + echo "== vulkan driver: IGNORING $DD_VK_DRIVER (manifest or ${dd_icd_lib:-library} unreadable); using the runtime's own" fi - unset bl_icd_lib + unset dd_icd_lib fi -bl_webhelper_layout() { - if [ -n "${BL_VKBRIDGE_WEBHELPER_ARGS:-}" ]; then - printf '%s\n' "$BL_VKBRIDGE_WEBHELPER_ARGS" - elif [ -z "${BL_VKBRIDGE_CEF_ANGLE:-}" ]; then +dd_webhelper_layout() { + if [ -n "${DD_VKBRIDGE_WEBHELPER_ARGS:-}" ]; then + printf '%s\n' "$DD_VKBRIDGE_WEBHELPER_ARGS" + elif [ -z "${DD_VKBRIDGE_CEF_ANGLE:-}" ]; then echo stock - elif [ "$BL_VKBRIDGE_CEF_ANGLE" = vulkan ] && [ "${BL_VKBRIDGE_CEF_VULKAN:-1}" != 0 ]; then + elif [ "$DD_VKBRIDGE_CEF_ANGLE" = vulkan ] && [ "${DD_VKBRIDGE_CEF_VULKAN:-1}" != 0 ]; then echo "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan" else - echo "--use-gl=angle --use-angle=$BL_VKBRIDGE_CEF_ANGLE" + echo "--use-gl=angle --use-angle=$DD_VKBRIDGE_CEF_ANGLE" fi } -bl_now_ms() { +dd_now_ms() { if [ -n "${EPOCHREALTIME:-}" ]; then local t=${EPOCHREALTIME/[.,]/} echo $((10#$t / 1000)) @@ -240,15 +240,15 @@ vkbridge_wait_socket() { echo "== vkbridge: server socket ready (waited 0 ms)" return 0 fi - start=$(bl_now_ms) + start=$(dd_now_ms) while :; do - now=$(bl_now_ms) + now=$(dd_now_ms) waited=$((now - start)) if [ -S "$sock" ]; then echo "== vkbridge: server socket ready (waited $waited ms; the server listens after its startup probe)" return 0 fi - if [ -n "${bl_stopping:-}" ]; then + if [ -n "${dd_stopping:-}" ]; then echo "== vkbridge: no server socket after $waited ms; the session is stopping" return 1 fi @@ -259,63 +259,66 @@ vkbridge_wait_socket() { sleep 0.05 done } -if [ "${BL_VKBRIDGE:-0}" = 1 ]; then - bl_vkb_icd=/usr/local/share/vkbridge/droidbridge_icd.json - [ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket "${VKBRIDGE_SOCKET:-}" "${BL_VKBRIDGE_WAIT_MS:-10000}" - bl_vkb_missing= - [ -r "$bl_vkb_icd" ] || bl_vkb_missing="$bl_vkb_missing icd" - [ -r /usr/local/lib/vkbridge/libvulkan_droidbridge.so ] || bl_vkb_missing="$bl_vkb_missing library" - [ -S "${VKBRIDGE_SOCKET:-}" ] || bl_vkb_missing="$bl_vkb_missing socket" - if [ -z "$bl_vkb_missing" ]; then - export VK_DRIVER_FILES=$bl_vkb_icd VK_ICD_FILENAMES=$bl_vkb_icd +if [ "${DD_VKBRIDGE:-0}" = 1 ]; then + dd_vkb_icd=/usr/local/share/vkbridge/droidbridge_icd.json + [ -z "${DD_INSIDE:-}" ] && vkbridge_wait_socket "${VKBRIDGE_SOCKET:-}" "${DD_VKBRIDGE_WAIT_MS:-10000}" + dd_vkb_missing= + [ -r "$dd_vkb_icd" ] || dd_vkb_missing="$dd_vkb_missing icd" + [ -r /usr/local/lib/vkbridge/libvulkan_droidbridge.so ] || dd_vkb_missing="$dd_vkb_missing library" + [ -S "${VKBRIDGE_SOCKET:-}" ] || dd_vkb_missing="$dd_vkb_missing socket" + if [ -z "$dd_vkb_missing" ]; then + export VK_DRIVER_FILES=$dd_vkb_icd VK_ICD_FILENAMES=$dd_vkb_icd export VKBRIDGE_SOCKET VKBRIDGE_CLIENT_LOG if [ -r /root/.vkbridge-env ]; then while IFS='=' read -r _k _v; do - case "$_k" in VKBRIDGE_*|BL_VKBRIDGE_*) export "$_k=$_v" ;; esac + case "$_k" in VKBRIDGE_*|DD_VKBRIDGE_*) export "$_k=$_v" ;; esac done < /root/.vkbridge-env - [ -z "${BL_INSIDE:-}" ] && echo "== vkbridge: development settings from /root/.vkbridge-env: $(cut -d= -f1 /root/.vkbridge-env | tr '\n' ' ')" + while IFS='=' read -r _k _v; do + case "$_k" in BL_VKBRIDGE_*) grep -q "^DD_${_k#BL_}=" /root/.vkbridge-env || export "DD_${_k#BL_}=$_v" ;; esac + done < /root/.vkbridge-env + [ -z "${DD_INSIDE:-}" ] && echo "== vkbridge: development settings from /root/.vkbridge-env: $(cut -d= -f1 /root/.vkbridge-env | tr '\n' ' ')" fi export VKD3D_FEATURE_LEVEL=${VKD3D_FEATURE_LEVEL:-12_0} unset TU_DEBUG - if [ -z "${BL_INSIDE:-}" ]; then + if [ -z "${DD_INSIDE:-}" ]; then step "vkbridge self-test" - bl_vkb_smoke=$(timeout 60 /usr/local/bin/droiddeck-vkbridge-smoke 2>&1) - printf '%s\n' "$bl_vkb_smoke" | sed 's/^/== vkbridge: /' - bl_vkb_why= - if printf '%s\n' "$bl_vkb_smoke" | grep -qE '^FAIL memory sharing'; then - bl_vkb_why=memory - elif printf '%s\n' "$bl_vkb_smoke" | grep -qE '^FAIL (image clear|draw)'; then - bl_vkb_why=draw + dd_vkb_smoke=$(timeout 60 /usr/local/bin/droiddeck-vkbridge-smoke 2>&1) + printf '%s\n' "$dd_vkb_smoke" | sed 's/^/== vkbridge: /' + dd_vkb_why= + if printf '%s\n' "$dd_vkb_smoke" | grep -qE '^FAIL memory sharing'; then + dd_vkb_why=memory + elif printf '%s\n' "$dd_vkb_smoke" | grep -qE '^FAIL (image clear|draw)'; then + dd_vkb_why=draw fi - if [ -n "$bl_vkb_why" ] && [ -r "${BL_VKBRIDGE_FALLBACK_ICD:-}" ]; then - export VK_DRIVER_FILES=$BL_VKBRIDGE_FALLBACK_ICD VK_ICD_FILENAMES=$BL_VKBRIDGE_FALLBACK_ICD BL_VKBRIDGE=0 - export BL_OPEN_DRIVER=1 BL_DRM_STANDIN=/dev/mali0 - [ "${BL_STEAM_GPU_COMPOSITING:-0}" = 1 ] || export BL_STEAM_SOFT_COMPOSITING=1 - if [ "$bl_vkb_why" = memory ]; then - echo "== vkbridge: memory sharing = none (no method passed the server's self-test); this session uses the PanVK pair instead ($BL_VKBRIDGE_FALLBACK_ICD)" + if [ -n "$dd_vkb_why" ] && [ -r "${DD_VKBRIDGE_FALLBACK_ICD:-}" ]; then + export VK_DRIVER_FILES=$DD_VKBRIDGE_FALLBACK_ICD VK_ICD_FILENAMES=$DD_VKBRIDGE_FALLBACK_ICD DD_VKBRIDGE=0 + export DD_OPEN_DRIVER=1 DD_DRM_STANDIN=/dev/mali0 + [ "${DD_STEAM_GPU_COMPOSITING:-0}" = 1 ] || export DD_STEAM_SOFT_COMPOSITING=1 + if [ "$dd_vkb_why" = memory ]; then + echo "== vkbridge: memory sharing = none (no method passed the server's self-test); this session uses the PanVK pair instead ($DD_VKBRIDGE_FALLBACK_ICD)" else - echo "== vkbridge: self-test failed images or draws; this session uses the PanVK pair instead ($BL_VKBRIDGE_FALLBACK_ICD)" + echo "== vkbridge: self-test failed images or draws; this session uses the PanVK pair instead ($DD_VKBRIDGE_FALLBACK_ICD)" fi - [ -n "${BL_DEBUG_DIR:-}" ] && printf '%s\n%s\n' "$BL_VKBRIDGE_FALLBACK_ICD" "$bl_vkb_why" > "$BL_DEBUG_DIR/vkbridge-fallback" 2>/dev/null - elif [ -n "$bl_vkb_why" ]; then - echo "== vkbridge: self-test failed ($bl_vkb_why) and no PanVK pair is installed to fall back on; expect a black screen or a lost device - set a Mali driver pair in Setup" + [ -n "${DD_DEBUG_DIR:-}" ] && printf '%s\n%s\n' "$DD_VKBRIDGE_FALLBACK_ICD" "$dd_vkb_why" > "$DD_DEBUG_DIR/vkbridge-fallback" 2>/dev/null + elif [ -n "$dd_vkb_why" ]; then + echo "== vkbridge: self-test failed ($dd_vkb_why) and no PanVK pair is installed to fall back on; expect a black screen or a lost device - set a Mali driver pair in Setup" fi - unset bl_vkb_why - unset bl_vkb_smoke + unset dd_vkb_why + unset dd_vkb_smoke if command -v vulkaninfo >/dev/null 2>&1; then timeout 30 vulkaninfo --summary 2>&1 | sed -n '/^Devices:/,$p' | head -40 | sed 's/^/== vulkaninfo: /' fi fi - [ "${BL_VKBRIDGE:-0}" = 1 ] && echo "== vulkan driver: Mali bridge ($bl_vkb_icd, server at $VKBRIDGE_SOCKET)" + [ "${DD_VKBRIDGE:-0}" = 1 ] && echo "== vulkan driver: Mali bridge ($dd_vkb_icd, server at $VKBRIDGE_SOCKET)" else - echo "== vulkan driver: Mali bridge requested but NOT usable (icd $bl_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$bl_vkb_missing)" - [ -n "${BL_INSIDE:-}" ] || exit 69 + echo "== vulkan driver: Mali bridge requested but NOT usable (icd $dd_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$dd_vkb_missing)" + [ -n "${DD_INSIDE:-}" ] || exit 69 fi - unset bl_vkb_icd bl_vkb_missing + unset dd_vkb_icd dd_vkb_missing fi -if [ "${BL_VENUS:-0}" = 1 ] && [ -z "${BL_INSIDE:-}" ] && command -v vulkaninfo >/dev/null 2>&1; then - if bl_vn_info=$(timeout 30 vulkaninfo 2>/dev/null); then - case $(printf '%s\n' "$bl_vn_info" | grep -m1 'nullDescriptor') in +if [ "${DD_VENUS:-0}" = 1 ] && [ -z "${DD_INSIDE:-}" ] && command -v vulkaninfo >/dev/null 2>&1; then + if dd_vn_info=$(timeout 30 vulkaninfo 2>/dev/null); then + case $(printf '%s\n' "$dd_vn_info" | grep -m1 'nullDescriptor') in *true*) echo "== venus: nullDescriptor present (Zink keeps the GPU)" ;; *) export GALLIUM_DRIVER=llvmpipe LIBGL_ALWAYS_SOFTWARE=1 @@ -326,21 +329,21 @@ if [ "${BL_VENUS:-0}" = 1 ] && [ -z "${BL_INSIDE:-}" ] && command -v vulkaninfo else echo "== venus: vulkaninfo failed or timed out; GL left on Zink" fi - unset bl_vn_info + unset dd_vn_info fi -if [ "${BL_GAME_LOGS:-0}" = 1 ] && [ -z "${BL_INSIDE:-}" ] && [ -n "${BL_DEBUG_DIR:-}" ]; then +if [ "${DD_GAME_LOGS:-0}" = 1 ] && [ -z "${DD_INSIDE:-}" ] && [ -n "${DD_DEBUG_DIR:-}" ]; then ( { - echo "== VK_DRIVER_FILES=${VK_DRIVER_FILES:-} VK_ICD_FILENAMES=${VK_ICD_FILENAMES:-} BL_DRM_STANDIN=${BL_DRM_STANDIN:-}" + echo "== VK_DRIVER_FILES=${VK_DRIVER_FILES:-} VK_ICD_FILENAMES=${VK_ICD_FILENAMES:-} DD_DRM_STANDIN=${DD_DRM_STANDIN:-}" if command -v vulkaninfo >/dev/null 2>&1; then timeout 10 vulkaninfo --summary echo "== vulkaninfo exit: $?" - if timeout 20 vulkaninfo > "$BL_DEBUG_DIR/vulkan-full.txt" 2>&1; then + if timeout 20 vulkaninfo > "$DD_DEBUG_DIR/vulkan-full.txt" 2>&1; then echo "== device extensions (full list in vulkan-full.txt):" - sed -n '/^Device Extensions:/,/^$/p' "$BL_DEBUG_DIR/vulkan-full.txt" | grep -o 'VK_[A-Za-z0-9_]*' | sort -u | tr '\n' ' ' | fold -s -w 200 + sed -n '/^Device Extensions:/,/^$/p' "$DD_DEBUG_DIR/vulkan-full.txt" | grep -o 'VK_[A-Za-z0-9_]*' | sort -u | tr '\n' ' ' | fold -s -w 200 echo echo "== key features:" - grep -E '^[[:space:]]+(robustBufferAccess2?|robustImageAccess2?|nullDescriptor|logicOp|fillModeNonSolid|shaderClipDistance|shaderCullDistance|dualSrcBlend|geometryShader|scalarBlockLayout|timelineSemaphore|dynamicRendering|synchronization2|maintenance4|maintenance5|maintenance6|shaderDrawParameters|descriptorIndexing|bufferDeviceAddress|vulkanMemoryModel|hostQueryReset|imagelessFramebuffer|samplerYcbcrConversion|shaderInt64|shaderFloat64|shaderInt16|shaderFloat16|storageBuffer16BitAccess|extendedDynamicState[23]?|vertexInputDynamicState|customBorderColors|customBorderColorWithoutFormat|depthClipEnable|multiViewport|textureCompressionBC|indexTypeUint8|rectangularLines|bresenhamLines|transformFeedback|geometryStreams|graphicsPipelineLibrary|pushDescriptor|primitiveTopologyListRestart|dynamicRenderingLocalRead|shaderDemoteToHelperInvocation|subgroupSizeControl|computeFullSubgroups|inlineUniformBlock|pipelineCreationCacheControl) = ' "$BL_DEBUG_DIR/vulkan-full.txt" | sed 's/^[[:space:]]*/ /' | sort -u + grep -E '^[[:space:]]+(robustBufferAccess2?|robustImageAccess2?|nullDescriptor|logicOp|fillModeNonSolid|shaderClipDistance|shaderCullDistance|dualSrcBlend|geometryShader|scalarBlockLayout|timelineSemaphore|dynamicRendering|synchronization2|maintenance4|maintenance5|maintenance6|shaderDrawParameters|descriptorIndexing|bufferDeviceAddress|vulkanMemoryModel|hostQueryReset|imagelessFramebuffer|samplerYcbcrConversion|shaderInt64|shaderFloat64|shaderInt16|shaderFloat16|storageBuffer16BitAccess|extendedDynamicState[23]?|vertexInputDynamicState|customBorderColors|customBorderColorWithoutFormat|depthClipEnable|multiViewport|textureCompressionBC|indexTypeUint8|rectangularLines|bresenhamLines|transformFeedback|geometryStreams|graphicsPipelineLibrary|pushDescriptor|primitiveTopologyListRestart|dynamicRenderingLocalRead|shaderDemoteToHelperInvocation|subgroupSizeControl|computeFullSubgroups|inlineUniformBlock|pipelineCreationCacheControl) = ' "$DD_DEBUG_DIR/vulkan-full.txt" | sed 's/^[[:space:]]*/ /' | sort -u else echo "== full vulkaninfo failed or timed out (exit $?)" fi @@ -348,19 +351,19 @@ if [ "${BL_GAME_LOGS:-0}" = 1 ] && [ -z "${BL_INSIDE:-}" ] && [ -n "${BL_DEBUG_D echo "== vulkaninfo is not in this runtime; GPU nodes:" ls -l /dev/kgsl-3d0 /dev/mali0 /dev/dri 2>&1 fi - } > "$BL_DEBUG_DIR/vulkan-summary.txt" 2>&1 + } > "$DD_DEBUG_DIR/vulkan-summary.txt" 2>&1 ) & fi -export GAMESCOPE_FORCE_VULKAN_REALTIME=${BL_GAMESCOPE_REALTIME:-0} +export GAMESCOPE_FORCE_VULKAN_REALTIME=${DD_GAMESCOPE_REALTIME:-0} start_agent() { - [ -n "${BL_LAUNCH_DIR:-}" ] && [ -x /usr/local/bin/droiddeck-agent ] || return 0 - mkdir -p "$BL_LAUNCH_DIR/agent" + [ -n "${DD_LAUNCH_DIR:-}" ] && [ -x /usr/local/bin/droiddeck-agent ] || return 0 + mkdir -p "$DD_LAUNCH_DIR/agent" /usr/local/bin/droiddeck-agent "$@" 2>&1 & } nap() { - [ -n "${bl_nap_fd:-}" ] || exec {bl_nap_fd}<> <(:) - read -r -t "$1" -u "$bl_nap_fd" _ 2>/dev/null || : + [ -n "${dd_nap_fd:-}" ] || exec {dd_nap_fd}<> <(:) + read -r -t "$1" -u "$dd_nap_fd" _ 2>/dev/null || : } # Which program a driver error came from: Mesa's lines ("radv/amdgpu: The CS has been rejected", # "ZINK: vkQueueWaitIdle failed") carry no process name. For the first three minutes of an open @@ -368,7 +371,7 @@ nap() { # line count at that moment, so an error's line number in session.log points at what had just # started. Pure bash over /proc (no execs: see nap). watch_processes() { - local out=$BL_DEBUG_DIR/processes.txt log=$BL_DEBUG_DIR/session.log i p pid comm lines + local out=$DD_DEBUG_DIR/processes.txt log=$DD_DEBUG_DIR/session.log i p pid comm lines local -a argv new local -A seen=() echo "# seconds session.log-lines pid name command line" > "$out" 2>/dev/null || return 0 @@ -391,7 +394,7 @@ watch_processes() { nap 0.5 done } -if [ "${BL_OPEN_DRIVER:-0}" = 1 ] && [ -z "${BL_INSIDE:-}" ] && [ -n "${BL_DEBUG_DIR:-}" ]; then +if [ "${DD_OPEN_DRIVER:-0}" = 1 ] && [ -z "${DD_INSIDE:-}" ] && [ -n "${DD_DEBUG_DIR:-}" ]; then watch_processes & fi export XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} @@ -424,9 +427,9 @@ client_single_core_matches() { } program_cores() { - [ "${BL_PIN_CORES:-1}" = 0 ] && return 0 + [ "${DD_PIN_CORES:-1}" = 0 ] && return 0 command -v taskset >/dev/null 2>&1 || return 0 - if [ -n "${BL_GAME_CPUS:-}" ]; then echo "$BL_GAME_CPUS"; return 0; fi + if [ -n "${DD_GAME_CPUS:-}" ]; then echo "$DD_GAME_CPUS"; return 0; fi [ "$mode" = run ] && return 0 local f n max min= list= for f in /sys/devices/system/cpu/cpu[0-9]*/cpufreq/cpuinfo_max_freq; do @@ -442,7 +445,7 @@ program_cores() { echo "$list" } -if [ -z "${BL_INSIDE:-}" ]; then +if [ -z "${DD_INSIDE:-}" ]; then /usr/local/bin/droiddeck-fonts 2>&1 | sed 's/^/[fonts] /' device_fonts=/usr/local/share/fonts/android if [ -d "$device_fonts" ] && [ -d /etc/fonts/conf.d ] && command -v fc-cache >/dev/null 2>&1; then @@ -493,13 +496,13 @@ if [ -z "${BL_INSIDE:-}" ]; then fi exec /usr/local/bin/droiddeck-desktop fi - width=${BL_WIDTH:-1280} - height=${BL_HEIGHT:-720} + width=${DD_WIDTH:-1280} + height=${DD_HEIGHT:-720} nested=$width nested_h=$height - if [ "${BL_FOLLOW_OUTPUT:-0}" = 1 ]; then + if [ "${DD_FOLLOW_OUTPUT:-0}" = 1 ]; then echo "== gamescope: the output follows the screen (${width}x${height} to start)" - elif [ "$mode" = steam ] && [ "${BL_GAMESCOPE_STRETCH_16X9:-0}" = 1 ]; then + elif [ "$mode" = steam ] && [ "${DD_GAMESCOPE_STRETCH_16X9:-0}" = 1 ]; then wide=$(( (height * 16 + 4) / 9 / 2 * 2 )) tall=$(( (width * 9 + 8) / 16 / 2 * 2 )) if [ "$wide" -gt "$width" ]; then @@ -511,47 +514,47 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi - if [ "$mode" = run ] && [ "${BL_GAME_WIDTH:-0}" -gt 0 ] && [ "${BL_GAME_HEIGHT:-0}" -gt 0 ]; then - nested=$BL_GAME_WIDTH - nested_h=$BL_GAME_HEIGHT + if [ "$mode" = run ] && [ "${DD_GAME_WIDTH:-0}" -gt 0 ] && [ "${DD_GAME_HEIGHT:-0}" -gt 0 ]; then + nested=$DD_GAME_WIDTH + nested_h=$DD_GAME_HEIGHT game_size=1 echo "== gamescope: the game runs at ${nested}x${nested_h}, scaled to the ${width}x${height} output with its proportions kept" fi - backend=${BL_GAMESCOPE_BACKEND:-wayland} + backend=${DD_GAMESCOPE_BACKEND:-wayland} case "$backend" in wayland) ;; sdl) export SDL_VIDEODRIVER=wayland ;; *) echo "== unsupported gamescope backend: $backend"; exit 64 ;; esac - if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then + if [ "$mode" = steam ] && [ "${DD_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi # Through the Mali bridge, Steam's UI flickered while gamescope handed its layers to the phone's # compositor as separate planes, for a reason not yet found; one composited image does not # (Mali-G76 MC4: 145 footer flips in 6 s at rest, 0 composited). - if [ "$mode" = steam ] && [ "${BL_VKBRIDGE:-0}" = 1 ] && [ -z "${gamescope_composite_force:-}" ]; then + if [ "$mode" = steam ] && [ "${DD_VKBRIDGE:-0}" = 1 ] && [ -z "${gamescope_composite_force:-}" ]; then export gamescope_composite_force=1 echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)" fi args=(--backend "$backend" --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") if [ "${game_size:-0}" != 1 ] && { [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; }; then args+=(-S stretch) - export BL_STRETCHED=1 + export DD_STRETCHED=1 fi - if [ "${BL_REFRESH:-0}" -gt 0 ]; then - args+=(-r "$BL_REFRESH") + if [ "${DD_REFRESH:-0}" -gt 0 ]; then + args+=(-r "$DD_REFRESH") export GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 fi - [ "$mode" = steam ] && [ "${BL_STEAM_UI:-}" != desktop ] && args+=(-e) - if [ "$mode" = steam ] && [ "${BL_XWAYLAND_COUNT:-2}" -gt 1 ]; then - args+=(--xwayland-count "${BL_XWAYLAND_COUNT:-2}") + [ "$mode" = steam ] && [ "${DD_STEAM_UI:-}" != desktop ] && args+=(-e) + if [ "$mode" = steam ] && [ "${DD_XWAYLAND_COUNT:-2}" -gt 1 ]; then + args+=(--xwayland-count "${DD_XWAYLAND_COUNT:-2}") export STEAM_MULTIPLE_XWAYLANDS=1 fi [ "$mode" = steam ] && args+=(--default-touch-mode 4) - [ "${BL_HDR:-0}" = 1 ] && args+=(--hdr-enabled) - [ -n "${BL_GAMESCOPE_ARGS:-}" ] && read -r -a _bl_extra <<<"$BL_GAMESCOPE_ARGS" && args+=("${_bl_extra[@]}") - if [ "$mode" = steam ] && [ "${BL_MANGOAPP:-1}" = 1 ] \ - && [ "${BL_STEAM_UI:-}" != desktop ] && command -v mangoapp >/dev/null 2>&1; then + [ "${DD_HDR:-0}" = 1 ] && args+=(--hdr-enabled) + [ -n "${DD_GAMESCOPE_ARGS:-}" ] && read -r -a _dd_extra <<<"$DD_GAMESCOPE_ARGS" && args+=("${_dd_extra[@]}") + if [ "$mode" = steam ] && [ "${DD_MANGOAPP:-1}" = 1 ] \ + && [ "${DD_STEAM_UI:-}" != desktop ] && command -v mangoapp >/dev/null 2>&1; then MANGOHUD_CONFIGFILE=/tmp/droiddeck-mangohud.conf echo no_display > "$MANGOHUD_CONFIGFILE" export MANGOHUD_CONFIGFILE STEAM_USE_MANGOAPP=1 STEAM_MANGOAPP_PRESETS_SUPPORTED=1 STEAM_MANGOAPP_HORIZONTAL_SUPPORTED=1 @@ -559,7 +562,7 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: mangoapp on ($(command -v mangoapp), config $MANGOHUD_CONFIGFILE)" fi mkdir -p /run/droiddeck-hud && export DROIDDECK_HUD_FRAMES=/run/droiddeck-hud/frames - export BL_INSIDE=1 + export DD_INSIDE=1 rm -f "${XDG_RUNTIME_DIR:-/tmp}"/gamescope-limiter-* export GAMESCOPE_LIMITER_FILE="${XDG_RUNTIME_DIR:-/tmp}/droiddeck-gamescope-limiter" rm -f "$GAMESCOPE_LIMITER_FILE" @@ -570,21 +573,21 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== pipewire: not running; Remote Play and game recording have no picture" fi run_gamescope "${args[@]}" -- "$0" "$mode" "$@" - _bl_status=$? + _dd_status=$? /usr/local/bin/droiddeck-pipewire stop - exit $_bl_status + exit $_dd_status fi exec gamescope "${args[@]}" -- "$0" "$mode" "$@" fi -bl_displays() { +dd_displays() { printf '%s\n' "$DISPLAY" [ -n "${STEAM_GAME_DISPLAY_0:-}" ] && [ "$STEAM_GAME_DISPLAY_0" != "$DISPLAY" ] && printf '%s\n' "$STEAM_GAME_DISPLAY_0" return 0 } -bl_xprop_set_all() { +dd_xprop_set_all() { local d ok=1 - for d in $(bl_displays); do + for d in $(dd_displays); do DISPLAY=$d xprop -root -f "$1" 32c -set "$1" "$2" 2>/dev/null || ok=0 done [ "$ok" = 1 ] @@ -609,11 +612,11 @@ reap_orphans() { done } -if [ "${BL_DESKTOP:-}" != 1 ] && [ -n "${BL_ANDROID_CLIPBOARD:-}" ] && [ -x /usr/local/bin/droiddeck-clipboard ]; then - /usr/local/bin/droiddeck-clipboard "$BL_ANDROID_CLIPBOARD" & +if [ "${DD_DESKTOP:-}" != 1 ] && [ -n "${DD_ANDROID_CLIPBOARD:-}" ] && [ -x /usr/local/bin/droiddeck-clipboard ]; then + /usr/local/bin/droiddeck-clipboard "$DD_ANDROID_CLIPBOARD" & fi -[ "${BL_DESKTOP:-}" = 1 ] || start_agent +[ "${DD_DESKTOP:-}" = 1 ] || start_agent case $mode in desktop) @@ -644,8 +647,8 @@ case $mode in wait "$child" || rc=$? [ "$forwarded" = 1 ] || break done - if [ -n "${BL_LAUNCH_DIR:-}" ]; then - printf '%s\n' "$rc" > "$BL_LAUNCH_DIR/run-status.tmp" && mv -f "$BL_LAUNCH_DIR/run-status.tmp" "$BL_LAUNCH_DIR/run-status" + if [ -n "${DD_LAUNCH_DIR:-}" ]; then + printf '%s\n' "$rc" > "$DD_LAUNCH_DIR/run-status.tmp" && mv -f "$DD_LAUNCH_DIR/run-status.tmp" "$DD_LAUNCH_DIR/run-status" fi exit "$rc" } @@ -679,20 +682,20 @@ case $mode in export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 export MOZ_SHM_NO_SEALS=1 steam_x64=0 - [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ] && steam_x64=1 + [ "${DD_STEAM_CLIENT_ARCH:-}" = x86_64 ] && steam_x64=1 steam_cef_gpu=1 if [ "$steam_x64" = 1 ]; then step "checking the Steam client's arm64 parts (first run downloads them, ~1-2 min)" - _bl_x64_repair=0 - [ -e "$HOME/.bl-steam-repair" ] && _bl_x64_repair=1 + _dd_x64_repair=0 + [ -e "$HOME/.dd-steam-repair" ] && _dd_x64_repair=1 droiddeck-steam-install || steam_setup_failed $? droiddeck-steam-install --sync steamdeck_publicbeta || step "could not update the arm64 client's parts; the x86-64 client keeps its own web helper" step "checking the x86-64 Steam client (FEX, experimental; the first run downloads ~2 GB)" - BL_X64_REPAIR=$_bl_x64_repair droiddeck-steam-x64 --prepare || steam_setup_failed $? + DD_X64_REPAIR=$_dd_x64_repair droiddeck-steam-x64 --prepare || steam_setup_failed $? step "x86-64 Steam client ready" - steam_root=${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam + steam_root=${DD_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam steam_client=(droiddeck-steam-x64 --exec) - if [ "${BL_X64_X86_WEBHELPER:-0}" = 1 ] && + if [ "${DD_X64_X86_WEBHELPER:-0}" = 1 ] && ! droiddeck-steam-x64 --webhelper-gpu; then steam_cef_gpu=0 fi @@ -701,68 +704,68 @@ case $mode in droiddeck-steam-install || steam_setup_failed $? step "Steam client ready" steam_root=$XDG_DATA_HOME/Steam - if [ -f "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam/local.vdf" ]; then + if [ -f "${DD_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam/local.vdf" ]; then droiddeck-steam-x64 --sync-login || true droiddeck-steam-x64 --share || true fi steam_client=("$steam_root/steamrtarm64/steam") - _bl_srt_shim=$HOME/.droiddeck-steamrt-shim - if droiddeck-steamrt-shim "$steam_root/steamrtarm64" "$_bl_srt_shim"; then - echo "== steam: Valve containerized the arm64 Steam client (it carries a Steam Runtime container); starting it through $_bl_srt_shim" - steam_client=(env STEAM_RUNTIME_STEAMRT="$_bl_srt_shim" PATH="$_bl_srt_shim/bin:$PATH" "${steam_client[@]}") + _dd_srt_shim=$HOME/.droiddeck-steamrt-shim + if droiddeck-steamrt-shim "$steam_root/steamrtarm64" "$_dd_srt_shim"; then + echo "== steam: Valve containerized the arm64 Steam client (it carries a Steam Runtime container); starting it through $_dd_srt_shim" + steam_client=(env STEAM_RUNTIME_STEAMRT="$_dd_srt_shim" PATH="$_dd_srt_shim/bin:$PATH" "${steam_client[@]}") fi fi - _bl_proton_root=$steam_root + _dd_proton_root=$steam_root if [ "$steam_x64" = 1 ]; then - _bl_proton_root=$XDG_DATA_HOME/Steam - if ! ls -d "$_bl_proton_root"/compatibilitytools.d/GE-Proton*-aarch64 >/dev/null 2>&1 && - ! grep -q '^ge' "$HOME/.bl-proton-extra" 2>/dev/null; then - echo ge >> "$HOME/.bl-proton-extra" + _dd_proton_root=$XDG_DATA_HOME/Steam + if ! ls -d "$_dd_proton_root"/compatibilitytools.d/GE-Proton*-aarch64 >/dev/null 2>&1 && + ! grep -q '^ge' "$HOME/.dd-proton-extra" 2>/dev/null; then + echo ge >> "$HOME/.dd-proton-extra" fi fi - if [ -s "$HOME/.bl-proton-extra" ]; then - _bl_left=$HOME/.bl-proton-extra.left - : > "$_bl_left" - _bl_got_proton=0 - while read -r _bl_extra || [ -n "$_bl_extra" ]; do - case ${_bl_extra# } in ""|"#"*) continue ;; esac - step "installing Proton '$_bl_extra' (large download, several minutes)" - if droiddeck-proton-extra "$_bl_proton_root" $_bl_extra; then - _bl_got_proton=1 - step "installed Proton '$_bl_extra'" + if [ -s "$HOME/.dd-proton-extra" ]; then + _dd_left=$HOME/.dd-proton-extra.left + : > "$_dd_left" + _dd_got_proton=0 + while read -r _dd_extra || [ -n "$_dd_extra" ]; do + case ${_dd_extra# } in ""|"#"*) continue ;; esac + step "installing Proton '$_dd_extra' (large download, several minutes)" + if droiddeck-proton-extra "$_dd_proton_root" $_dd_extra; then + _dd_got_proton=1 + step "installed Proton '$_dd_extra'" else - step "Proton '$_bl_extra' failed; will retry next session" - echo "$_bl_extra" >> "$_bl_left" + step "Proton '$_dd_extra' failed; will retry next session" + echo "$_dd_extra" >> "$_dd_left" fi - done < "$HOME/.bl-proton-extra" - mv -f "$_bl_left" "$HOME/.bl-proton-extra" - if [ "$steam_x64" = 1 ] && [ "$_bl_got_proton" = 1 ]; then + done < "$HOME/.dd-proton-extra" + mv -f "$_dd_left" "$HOME/.dd-proton-extra" + if [ "$steam_x64" = 1 ] && [ "$_dd_got_proton" = 1 ]; then droiddeck-steam-x64 --prepare || true fi fi - if [ -s "$HOME/.bl-steam-urls" ]; then - while read -r _bl_url || [ -n "$_bl_url" ]; do - case ${_bl_url# } in steam://*) ;; *) continue ;; esac - step "asking the client for $_bl_url" - set -- "$@" "$_bl_url" - done < "$HOME/.bl-steam-urls" - rm -f "$HOME/.bl-steam-urls" + if [ -s "$HOME/.dd-steam-urls" ]; then + while read -r _dd_url || [ -n "$_dd_url" ]; do + case ${_dd_url# } in steam://*) ;; *) continue ;; esac + step "asking the client for $_dd_url" + set -- "$@" "$_dd_url" + done < "$HOME/.dd-steam-urls" + rm -f "$HOME/.dd-steam-urls" fi - if [ -n "${BL_CLIENT_CPUS:-}" ]; then - step "client cores: $BL_CLIENT_CPUS" + if [ -n "${DD_CLIENT_CPUS:-}" ]; then + step "client cores: $DD_CLIENT_CPUS" fi - if [ "${BL_ZRAM:-0}" = 1 ]; then + if [ "${DD_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${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 + [ "${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 '$BL_RAM_CAP_MB'" ;; - *) _bl_ram_cap=$((BL_RAM_CAP_MB * 1024)); step "RAM cap: ${BL_RAM_CAP_MB} MB" ;; + *[!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 ( - bl_zram_scan() { - _bl_game=0 _bl_pids=() _bl_others=() _bl_apps= + dd_zram_scan() { + _dd_game=0 _dd_pids=() _dd_others=() _dd_apps= local _d _c _args _name _a _id _fex _lower _bnet=() _bnet_game=0 for _d in /proc/[0-9]*; do [ "${_d##*/}" != "$BASHPID" ] || continue @@ -780,21 +783,21 @@ case $mode in AppId=769) ;; AppId=[0-9]*) _id=${_a#AppId=} - case $_id in *[!0-9]*) ;; *) _bl_game=1; _bl_apps="$_bl_apps $_id" ;; esac + case $_id in *[!0-9]*) ;; *) _dd_game=1; _dd_apps="$_dd_apps $_id" ;; esac ;; esac done ;; - steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;; + steam|steamwebhelper) _dd_pids+=("${_d##*/}") ;; *) _lower=${_name,,} if [ "$_fex" = 1 ] && grep -qz '^DROIDDECK_EPIC_HIDDEN=1$' "$_d/environ" 2>/dev/null; then - _bl_pids+=("${_d##*/}") + _dd_pids+=("${_d##*/}") elif [[ $_lower == [a-z]:[\\/]'program files (x86)'[\\/]battle.net[\\/]* || $_lower == [a-z]:[\\/]programdata[\\/]battle.net[\\/]* ]]; then _bnet+=("${_d##*/}") else - _bl_others+=("${_d##*/}") + _dd_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|\ @@ -811,12 +814,12 @@ case $mode in esac done if [ "$_bnet_game" = 1 ]; then - _bl_pids+=("${_bnet[@]}") + _dd_pids+=("${_bnet[@]}") else - _bl_others+=("${_bnet[@]}") + _dd_others+=("${_bnet[@]}") fi } - bl_zram_usage() { + dd_zram_usage() { local _p _k _v _u _resident _anonymous _rss=0 _anon=0 _swap=0 for _p in "$@"; do _resident=0 _anonymous=-1 @@ -831,25 +834,25 @@ case $mode in [ "$_anonymous" -ge 0 ] || _anonymous=$_resident _rss=$((_rss + _resident)) _anon=$((_anon + _anonymous)) done - _bl_rss=$_rss _bl_anon=$_anon - _bl_swap=$_swap + _dd_rss=$_rss _dd_anon=$_anon + _dd_swap=$_swap echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } - bl_memory_read() { + dd_memory_read() { local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall - _saved_growth=${_bl_preserved_growth:-0} _saved_fall=${_bl_preserved_fall:-0} - _bl_preserved_growth=0 _bl_preserved_fall=0 - _bl_mem_total=0 _bl_available=-1 _bl_swap_total=0 _bl_swap_free=-1 - _bl_psi_some=0 _bl_psi_full=0 _bl_gpu=0 _bl_unevictable=0 _bl_shmem=0 + _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 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in - MemTotal:) _bl_mem_total=$_v ;; - MemAvailable:) _bl_available=$_v ;; - SwapTotal:) _bl_swap_total=$_v ;; - SwapFree:) _bl_swap_free=$_v ;; - Unevictable:) _bl_unevictable=$_v ;; - Shmem:) _bl_shmem=$_v ;; + 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 ;; esac done 2>/dev/null < /proc/meminfo if [ -r /proc/pressure/memory ]; then @@ -862,366 +865,366 @@ case $mode in _frac=${_frac:0:2} case $_whole$_frac in ''|*[!0-9]*) continue ;; esac if [ "$_kind" = some ]; then - _bl_psi_some=$((10#$_whole * 100 + 10#$_frac)) + _dd_psi_some=$((10#$_whole * 100 + 10#$_frac)) else - _bl_psi_full=$((10#$_whole * 100 + 10#$_frac)) + _dd_psi_full=$((10#$_whole * 100 + 10#$_frac)) fi 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 - _bl_gpu=$((_gpu_bytes / 1024)) + _dd_gpu=$((_gpu_bytes / 1024)) fi - _bl_psi=$_bl_psi_some - [ "$_bl_psi_full" -gt "$_bl_psi" ] && _bl_psi=$_bl_psi_full - if [ "${_bl_sample_at:-}" = "" ]; then - _bl_growth=0 _bl_fall=0 - _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu - _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem - elif [ "$SECONDS" -gt "$_bl_sample_at" ]; then - _bl_growth=0 _bl_fall=0 - _growth=$((_bl_gpu - _bl_sample_gpu)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) - _growth=$((_bl_unevictable - _bl_sample_unevictable)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) - _growth=$((_bl_shmem - _bl_sample_shmem)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) - _bl_fall=$((_bl_sample_available - _bl_available)) - [ "$_saved_growth" -gt "$_bl_growth" ] && _bl_growth=$_saved_growth - [ "$_saved_fall" -gt "$_bl_fall" ] && _bl_fall=$_saved_fall - if [ $((SECONDS - _bl_sample_at)) -ge 5 ]; then - _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu - _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + _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 fi - _bl_real_available=$_bl_available - [ "$_bl_real_available" -ge 0 ] && _bl_real_available=$((_bl_real_available - _bl_growth)) - _bl_headroom=$((_bl_mem_total / 5)) - [ "$_bl_headroom" -ge $((512 * 1024)) ] || _bl_headroom=$((512 * 1024)) - [ "$_bl_headroom" -le $((1536 * 1024)) ] || _bl_headroom=$((1536 * 1024)) - _bl_tier_headroom=$((_bl_mem_total / 4)) - [ "$_bl_tier_headroom" -ge $((768 * 1024)) ] || _bl_tier_headroom=$((768 * 1024)) - [ "$_bl_tier_headroom" -le $((2560 * 1024)) ] || _bl_tier_headroom=$((2560 * 1024)) - _bl_fall_headroom=$((_bl_tier_headroom * 2)) - [ "$_bl_fall_headroom" -ge $((_bl_mem_total * 2 / 5)) ] || _bl_fall_headroom=$((_bl_mem_total * 2 / 5)) - _bl_swap_reserve=$((_bl_swap_total / 5)) - [ "$_bl_swap_reserve" -ge $((256 * 1024)) ] || _bl_swap_reserve=$((256 * 1024)) + _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)) } - bl_memory_tight() { - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_real_available" -lt "$_bl_headroom" ] || - { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_mem_total / 3)) ]; } || - { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_headroom * 2)) ]; }; } + 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)) ]; }; } } - bl_client_can_pageout() { - bl_memory_read - bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && bl_zram_has_room + dd_client_can_pageout() { + dd_memory_read + dd_zram_usage "${_dd_pids[@]}" > /dev/null + [ "$_dd_mem_total" -gt 0 ] && dd_zram_has_room } - bl_zram_has_room() { - [ "$_bl_swap_total" -gt 0 ] && - [ $((_bl_swap_free - _bl_anon - ${_bl_client_reserve:-0})) -ge "$_bl_swap_reserve" ] + dd_zram_has_room() { + [ "$_dd_swap_total" -gt 0 ] && + [ $((_dd_swap_free - _dd_anon - ${_dd_client_reserve:-0})) -ge "$_dd_swap_reserve" ] } - bl_client_can_readback() { - bl_memory_read - bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && ! bl_memory_tight && ! bl_memory_critical && - [ "$_bl_real_available" -ge $((_bl_swap * 2)) ] && - [ $((_bl_real_available - _bl_swap)) -ge "$_bl_headroom" ] + 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" ] } - bl_client_pressure() { - [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ "$_bl_game" = 1 ] && - [ "${#_bl_pids[@]}" -gt 0 ] && { bl_memory_tight || bl_memory_critical; } || return 0 - [ "$_bl_pressure_at" -lt 0 ] || - [ $((SECONDS - _bl_pressure_at)) -ge "$_bl_pressure_backoff" ] || return 0 - [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 30 ] || return 0 - _bl_pressure_at=$SECONDS - if ! bl_client_can_pageout; then - step "zRAM: pressure reclaim skipped, swap headroom too small ($((_bl_swap_free / 1024)) MB free)" + 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 fi - [ "$_bl_rss" -ge $((128 * 1024)) ] || return 0 - _bl_pressure_before=$_bl_rss + [ "$_dd_rss" -ge $((128 * 1024)) ] || return 0 + _dd_pressure_before=$_dd_rss if [ "${1:-}" = defer ]; then - _bl_client_reserve=$_bl_anon - _bl_client_pending=1 + _dd_client_reserve=$_dd_anon + _dd_client_pending=1 fi - bl_zram_send 1 "memory pressure, compressing the client (available $((_bl_available / 1024)) MB, swap free $((_bl_swap_free / 1024)) MB)" client "${1:-}" - _bl_packed=$SECONDS + 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 - _bl_client_targets=("${_bl_zram_targets[@]}") + _dd_client_targets=("${_dd_zram_targets[@]}") else - bl_client_pressure_result + dd_client_pressure_result fi } - bl_client_pressure_finish() { - [ "${_bl_client_pending:-0}" = 1 ] || return 0 - bl_zram_finish 1 "${_bl_client_targets[@]}" - bl_client_pressure_result "${_bl_client_targets[@]}" - _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + 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=() } - bl_client_pressure_result() { - [ "${_bl_pageout_complete:-0}" = 1 ] || return 0 - if [ "$#" -gt 0 ]; then bl_zram_usage "$@" > /dev/null; else bl_zram_usage "${_bl_pids[@]}" > /dev/null; fi - if [ $((_bl_pressure_before - _bl_rss)) -lt $((16 * 1024)) ]; then - _bl_pressure_backoff=$((_bl_pressure_backoff * 2 > 300 ? 300 : _bl_pressure_backoff * 2)) + 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 - _bl_pressure_backoff=30 + _dd_pressure_backoff=30 fi } - bl_memory_critical() { - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_real_available" -lt "$_bl_tier_headroom" ] || - { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; } || - { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt "$_bl_fall_headroom" ]; }; } + 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" ]; }; } } - bl_session_pressure() { - bl_memory_read - bl_memory_critical || _bl_tier_backoff=30 _bl_tier_nogain=0 - [ "$_bl_game" = 1 ] && bl_memory_critical || return 0 - [ "${BL_ZRAM_IDLE:-1}" = 1 ] && bl_game_focused 0 || return 0 - local _wait=$_bl_tier_backoff _before _available_before _pids _targets _gain _min_gain - [ "$_bl_available" -ge $((_bl_headroom / 2)) ] || [ "$_bl_tier_pushed" -lt 0 ] || _wait=30 - [ "$_bl_tier_at" -lt 0 ] || [ $((SECONDS - _bl_tier_at)) -ge "$_wait" ] || return 0 - if [ "$_bl_tier_at" -ge 0 ] && [ "$_bl_tier_pushed" -gt 0 ]; then - bl_tier_readback - if [ "$_bl_tier_back" -le $((_bl_tier_pushed / 2)) ]; then - [ "${_bl_tier_nogain:-0}" = 1 ] || _bl_tier_backoff=30 + 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 - _bl_tier_backoff=$((_bl_tier_backoff * 2 > 300 ? 300 : _bl_tier_backoff * 2)) - _bl_tier_at=$SECONDS _bl_tier_pushed=-1 - step "zRAM: the game read back most of its last page-out, next try in ${_bl_tier_backoff} s" + _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 - _bl_tier_at=$SECONDS _bl_tier_pushed=0 - bl_zram_pick session - bl_zram_usage "${_pids[@]}" > /dev/null - [ "$_bl_rss" -ge $((256 * 1024)) ] || return 0 - if ! bl_zram_has_room; then - step "zRAM: low-memory page-out skipped, swap headroom too small ($((_bl_swap_free / 1024)) MB free)" + _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=$_bl_swap _available_before=$_bl_available - bl_zram_send 1 "low memory (available $((_bl_real_available / 1024)) MB), compressing idle game memory" session - bl_zram_usage "${_targets[@]}" > /dev/null - _bl_tier_pushed=$((_bl_swap - _before)) - bl_tier_note "${_targets[@]}" - if [ "${_bl_pageout_complete:-0}" = 1 ]; then - bl_memory_read - _gain=$((_bl_available - _available_before)) - _min_gain=$((_bl_tier_headroom / 16)) + _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 - _bl_tier_backoff=$((_bl_tier_backoff * 2 > 300 ? 300 : _bl_tier_backoff * 2)) - _bl_tier_at=$SECONDS _bl_tier_nogain=1 - step "zRAM: low-memory page-out gained only $((_gain / 1024)) MB available, next try in ${_bl_tier_backoff} s" + _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 - _bl_tier_nogain=0 + _dd_tier_nogain=0 fi fi } - bl_proc_start() { + dd_proc_start() { local _s= - _bl_start= + _dd_start= read -r _s 2>/dev/null < "/proc/$1/stat" || return 1 _s=${_s##*) } set -- $_s [ "$1" != Z ] && [ "$#" -ge 20 ] || return 1 - _bl_start=${20} + _dd_start=${20} } - bl_tier_note() { + dd_tier_note() { local _p - _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() for _p in "$@"; do - bl_proc_start "$_p" || continue - bl_zram_usage "$_p" > /dev/null - _bl_tier_targets+=("$_p") _bl_tier_swaps+=("$_bl_swap") _bl_tier_starts+=("$_bl_start") + 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 } - bl_tier_readback() { + dd_tier_readback() { local _i _back=0 - for _i in "${!_bl_tier_targets[@]}"; do - bl_proc_start "${_bl_tier_targets[$_i]}" && [ "$_bl_start" = "${_bl_tier_starts[$_i]}" ] || continue - bl_zram_usage "${_bl_tier_targets[$_i]}" > /dev/null - [ "${_bl_tier_swaps[$_i]}" -le "$_bl_swap" ] || _back=$((_back + _bl_tier_swaps[_i] - _bl_swap)) + 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 - _bl_tier_back=$_back + _dd_tier_back=$_back } - bl_watch_nap() { + dd_watch_nap() { local _i - if [ "$_bl_game" = 1 ] && [ "$_bl_available" -ge 0 ] && [ "$_bl_real_available" -lt "$_bl_fall_headroom" ]; then + 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 - bl_memory_read - bl_memory_critical && return 0 + dd_memory_read + dd_memory_critical && return 0 done else nap 5 fi return 0 } - bl_session_others() { + dd_session_others() { local _p - _bl_session=() - for _p in "${_bl_others[@]}"; do - grep -q -m1 '/libblsession\.so$' "/proc/$_p/maps" 2>/dev/null && _bl_session+=("$_p") + _dd_session=() + for _p in "${_dd_others[@]}"; do + grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null && _dd_session+=("$_p") done } - bl_zram_pick() { + dd_zram_pick() { if [ "$1" = game ]; then - bl_session_others - _pids=("${_bl_session[@]}") - [ "${BL_ZRAM_CLIENT:-1}" != 1 ] || _pids+=("${_bl_pids[@]}") + dd_session_others + _pids=("${_dd_session[@]}") + [ "${DD_ZRAM_CLIENT:-1}" != 1 ] || _pids+=("${_dd_pids[@]}") elif [ "$1" = session ]; then - bl_session_others - _pids=("${_bl_session[@]}") + dd_session_others + _pids=("${_dd_session[@]}") else - _pids=("${_bl_pids[@]}") + _pids=("${_dd_pids[@]}") fi } - bl_zram_wait() { + dd_zram_wait() { local _p _left _start=$SECONDS while [ $((SECONDS - _start)) -lt 12 ]; do _left=0 for _p in "$@"; do - [ -s "/tmp/.bl-zram.ack.$_p" ] && continue + [ -s "/tmp/.dd-zram.ack.$_p" ] && continue [ -d "/proc/$_p" ] || continue - [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.bl-zram.ack.$_p" ] && continue + [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.dd-zram.ack.$_p" ] && continue _left=1 done [ "$_left" = 1 ] || break nap 0.2 done - _bl_pageout_complete=1 + _dd_pageout_complete=1 for _p in "$@"; do - if [ -d "/proc/$_p" ] && [ ! -s "/tmp/.bl-zram.ack.$_p" ]; then _bl_pageout_complete=0; fi - rm -f "/tmp/.bl-zram.ack.$_p" + if [ -d "/proc/$_p" ] && [ ! -s "/tmp/.dd-zram.ack.$_p" ]; then _dd_pageout_complete=0; fi + rm -f "/tmp/.dd-zram.ack.$_p" done } - bl_zram_send() { + dd_zram_send() { local _mode=$1 _what=$2 _which=$3 _pids _p - bl_zram_pick "$_which" - step "zRAM: $_what ($(bl_zram_usage "${_pids[@]}"))" - for _p in "${_pids[@]}"; do rm -f "/tmp/.bl-zram.ack.$_p"; done - printf '%s' "$_mode" > /tmp/.bl-zram + 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 - _bl_zram_targets=("${_pids[@]}") + _dd_zram_targets=("${_pids[@]}") [ "${4:-}" != defer ] || return 0 - bl_zram_finish "$_mode" "${_pids[@]}" + dd_zram_finish "$_mode" "${_pids[@]}" } - bl_zram_finish() { + dd_zram_finish() { local _mode=$1 shift - if [ "$_mode" = 1 ]; then bl_zram_wait "$@"; else nap 5; fi - bl_zram_scan - step "zRAM: done ($(bl_zram_usage "$@"))" + if [ "$_mode" = 1 ]; then dd_zram_wait "$@"; else nap 5; fi + dd_zram_scan + step "zRAM: done ($(dd_zram_usage "$@"))" } - bl_game_focused() { - if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then + dd_game_focused() { + if [ "${DD_DESKTOP:-}" = 1 ] || [ -z "${DD_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) + "$DD_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1) [ -n "$id" ] || return "${1:-2}" - case " ${_bl_apps-} " in + case " ${_dd_apps-} " in *" $id "*) return 0 ;; esac return 1 } - bl_over_cap() { - [ "$_bl_ram_cap" -gt 0 ] || return 1 - _bl_measured=$SECONDS - bl_session_others - bl_zram_usage "${_bl_pids[@]}" "${_bl_session[@]}" > /dev/null - [ "$_bl_rss" -gt "$_bl_ram_cap" ] + 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" ] } - bl_cap_due() { - [ "$_bl_ram_cap" -gt 0 ] && { [ "$_bl_measured" -lt 0 ] || [ $((SECONDS - _bl_measured)) -ge 30 ]; } + dd_cap_due() { + [ "$_dd_ram_cap" -gt 0 ] && { [ "$_dd_measured" -lt 0 ] || [ $((SECONDS - _dd_measured)) -ge 30 ]; } } - _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 - _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_nogain=0 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() - _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() _bl_away= - _bl_sample_at= _bl_sample_available=0 _bl_sample_gpu=0 _bl_sample_unevictable=0 _bl_sample_shmem=0 + _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 - bl_zram_scan - bl_memory_read - if bl_cap_due; then - if bl_over_cap; then - if [ "$_bl_capped" -lt 0 ] || [ $((SECONDS - _bl_capped)) -ge "$_bl_backoff" ]; then - bl_zram_usage "${_bl_pids[@]}" > /dev/null - if [ "$_bl_rss" -ge $((512 * 1024)) ]; then - bl_zram_send 1 "over the ${BL_RAM_CAP_MB} MB RAM cap, compressing the client" client - [ "$_bl_game" = 1 ] && _bl_packed=$SECONDS + 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 ($((_bl_rss / 1024)) MB resident), skipping it" + step "RAM cap: over, client already small ($((_dd_rss / 1024)) MB resident), skipping it" fi - bl_over_cap && bl_zram_send 1 "still over the RAM cap, compressing the rest of the session" session - if bl_over_cap; then - _bl_backoff=$((_bl_backoff * 2 > 600 ? 600 : _bl_backoff * 2)) - step "RAM cap: still over after paging out, next try in ${_bl_backoff} s" + 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 - _bl_backoff=30 + _dd_backoff=30 fi - _bl_capped=$SECONDS + _dd_capped=$SECONDS fi else - _bl_backoff=30 + _dd_backoff=30 fi fi - _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall - bl_client_pressure defer - _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall - bl_session_pressure - bl_client_pressure_finish - _bl_focus=1 - [ "$_bl_game" = 1 ] && { bl_game_focused && _bl_focus=0 || _bl_focus=$?; } - if [ "$_bl_game" = 1 ] && [ "$_bl_focus" = 0 ]; then - _bl_away= - if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then - _bl_since=$SECONDS _bl_since_apps=$_bl_apps + _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 [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && - { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; } && bl_client_can_pageout; then - bl_zram_send 1 "compressing the client" client - _bl_packed=$SECONDS + 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 [ "$_bl_game" != 1 ]; then - _bl_away= - if [ "$_bl_packed" -ge 0 ]; then - _bl_unpack=1 + elif [ "$_dd_game" != 1 ]; then + _dd_away= + if [ "$_dd_packed" -ge 0 ]; then + _dd_unpack=1 fi - _bl_since=-1 _bl_packed=-1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_nogain=0 _bl_tier_pushed=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _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 - _bl_since=-1 - if [ "$_bl_focus" = 1 ]; then - [ -n "${_bl_away-}" ] || _bl_away=$SECONDS + _dd_since=-1 + if [ "$_dd_focus" = 1 ]; then + [ -n "${_dd_away-}" ] || _dd_away=$SECONDS else - _bl_away= + _dd_away= fi - if [ "$_bl_packed" -ge 0 ]; then - _bl_unpack=1 + if [ "$_dd_packed" -ge 0 ]; then + _dd_unpack=1 fi fi - if [ "$_bl_unpack" = 1 ] && - { [ "$_bl_game" = 0 ] || { [ "${_bl_ram_cap:-0}" = 0 ] && [ -n "${_bl_away-}" ] && [ $((SECONDS - _bl_away)) -ge 5 ]; }; } && - ! bl_over_cap && bl_client_can_readback; then - if [ "$_bl_game" = 0 ]; then - bl_zram_send 0 "memory recovered, reading the client back" client + 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 - bl_zram_send 0 "the client is in front of the game, reading it back" client - _bl_packed=-1 + dd_zram_send 0 "the client is in front of the game, reading it back" client + _dd_packed=-1 fi - _bl_unpack=0 + _dd_unpack=0 fi - bl_watch_nap + dd_watch_nap done ) & fi - if [ "${BL_LAUNCHER_CORES:-1}" != 0 ] && [ -n "${BL_LAUNCH_DIR:-}" ] && [ -z "${BL_DESKTOP:-}" ] \ - && [ "${BL_STEAM_UI:-}" != desktop ] && [ -x /usr/local/bin/droiddeck-launcher-cores ]; then - /usr/local/bin/droiddeck-launcher-cores "$BL_LAUNCH_DIR/agent/focus.json" 2>&1 & + if [ "${DD_LAUNCHER_CORES:-1}" != 0 ] && [ -n "${DD_LAUNCH_DIR:-}" ] && [ -z "${DD_DESKTOP:-}" ] \ + && [ "${DD_STEAM_UI:-}" != desktop ] && [ -x /usr/local/bin/droiddeck-launcher-cores ]; then + /usr/local/bin/droiddeck-launcher-cores "$DD_LAUNCH_DIR/agent/focus.json" 2>&1 & fi - if [ "${BL_PACE_CORES:-1}" != 0 ] && [ -n "${DROIDDECK_HUD_FRAMES:-}" ] && [ -z "${BL_DESKTOP:-}" ] \ + if [ "${DD_PACE_CORES:-1}" != 0 ] && [ -n "${DROIDDECK_HUD_FRAMES:-}" ] && [ -z "${DD_DESKTOP:-}" ] \ && [ -x /usr/local/bin/droiddeck-pace-cores ]; then /usr/local/bin/droiddeck-pace-cores "$DROIDDECK_HUD_FRAMES" 2>&1 & fi @@ -1231,46 +1234,46 @@ case $mode in droiddeck-steam-library "$steam_root" || true step "setting up the ARM64 Proton compatibility tool" steam-compatibility "$steam_root" || true - if [ -z "${BL_DESKTOP:-}" ] && [ "${BL_STEAM_UI:-}" != desktop ]; then - droiddeck-steam-ui-scale "$steam_root" "${BL_WIDTH:-1280}" "${BL_HEIGHT:-720}" || true + if [ -z "${DD_DESKTOP:-}" ] && [ "${DD_STEAM_UI:-}" != desktop ]; then + droiddeck-steam-ui-scale "$steam_root" "${DD_WIDTH:-1280}" "${DD_HEIGHT:-720}" || true fi - if [ -n "${BL_ADDED_GAMES:-}" ]; then + if [ -n "${DD_ADDED_GAMES:-}" ]; then step "adding the app's own games to the client's library" - droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true + droiddeck-steam-shortcuts "$steam_root" "$DD_ADDED_GAMES" || true fi DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true else - _bl_x64_tool=$(droiddeck-steam-x64 --default-tool) - if [ -n "$_bl_x64_tool" ]; then - if [ -n "${BL_ADDED_GAMES:-}" ]; then + _dd_x64_tool=$(droiddeck-steam-x64 --default-tool) + if [ -n "$_dd_x64_tool" ]; then + if [ -n "${DD_ADDED_GAMES:-}" ]; then step "adding the app's own games to the x86-64 client's library" - BL_COMPAT_TOOL=$_bl_x64_tool droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true + DD_COMPAT_TOOL=$_dd_x64_tool droiddeck-steam-shortcuts "$steam_root" "$DD_ADDED_GAMES" || true fi - step "pointing the x86-64 client's Windows titles at $_bl_x64_tool" - BL_COMPAT_TOOL=$_bl_x64_tool steam-compatibility "$steam_root" --x64 || true + step "pointing the x86-64 client's Windows titles at $_dd_x64_tool" + DD_COMPAT_TOOL=$_dd_x64_tool steam-compatibility "$steam_root" --x64 || true fi - if [ -z "${BL_DESKTOP:-}" ] && [ "${BL_STEAM_UI:-}" != desktop ]; then - droiddeck-steam-ui-scale "$steam_root" "${BL_WIDTH:-1280}" "${BL_HEIGHT:-720}" || true + if [ -z "${DD_DESKTOP:-}" ] && [ "${DD_STEAM_UI:-}" != desktop ]; then + droiddeck-steam-ui-scale "$steam_root" "${DD_WIDTH:-1280}" "${DD_HEIGHT:-720}" || true fi DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true fi - if [ -n "${BL_SHADER_PRECACHE:-}" ]; then - droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ - "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" && - echo "$BL_SHADER_PRECACHE" > "$HOME/.bl-shader-precache-applied" || true + if [ -n "${DD_SHADER_PRECACHE:-}" ]; then + droiddeck-steam-shaders "$DD_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ + "${DD_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" && + echo "$DD_SHADER_PRECACHE" > "$HOME/.dd-shader-precache-applied" || true fi if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton" set -- "$@" steam://install/4427310 ( - _bl_acf="$steam_root/steamapps/appmanifest_4427310.acf" + _dd_acf="$steam_root/steamapps/appmanifest_4427310.acf" for _ in $(seq 1 360); do sleep 10 - if grep -q '"StateFlags"[[:space:]]*"4"' "$_bl_acf" 2>/dev/null; then + if grep -q '"StateFlags"[[:space:]]*"4"' "$_dd_acf" 2>/dev/null; then sleep 10 steam-compatibility "$steam_root" >/dev/null 2>&1 || true step "compatibility layer installed: restarting the Steam client once" - : > "$HOME/.bl-restart-once" + : > "$HOME/.dd-restart-once" "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true exit 0 fi @@ -1278,23 +1281,23 @@ case $mode in ) & if ! grep -q '"RememberPassword"[[:space:]]*"1"' "$steam_root/config/loginusers.vdf" 2>/dev/null; then ( - _bl_acf="$steam_root/steamapps/appmanifest_4427310.acf" - _bl_conn="$steam_root/logs/connection_log.txt" - _bl_cons="$steam_root/logs/console_log.txt" - _bl_from=$(stat -c %s "$_bl_conn" 2>/dev/null || echo 0) - _bl_cfrom=$(stat -c %s "$_bl_cons" 2>/dev/null || echo 0) + _dd_acf="$steam_root/steamapps/appmanifest_4427310.acf" + _dd_conn="$steam_root/logs/connection_log.txt" + _dd_cons="$steam_root/logs/console_log.txt" + _dd_from=$(stat -c %s "$_dd_conn" 2>/dev/null || echo 0) + _dd_cfrom=$(stat -c %s "$_dd_cons" 2>/dev/null || echo 0) for _ in $(seq 1 180); do sleep 10 - [ -f "$_bl_acf" ] && exit 0 - if tail -c +$((_bl_from + 1)) "$_bl_conn" 2>/dev/null | grep -q "RecvMsgClientLogOnResponse() : processing complete"; then + [ -f "$_dd_acf" ] && exit 0 + if tail -c +$((_dd_from + 1)) "$_dd_conn" 2>/dev/null | grep -q "RecvMsgClientLogOnResponse() : processing complete"; then for _ in $(seq 1 45); do - tail -c +$((_bl_cfrom + 1)) "$_bl_cons" 2>/dev/null | grep -q "Waiting for compat in post-logon took" && break + tail -c +$((_dd_cfrom + 1)) "$_dd_cons" 2>/dev/null | grep -q "Waiting for compat in post-logon took" && break sleep 2 done - for _bl_try in 1 2 3; do + for _dd_try in 1 2 3; do sleep 10 - [ -f "$_bl_acf" ] && exit 0 - step "signed in: asking the client again for the ARM64 Proton (try $_bl_try of 3)" + [ -f "$_dd_acf" ] && exit 0 + step "signed in: asking the client again for the ARM64 Proton (try $_dd_try of 3)" "${steam_client[@]}" steam://install/4427310 >/dev/null 2>&1 || true sleep 50 done @@ -1304,10 +1307,10 @@ case $mode in ) & fi fi - [ -z "${BL_DESKTOP:-}" ] && ( + [ -z "${DD_DESKTOP:-}" ] && ( stretch=0 restore=0 - [ "${BL_STRETCHED:-0}" = 1 ] && stretch=1 - [ "${BL_RESTORE_ON_RESUME:-1}" = 1 ] && restore=1 + [ "${DD_STRETCHED:-0}" = 1 ] && stretch=1 + [ "${DD_RESTORE_ON_RESUME:-1}" = 1 ] && restore=1 atoms=(STEAM_TOUCH_CLICK_MODE GAMESCOPE_FOCUSED_APP) [ "$stretch" = 1 ] && atoms+=(GAMESCOPE_NEW_SCALING_SCALER) prop_value() { @@ -1334,12 +1337,12 @@ case $mode in filter\ *) filter=${v#filter } ;; esac done < <(sed -n 's/.*\] Client version:.*/client/p; s/.*\] Set scaling mode: \([0-9]*\).*/mode \1/p; s/.*\] Set scaling filter: \([0-9]*\).*/filter \1/p' "$log") - case $mode in [1-5]) bl_xprop_set_all GAMESCOPE_NEW_SCALING_SCALER $((mode - 1)) \ + case $mode in [1-5]) dd_xprop_set_all GAMESCOPE_NEW_SCALING_SCALER $((mode - 1)) \ && echo "== scaling: applied the client's saved scaling mode $mode" ;; esac case $filter in 1) v=0 ;; 2) v=1 ;; 3) v=2 ;; *) v= ;; esac - [ -n "$v" ] && bl_xprop_set_all GAMESCOPE_NEW_SCALING_FILTER "$v" \ + [ -n "$v" ] && dd_xprop_set_all GAMESCOPE_NEW_SCALING_FILTER "$v" \ && echo "== scaling: applied the client's saved scaling filter $filter" return 0 } @@ -1357,8 +1360,8 @@ case $mode in if [ "$pv" != "$app" ]; then app=$pv echo "== focused app: $app (touch mode ${tmode:-unset}) at $(date +%T)" - if [ -n "${BL_LAUNCH_DIR:-}" ]; then - printf '%s\n' "$app" > "$BL_LAUNCH_DIR/steam-focused-app.tmp" && mv -f "$BL_LAUNCH_DIR/steam-focused-app.tmp" "$BL_LAUNCH_DIR/steam-focused-app" + if [ -n "${DD_LAUNCH_DIR:-}" ]; then + printf '%s\n' "$app" > "$DD_LAUNCH_DIR/steam-focused-app.tmp" && mv -f "$DD_LAUNCH_DIR/steam-focused-app.tmp" "$DD_LAUNCH_DIR/steam-focused-app" fi fi case $pv in ''|0|769|*[!0-9]*) ;; *) restore_steam_scaling ;; esac @@ -1366,7 +1369,7 @@ case $mode in case $pv in ''|*[!0-9]*) prev=; continue ;; esac if [ "$prev" = 769 ] && [ "$pv" != 769 ]; then nap 1 - bl_xprop_set_all GAMESCOPE_RESTORE_FOCUS_WINDOW 1 \ + dd_xprop_set_all GAMESCOPE_RESTORE_FOCUS_WINDOW 1 \ && echo "== resume: asked gamescope to restore the game window (app $pv)" fi prev=$pv @@ -1382,33 +1385,33 @@ case $mode in ) & steam_hold_launch() { local game=$1 shortcut= waited=0 status=0 - _bl_focused() { xprop -root GAMESCOPE_FOCUSED_APP 2>/dev/null | sed -n 's/.*= *//p'; } - _bl_starting() { pgrep -f "reaper SteamLaunch AppId=$(((game >> 32) & 0xffffffff))( |$)" >/dev/null 2>&1; } - _bl_hand_off() { - printf '%s\n' "$game" > "$BL_LAUNCH_DIR/steam-game.tmp" && mv -f "$BL_LAUNCH_DIR/steam-game.tmp" "$BL_LAUNCH_DIR/steam-game" + _dd_focused() { xprop -root GAMESCOPE_FOCUSED_APP 2>/dev/null | sed -n 's/.*= *//p'; } + _dd_starting() { pgrep -f "reaper SteamLaunch AppId=$(((game >> 32) & 0xffffffff))( |$)" >/dev/null 2>&1; } + _dd_hand_off() { + printf '%s\n' "$game" > "$DD_LAUNCH_DIR/steam-game.tmp" && mv -f "$DD_LAUNCH_DIR/steam-game.tmp" "$DD_LAUNCH_DIR/steam-game" } - _bl_end=$((SECONDS + 120)) - until [ "$(_bl_focused)" = 769 ] || [ "$SECONDS" -ge "$_bl_end" ]; do + _dd_end=$((SECONDS + 120)) + until [ "$(_dd_focused)" = 769 ] || [ "$SECONDS" -ge "$_dd_end" ]; do sleep 1 done [ "${#game}" -gt 10 ] && shortcut=1 - _bl_ready_end=$((SECONDS + 30)) - while [ "$waited" -lt 30 ] && [ "$((_bl_ready_end - SECONDS))" -gt 0 ]; do - timeout "$((_bl_ready_end - SECONDS))" /usr/local/bin/droiddeck-agent --steam-ready >/dev/null 2>&1 && break - [ "$((_bl_ready_end - SECONDS))" -gt 1 ] || break + _dd_ready_end=$((SECONDS + 30)) + while [ "$waited" -lt 30 ] && [ "$((_dd_ready_end - SECONDS))" -gt 0 ]; do + timeout "$((_dd_ready_end - SECONDS))" /usr/local/bin/droiddeck-agent --steam-ready >/dev/null 2>&1 && break + [ "$((_dd_ready_end - SECONDS))" -gt 1 ] || break sleep 1 waited=$((waited + 1)) done waited=0 echo "== steam: interface up; launching the requested game $game" - _bl_hand_off + _dd_hand_off [ -n "$shortcut" ] || return 0 - while [ "$(_bl_focused)" = 769 ] && [ "$waited" -lt 20 ]; do + while [ "$(_dd_focused)" = 769 ] && [ "$waited" -lt 20 ]; do sleep 1 waited=$((waited + 1)) done - [ "$(_bl_focused)" = 769 ] || return 0 - if _bl_starting; then + [ "$(_dd_focused)" = 769 ] || return 0 + if _dd_starting; then echo "== steam: the requested game is already starting; not launching again" return 0 fi @@ -1416,53 +1419,53 @@ case $mode in /usr/local/bin/droiddeck-agent --wait-steam-shortcut-overview "$game" 45 || status=$? if [ "$status" -eq 3 ]; then echo "== steam: not a shortcut CGameID; not launching again" - elif _bl_starting; then + elif _dd_starting; then echo "== steam: the requested game started while waiting; not launching again" - elif [ "$(_bl_focused)" = 769 ]; then + elif [ "$(_dd_focused)" = 769 ]; then echo "== steam: clearing the pending launch interstitial for $game (overview status $status)" /usr/local/bin/droiddeck-agent --steam-clear-pending-interstitial "$(((game >> 32) & 0xffffffff))" >/dev/null 2>&1 && return 0 echo "== steam: launching the requested game again $game" - _bl_hand_off + _dd_hand_off else echo "== steam: the game took focus while waiting; not launching again" fi } - if [ -n "${BL_LAUNCH_DIR:-}" ] && [ -z "${BL_DESKTOP:-}" ]; then - _bl_held= - _bl_uninstall= - _bl_rest=() - for _bl_arg in "$@"; do - case $_bl_arg in - steam://rungameid/*) _bl_held=${_bl_arg#steam://rungameid/} ;; - steam://uninstall/*) _bl_uninstall=${_bl_arg#steam://uninstall/} ;; - *) _bl_rest+=("$_bl_arg") ;; + if [ -n "${DD_LAUNCH_DIR:-}" ] && [ -z "${DD_DESKTOP:-}" ]; then + _dd_held= + _dd_uninstall= + _dd_rest=() + for _dd_arg in "$@"; do + case $_dd_arg in + steam://rungameid/*) _dd_held=${_dd_arg#steam://rungameid/} ;; + steam://uninstall/*) _dd_uninstall=${_dd_arg#steam://uninstall/} ;; + *) _dd_rest+=("$_dd_arg") ;; esac done - if [ -n "$_bl_uninstall" ]; then - set -- "${_bl_rest[@]}" + if [ -n "$_dd_uninstall" ]; then + set -- "${_dd_rest[@]}" ( - _bl_end=$((SECONDS + 120)) - until [ "$(xprop -root GAMESCOPE_FOCUSED_APP 2>/dev/null | sed -n 's/.*= *//p')" = 769 ] || [ "$SECONDS" -ge "$_bl_end" ]; do + _dd_end=$((SECONDS + 120)) + until [ "$(xprop -root GAMESCOPE_FOCUSED_APP 2>/dev/null | sed -n 's/.*= *//p')" = 769 ] || [ "$SECONDS" -ge "$_dd_end" ]; do sleep 1 done sleep 4 - echo "== steam: interface up; asking to uninstall $_bl_uninstall" - printf '%s\n' "$_bl_uninstall" > "$BL_LAUNCH_DIR/steam-uninstall.tmp" && mv -f "$BL_LAUNCH_DIR/steam-uninstall.tmp" "$BL_LAUNCH_DIR/steam-uninstall" + echo "== steam: interface up; asking to uninstall $_dd_uninstall" + printf '%s\n' "$_dd_uninstall" > "$DD_LAUNCH_DIR/steam-uninstall.tmp" && mv -f "$DD_LAUNCH_DIR/steam-uninstall.tmp" "$DD_LAUNCH_DIR/steam-uninstall" ) & fi - if [ -n "$_bl_held" ]; then - set -- "${_bl_rest[@]}" - steam_hold_launch "$_bl_held" & + if [ -n "$_dd_held" ]; then + set -- "${_dd_rest[@]}" + steam_hold_launch "$_dd_held" & fi fi - if [ -s "$HOME/.bl-autolaunch" ]; then - _bl_app=$(cat "$HOME/.bl-autolaunch") - case $_bl_app in - steam://*) _bl_url=$_bl_app ;; - *) _bl_url=steam://rungameid/$_bl_app ;; + if [ -s "$HOME/.dd-autolaunch" ]; then + _dd_app=$(cat "$HOME/.dd-autolaunch") + case $_dd_app in + steam://*) _dd_url=$_dd_app ;; + *) _dd_url=steam://rungameid/$_dd_app ;; esac - echo "== autolaunch $_bl_url" - set -- "$@" "$_bl_url" + echo "== autolaunch $_dd_url" + set -- "$@" "$_dd_url" fi if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1; then write_system_bus_config @@ -1474,15 +1477,15 @@ case $mode in done if [ -S /run/dbus/system_bus_socket ]; then echo "== network: system bus up, NetworkManager stand-in running" - rm -f "$BL_LAUNCH_DIR/steam-sleep-ready" + rm -f "$DD_LAUNCH_DIR/steam-sleep-ready" droiddeck-login1 --with-netmanager & login_manager=$! for ((_i = 0; _i < 50; _i++)); do - [ -f "$BL_LAUNCH_DIR/steam-sleep-ready" ] && break + [ -f "$DD_LAUNCH_DIR/steam-sleep-ready" ] && break kill -0 "$login_manager" 2>/dev/null || break nap 0.1 done - if [ ! -f "$BL_LAUNCH_DIR/steam-sleep-ready" ]; then + if [ ! -f "$DD_LAUNCH_DIR/steam-sleep-ready" ]; then echo "== sleep: login1 did not start; refusing a client that cannot resume" exit 69 fi @@ -1498,43 +1501,43 @@ case $mode in # Without a session bus libdbus autolaunches one under the game; it never exits and Steam's # reaper waits on it, so the launch or exit never finishes. if [ -z "${DBUS_SESSION_BUS_ADDRESS:-}" ]; then - _bl_bus=${XDG_RUNTIME_DIR:-/run/droiddeck}/bus - rm -f "$_bl_bus" - dbus-daemon --session --address="unix:path=$_bl_bus" --nofork --nopidfile & + _dd_bus=${XDG_RUNTIME_DIR:-/run/droiddeck}/bus + rm -f "$_dd_bus" + dbus-daemon --session --address="unix:path=$_dd_bus" --nofork --nopidfile & for _ in $(seq 1 50); do - [ -S "$_bl_bus" ] && break + [ -S "$_dd_bus" ] && break nap 0.1 done - if [ -S "$_bl_bus" ]; then - export DBUS_SESSION_BUS_ADDRESS="unix:path=$_bl_bus" - echo "== session bus up at $_bl_bus" + if [ -S "$_dd_bus" ]; then + export DBUS_SESSION_BUS_ADDRESS="unix:path=$_dd_bus" + echo "== session bus up at $_dd_bus" else echo "== session bus did not come up; programs may start their own" fi fi - _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME -u STEAM_STEAMRT_RECURSION_GUARD) - [ "${LD_LIBRARY_PATH+x}" ] && _bl_compat_env+=("LD_LIBRARY_PATH=$LD_LIBRARY_PATH") - [ "${STEAM_RUNTIME+x}" ] && _bl_compat_env+=("STEAM_RUNTIME=$STEAM_RUNTIME") - [ "${STEAM_STEAMRT_RECURSION_GUARD+x}" ] && _bl_compat_env+=("STEAM_STEAMRT_RECURSION_GUARD=$STEAM_STEAMRT_RECURSION_GUARD") + _dd_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME -u STEAM_STEAMRT_RECURSION_GUARD) + [ "${LD_LIBRARY_PATH+x}" ] && _dd_compat_env+=("LD_LIBRARY_PATH=$LD_LIBRARY_PATH") + [ "${STEAM_RUNTIME+x}" ] && _dd_compat_env+=("STEAM_RUNTIME=$STEAM_RUNTIME") + [ "${STEAM_STEAMRT_RECURSION_GUARD+x}" ] && _dd_compat_env+=("STEAM_STEAMRT_RECURSION_GUARD=$STEAM_STEAMRT_RECURSION_GUARD") export STEAM_RUNTIME=1 export STEAM_STEAMRT_RECURSION_GUARD=1 export LD_LIBRARY_PATH=$steam_root/steamrtarm64:$steam_root/steamrtarm64/panorama${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export SDL_VIDEO_X11_DGAMOUSE=0 - bl_steam_path=$PATH - bl_steam_angle=vulkan - bl_steam_presentation=() - if [ "${BL_STEAM_GL_PRESENT:-}" = 1 ]; then - bl_steam_path="/usr/local/libexec/droiddeck-steam:$PATH" + dd_steam_path=$PATH + dd_steam_angle=vulkan + dd_steam_presentation=() + if [ "${DD_STEAM_GL_PRESENT:-}" = 1 ]; then + dd_steam_path="/usr/local/libexec/droiddeck-steam:$PATH" export DISABLE_GAMESCOPE_WSI=1 LIBGL_KOPPER_DISABLE=true - bl_steam_angle=gl - bl_steam_presentation=(-cef-disable-gpu-compositing) + dd_steam_angle=gl + dd_steam_presentation=(-cef-disable-gpu-compositing) echo "== steam: system PowerVR uses OpenGL/DRI3 through Zink with software CEF compositing" - elif [ "${BL_STEAM_SOFT_COMPOSITING:-}" = 1 ]; then - bl_steam_presentation=(-cef-disable-gpu-compositing) + elif [ "${DD_STEAM_SOFT_COMPOSITING:-}" = 1 ]; then + dd_steam_presentation=(-cef-disable-gpu-compositing) echo "== steam: open driver pair - software CEF compositing, GPU raster" fi - _bl_cef=(-cef-force-gpu "${bl_steam_presentation[@]}" -cef-use-gl=angle "-cef-use-angle=$bl_steam_angle") + _dd_cef=(-cef-force-gpu "${dd_steam_presentation[@]}" -cef-use-gl=angle "-cef-use-angle=$dd_steam_angle") decky_loader=$HOME/homebrew/services/PluginLoader if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ -x "$decky_loader" ]; then decky_arch=$(cat "$HOME/homebrew/services/.droiddeck-decky-arch" 2>/dev/null || echo unknown) @@ -1571,64 +1574,64 @@ case $mode in fi fi steam_devtools 8080 - export BL_CDP_PORT - if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ "${decky_arch:-}" = x86_64 ] && [ ${#_bl_cdp[@]} = 0 ]; then - echo "== steam: devtools port $BL_CDP_PORT left open for the x86_64 Decky loader" + export DD_CDP_PORT + if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ "${decky_arch:-}" = x86_64 ] && [ ${#_dd_cdp[@]} = 0 ]; then + echo "== steam: devtools port $DD_CDP_PORT left open for the x86_64 Decky loader" else - export BL_CDP_GUARD=$BL_CDP_PORT - echo "== steam: devtools port $BL_CDP_PORT, guest processes only" + export DD_CDP_GUARD=$DD_CDP_PORT + echo "== steam: devtools port $DD_CDP_PORT, guest processes only" fi - [ -n "${BL_LAUNCH_DIR:-}" ] && mkdir -p "$BL_LAUNCH_DIR/agent" && echo "$BL_CDP_PORT" > "$BL_LAUNCH_DIR/agent/cdp-port" + [ -n "${DD_LAUNCH_DIR:-}" ] && mkdir -p "$DD_LAUNCH_DIR/agent" && echo "$DD_CDP_PORT" > "$DD_LAUNCH_DIR/agent/cdp-port" if [ "$steam_x64" = 1 ]; then { droiddeck-steam-compat --files-only "$steam_root" 2>&1 & } else - { "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } + { "${_dd_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } fi - _bl_ui=(-gamepadui) - [ "${BL_STEAM_UI:-}" = desktop ] && _bl_ui=() - # bl_steam_angle / bl_steam_presentation (set above) default to the Adreno values (vulkan, - # none); only the system-PowerVR path (BL_STEAM_GL_PRESENT=1) changes them. - _bl_cef=(-cef-force-gpu "${bl_steam_presentation[@]}" -cef-use-gl=angle "-cef-use-angle=${bl_steam_angle:-vulkan}") - [ "${steam_cef_gpu:-1}" = 1 ] || _bl_cef=(-cef-disable-gpu) - if [ "${BL_DESKTOP:-}" = 1 ] && [ "${BL_STEAM_UI:-}" = desktop ]; then - _bl_cef=(-cef-disable-gpu) - _bl_ui=(-nobigpicture) + _dd_ui=(-gamepadui) + [ "${DD_STEAM_UI:-}" = desktop ] && _dd_ui=() + # dd_steam_angle / dd_steam_presentation (set above) default to the Adreno values (vulkan, + # none); only the system-PowerVR path (DD_STEAM_GL_PRESENT=1) changes them. + _dd_cef=(-cef-force-gpu "${dd_steam_presentation[@]}" -cef-use-gl=angle "-cef-use-angle=${dd_steam_angle:-vulkan}") + [ "${steam_cef_gpu:-1}" = 1 ] || _dd_cef=(-cef-disable-gpu) + if [ "${DD_DESKTOP:-}" = 1 ] && [ "${DD_STEAM_UI:-}" = desktop ]; then + _dd_cef=(-cef-disable-gpu) + _dd_ui=(-nobigpicture) fi - if [ "${BL_VKBRIDGE:-0}" = 1 ]; then + if [ "${DD_VKBRIDGE:-0}" = 1 ]; then # On the GPU the Steam UI held about 400 MB through the bridge (Mali-G76 MC4, 3 GB of RAM); with # a game loading beside it, Android's low-memory killer took the whole session down. - if [ -z "${BL_VKBRIDGE_CEF_GPU:-}" ]; then - _bl_mem_kb=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo 2>/dev/null) - if [ "${_bl_mem_kb:-0}" -gt 0 ] && [ "$_bl_mem_kb" -lt 4194304 ]; then - BL_VKBRIDGE_CEF_GPU=0 - echo "== steam: $((_bl_mem_kb / 1024)) MB of RAM: the browser UI draws in software to leave games the memory" + if [ -z "${DD_VKBRIDGE_CEF_GPU:-}" ]; then + _dd_mem_kb=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo 2>/dev/null) + if [ "${_dd_mem_kb:-0}" -gt 0 ] && [ "$_dd_mem_kb" -lt 4194304 ]; then + DD_VKBRIDGE_CEF_GPU=0 + echo "== steam: $((_dd_mem_kb / 1024)) MB of RAM: the browser UI draws in software to leave games the memory" fi fi - if [ "${BL_VKBRIDGE_CEF_GPU:-1}" = 0 ]; then - _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) + if [ "${DD_VKBRIDGE_CEF_GPU:-1}" = 0 ]; then + _dd_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) echo "== steam: browser UI in software (Mali bridge)" - elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + elif [ "${_dd_cef[0]}" = -cef-force-gpu ]; then # With Steam's own web helper layout the Deck UI's footer and overlays flicker on the bridge # (Mali-G78 MP14). ANGLE on Vulkan without Chromium's Vulkan compositing draws them steadily. - : "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}" - _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") + : "${DD_VKBRIDGE_CEF_ANGLE=vulkan}" "${DD_VKBRIDGE_CEF_VULKAN=0}" + _dd_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${DD_VKBRIDGE_CEF_ANGLE:-vulkan}") fi - [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) - [ -n "${BL_VKBRIDGE_CEF_EXTRA:-}" ] && read -r -a _bl_cef_extra <<<"$BL_VKBRIDGE_CEF_EXTRA" && _bl_cef+=("${_bl_cef_extra[@]}") - BL_WEBHELPER_ARGS=$(bl_webhelper_layout) - export BL_WEBHELPER_ARGS - echo "== steam: web helper process layout: $BL_WEBHELPER_ARGS (Mali bridge)" + [ "${DD_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _dd_cef+=(-cef-enable-logging=stderr -cef-v=1) + [ -n "${DD_VKBRIDGE_CEF_EXTRA:-}" ] && read -r -a _dd_cef_extra <<<"$DD_VKBRIDGE_CEF_EXTRA" && _dd_cef+=("${_dd_cef_extra[@]}") + DD_WEBHELPER_ARGS=$(dd_webhelper_layout) + export DD_WEBHELPER_ARGS + echo "== steam: web helper process layout: $DD_WEBHELPER_ARGS (Mali bridge)" fi - if [ "${BL_STEAM_UI:-}" != desktop ]; then - if [ "$steam_x64" = 0 ] || [ "${BL_X64_DECK:-1}" != 0 ]; then - _bl_ui+=(-steamdeck -steamos3) + if [ "${DD_STEAM_UI:-}" != desktop ]; then + if [ "$steam_x64" = 0 ] || [ "${DD_X64_DECK:-1}" != 0 ]; then + _dd_ui+=(-steamdeck -steamos3) export STEAM_GAMESCOPE_NIS_SUPPORTED=1 export STEAM_GAMESCOPE_FANCY_SCALING_SUPPORT=1 echo "== steam: Deck mode on (-steamdeck -steamos3)" fi fi - export STEAMOS_STEAM_SHUTDOWN_SENTINEL="$HOME/.bl-steam-shutdown" - export STEAMOS_STEAM_REBOOT_SENTINEL="$HOME/.bl-steam-reboot" + export STEAMOS_STEAM_SHUTDOWN_SENTINEL="$HOME/.dd-steam-shutdown" + export STEAMOS_STEAM_REBOOT_SENTINEL="$HOME/.dd-steam-reboot" if ! pgrep -f 'steamwebhelper|steamrtarm64/steam|steamrt64/steam' >/dev/null 2>&1; then _stale="" for _f in "$steam_root/.crash" "$steam_root/steam.pid" \ @@ -1643,28 +1646,28 @@ case $mode in if [ "$steam_x64" = 0 ]; then steam_channel=$(droiddeck-steam-install --channel 2>/dev/null || echo steamdeck_publicbeta) fi - _bl_lang=() - [ -n "${BL_STEAM_LANGUAGE:-}" ] && _bl_lang=(-language "$BL_STEAM_LANGUAGE") + _dd_lang=() + [ -n "${DD_STEAM_LANGUAGE:-}" ] && _dd_lang=(-language "$DD_STEAM_LANGUAGE") steam_beta=$steam_root/package/beta - if [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then + if [ -n "${DD_ADDED_GAMES:-}" ] && [ -f "$DD_ADDED_GAMES" ]; then if [ "$steam_x64" = 0 ]; then - droiddeck-steam-games watch "$steam_root" "$BL_ADDED_GAMES" & + droiddeck-steam-games watch "$steam_root" "$DD_ADDED_GAMES" & else - BL_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so \ - BL_STEAM_SHUTDOWN="droiddeck-steam-x64 --exec -shutdown" \ - droiddeck-steam-games watch "$steam_root" "$BL_ADDED_GAMES" & + DD_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so \ + DD_STEAM_SHUTDOWN="droiddeck-steam-x64 --exec -shutdown" \ + droiddeck-steam-games watch "$steam_root" "$DD_ADDED_GAMES" & fi games_watcher=$! fi - echo "== steam args: ${_bl_ui[*]} ${_bl_cdp[*]} ${_bl_lang[*]} -clientbeta $steam_channel -no-cef-sandbox -cef-ozone-platform=x11 ${_bl_cef[*]} $*$([ "$steam_x64" = 1 ] && echo ' (x86-64 client under FEX)')" + echo "== steam args: ${_dd_ui[*]} ${_dd_cdp[*]} ${_dd_lang[*]} -clientbeta $steam_channel -no-cef-sandbox -cef-ozone-platform=x11 ${_dd_cef[*]} $*$([ "$steam_x64" = 1 ] && echo ' (x86-64 client under FEX)')" steam_updates=0 steam_installs=0 steam_update_stamp=$(stat -c '%n %Y %s' "$steam_root"/package/*.installed 2>/dev/null) - rm -f "$HOME/.bl-stop-requested" "$STEAMOS_STEAM_SHUTDOWN_SENTINEL" "$STEAMOS_STEAM_REBOOT_SENTINEL" + rm -f "$HOME/.dd-stop-requested" "$STEAMOS_STEAM_SHUTDOWN_SENTINEL" "$STEAMOS_STEAM_REBOOT_SENTINEL" steam_other_game_running() { local line value n open - open=$(cat "$BL_LAUNCH_DIR/epic-open" 2>/dev/null) - case $open in ?|*[!0-9]*) open=${BL_EPIC_APP_ID:-$open} ;; esac + open=$(cat "$DD_LAUNCH_DIR/epic-open" 2>/dev/null) + case $open in ?|*[!0-9]*) open=${DD_EPIC_APP_ID:-$open} ;; esac line=$(xprop -root GAMESCOPE_FOCUSABLE_APPS 2>/dev/null) || return 1 case $line in *=*) value=${line#*= } ;; *) return 1 ;; esac for n in ${value//,/ }; do @@ -1673,19 +1676,19 @@ case $mode in return 1 } steam_restart_for() { - if [ "$(cat "$HOME/.bl-restarted-for" 2>/dev/null)" = "$1" ]; then + if [ "$(cat "$HOME/.dd-restarted-for" 2>/dev/null)" = "$1" ]; then echo "== steam: $2, but Steam was already restarted for it; launching it anyway" return 1 fi - printf '%s\n' "$1" > "$HOME/.bl-restarted-for" + printf '%s\n' "$1" > "$HOME/.dd-restarted-for" echo "== steam: $2; restarting Steam to launch it" - printf '%s\n' "$1" > "$HOME/.bl-restart-game" + printf '%s\n' "$1" > "$HOME/.dd-restart-game" "${steam_client[@]:-$steam_root/steamrtarm64/steam}" -shutdown >/dev/null 2>&1 } steam_launch_game() { local state=0 tries /usr/local/bin/droiddeck-agent --steam-shortcut-state "$1" 6 >/dev/null 2>&1 || state=$? - [ "$state" -eq 0 ] && rm -f "$HOME/.bl-restarted-for" + [ "$state" -eq 0 ] && rm -f "$HOME/.dd-restarted-for" if [ "$state" -eq 4 ]; then if steam_other_game_running; then echo "== steam: the client lost shortcut $1, but a game is running; launching it anyway" @@ -1713,27 +1716,27 @@ case $mode in ran=$(pgrep -a -f 'SteamLaunch AppId=[0-9]' 2>/dev/null | sed -n 's/.* SteamLaunch AppId=\([0-9]*\).*/\1/p') if [ -n "$ran" ]; then for n in $ran; do - [ "$n" -ge 2147483648 ] && _bl_ran[$n]=1 + [ "$n" -ge 2147483648 ] && _dd_ran[$n]=1 done - _bl_exited= + _dd_exited= return fi - [ "${#_bl_ran[@]}" -gt 0 ] || return 0 - if [ -z "$_bl_exited" ]; then - _bl_exited=1 + [ "${#_dd_ran[@]}" -gt 0 ] || return 0 + if [ -z "$_dd_exited" ]; then + _dd_exited=1 return fi - _bl_exited= - for n in "${!_bl_ran[@]}"; do + _dd_exited= + for n in "${!_dd_ran[@]}"; do state=0 /usr/local/bin/droiddeck-agent --steam-shortcut-state "$(printf '%u' $(((n << 32) | 0x02000000)))" 3 >/dev/null 2>&1 || state=$? [ "$state" -eq 4 ] && lost="$lost $n" done - _bl_ran=() + _dd_ran=() [ -n "$lost" ] || return 0 pgrep -f 'SteamLaunch AppId=[0-9]' >/dev/null 2>&1 && return 0 echo "== steam: the client dropped shortcut(s)$lost when they exited; restarting Steam so it lists them again" - : > "$HOME/.bl-restart-lost" + : > "$HOME/.dd-restart-lost" "${steam_client[@]:-$steam_root/steamrtarm64/steam}" -shutdown >/dev/null 2>&1 } steam_bring_forward() { @@ -1760,8 +1763,8 @@ case $mode in done } requests= - if [ -n "${BL_LAUNCH_DIR:-}" ] && [ -d "$BL_LAUNCH_DIR" ]; then - rm -f "$BL_LAUNCH_DIR/steam-stop" "$BL_LAUNCH_DIR/steam-game" "$BL_LAUNCH_DIR/steam-game.tmp" + if [ -n "${DD_LAUNCH_DIR:-}" ] && [ -d "$DD_LAUNCH_DIR" ]; then + rm -f "$DD_LAUNCH_DIR/steam-stop" "$DD_LAUNCH_DIR/steam-game" "$DD_LAUNCH_DIR/steam-game.tmp" requests=1 fi ( @@ -1771,14 +1774,14 @@ case $mode in lossless_job= lossless_left=0 lossless_owned=$HOME/.config/droiddeck/lossless-owned - lossless_asked=$HOME/.bl-lossless-asked + lossless_asked=$HOME/.dd-lossless-asked rm -f "$lossless_asked" - [ "${BL_LOSSLESS_OWNED:-0}" != 1 ] && lossless_left=60 - declare -A _bl_pinned=() - declare -A _bl_ran=() - _bl_exited= - compat_stamp=$HOME/.bl-compat-beat - seed_stamp=$HOME/.bl-seed-beat + [ "${DD_LOSSLESS_OWNED:-0}" != 1 ] && lossless_left=60 + declare -A _dd_pinned=() + declare -A _dd_ran=() + _dd_exited= + compat_stamp=$HOME/.dd-compat-beat + seed_stamp=$HOME/.dd-seed-beat rm -f "$compat_stamp" "$seed_stamp" changed_since() { local d @@ -1807,8 +1810,8 @@ case $mode in done return 1 } - compat_pending=$HOME/.bl-compat-pending - compat_restarted=$HOME/.bl-compat-restarted + compat_pending=$HOME/.dd-compat-pending + compat_restarted=$HOME/.dd-compat-restarted rm -f "$compat_pending" : > "$compat_restarted" compat_restarts=0 @@ -1829,16 +1832,16 @@ case $mode in } while :; do if [ -n "$requests" ]; then - if [ -e "$BL_LAUNCH_DIR/steam-stop" ]; then - rm -f "$BL_LAUNCH_DIR/steam-stop" - : > "$HOME/.bl-stop-requested" + if [ -e "$DD_LAUNCH_DIR/steam-stop" ]; then + rm -f "$DD_LAUNCH_DIR/steam-stop" + : > "$HOME/.dd-stop-requested" echo "== steam: the app asked for a clean exit" "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true exit 0 fi - if [ -f "$BL_LAUNCH_DIR/steam-uninstall" ]; then - uninstall_id=$(cat "$BL_LAUNCH_DIR/steam-uninstall" 2>/dev/null) - rm -f "$BL_LAUNCH_DIR/steam-uninstall" + if [ -f "$DD_LAUNCH_DIR/steam-uninstall" ]; then + uninstall_id=$(cat "$DD_LAUNCH_DIR/steam-uninstall" 2>/dev/null) + rm -f "$DD_LAUNCH_DIR/steam-uninstall" case $uninstall_id in ''|0*|*[!0-9]*|???????????*) echo "== steam: ignored invalid uninstall request" ;; *) @@ -1847,9 +1850,9 @@ case $mode in ;; esac fi - if [ -f "$BL_LAUNCH_DIR/steam-game" ]; then - game_id=$(cat "$BL_LAUNCH_DIR/steam-game" 2>/dev/null) - rm -f "$BL_LAUNCH_DIR/steam-game" + if [ -f "$DD_LAUNCH_DIR/steam-game" ]; then + game_id=$(cat "$DD_LAUNCH_DIR/steam-game" 2>/dev/null) + rm -f "$DD_LAUNCH_DIR/steam-game" case $game_id in ''|0*|*[!0-9]*) echo "== steam: ignored invalid game launch request" ;; *) @@ -1874,16 +1877,16 @@ case $mode in [ "$((tick % 10))" -eq 0 ] || continue beat=$((beat + 1)) steam_check_exits - if [ "$beat" -le 720 ] && [ -n "${BL_CLIENT_CPUS:-}" ]; then + if [ "$beat" -le 720 ] && [ -n "${DD_CLIENT_CPUS:-}" ]; then for _d in /proc/[0-9]*; do { IFS= read -r -d '' _c && { IFS= read -r -d '' _c1 || _c1=; }; } < "$_d/cmdline" 2>/dev/null || continue case $_c in FEX|*/FEX|FEXInterpreter|*/FEXInterpreter) _c=$_c1 ;; esac case $_c in *steamwebhelper*|*steamrtarm64/steam|*steamrt64/steam|*gamescope*) ;; *) continue ;; esac _t=("$_d"/task/*) _p=${_d#/proc/} - [ "${_bl_pinned[$_p]:-}" = "${#_t[@]}" ] && client_single_core_matches "$BL_CLIENT_CPUS" "${_t[@]}" && continue - taskset -a -cp "$BL_CLIENT_CPUS" "$_p" >/dev/null 2>&1 || true - _bl_pinned[$_p]=${#_t[@]} + [ "${_dd_pinned[$_p]:-}" = "${#_t[@]}" ] && client_single_core_matches "$DD_CLIENT_CPUS" "${_t[@]}" && continue + taskset -a -cp "$DD_CLIENT_CPUS" "$_p" >/dev/null 2>&1 || true + _dd_pinned[$_p]=${#_t[@]} done fi if [ "$beat" -le 720 ] && [ "$((beat % 3))" -eq 0 ] && { [ -z "$library_job" ] || ! kill -0 "$library_job" 2>/dev/null; }; then @@ -1898,8 +1901,8 @@ case $mode in [ -z "$seed" ] || droiddeck-seed-redists "$steam_root" >/dev/null 2>&1 || true if [ -n "$compat" ]; then if [ "$steam_x64" = 1 ]; then - [ -z "${_bl_x64_tool:-}" ] || - BL_COMPAT_TOOL=$_bl_x64_tool steam-compatibility "$steam_root" --x64 --live >/dev/null 2>&1 || true + [ -z "${_dd_x64_tool:-}" ] || + DD_COMPAT_TOOL=$_dd_x64_tool steam-compatibility "$steam_root" --x64 --live >/dev/null 2>&1 || true droiddeck-steam-x64 --map-direct --live >/dev/null 2>&1 || true else steam-compatibility "$steam_root" >/dev/null 2>&1 || true @@ -1910,17 +1913,17 @@ case $mode in fi fi if [ "$((beat % 3))" -eq 0 ] && [ -s "$compat_pending" ] && [ "$compat_restarts" -lt 3 ] && compat_settled; then - _bl_new=$(sort -u "$compat_pending" | grep -vxF -f "$compat_restarted" || true) + _dd_new=$(sort -u "$compat_pending" | grep -vxF -f "$compat_restarted" || true) rm -f "$compat_pending" - if [ -n "$_bl_new" ]; then + if [ -n "$_dd_new" ]; then compat_restarts=$((compat_restarts + 1)) - printf '%s\n' $_bl_new >> "$compat_restarted" + printf '%s\n' $_dd_new >> "$compat_restarted" if [ "$steam_x64" = 1 ]; then - step "newly installed title(s) $(echo $_bl_new) set to an ARM64 Proton (Windows builds) or DroidDeck direct (Linux builds): restarting the Steam client once so it takes effect" + step "newly installed title(s) $(echo $_dd_new) set to an ARM64 Proton (Windows builds) or DroidDeck direct (Linux builds): restarting the Steam client once so it takes effect" else - step "newly installed title(s) $(echo $_bl_new) set to the ARM64 Proton: restarting the Steam client once so it takes effect" + step "newly installed title(s) $(echo $_dd_new) set to the ARM64 Proton: restarting the Steam client once so it takes effect" fi - : > "$HOME/.bl-restart-once" + : > "$HOME/.dd-restart-once" "${steam_client[@]}" -shutdown >/dev/null 2>&1 || true fi fi @@ -1930,7 +1933,7 @@ case $mode in lossless_left=0 elif ! pgrep -x wineserver >/dev/null 2>&1; then ( - if [ "$steam_x64" = 1 ]; then export BL_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so; fi + if [ "$steam_x64" = 1 ]; then export DD_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so; fi answer=$(droiddeck-steam-games probe "$steam_root" 993090 2>/dev/null) || exit 0 case $answer in *'"993090": true'*) mkdir -p "${lossless_owned%/*}" && : > "$lossless_owned" && echo "== Lossless Scaling: owned" ;; @@ -1944,65 +1947,65 @@ case $mode in done ) & stop_watcher=$! - if [ "${BL_VENUS:-0}" = 1 ] && [ -x /usr/local/bin/droiddeck-glprobe ] && [ "${GALLIUM_DRIVER:-}" = zink ]; then + if [ "${DD_VENUS:-0}" = 1 ] && [ -x /usr/local/bin/droiddeck-glprobe ] && [ "${GALLIUM_DRIVER:-}" = zink ]; then LIBGL_DEBUG=verbose MESA_LOG_LEVEL=debug timeout 20 /usr/local/bin/droiddeck-glprobe 2>&1 | grep -v drirc | head -60 | sed 's/^/== glprobe: /' if [ "${PIPESTATUS[0]}" = 1 ]; then VK_LOADER_DEBUG=error,warn timeout 20 /usr/local/bin/droiddeck-glprobe 2>&1 | grep -v drirc | head -40 | sed 's/^/== glprobe (loader): /' DROIDDECK_MALI_COMPAT_TRACE=1 MESA_DEBUG=1 MESA_LOG_LEVEL=debug LIBGL_DEBUG=verbose ZINK_DEBUG=mem VN_DEBUG=init,result,log_ctx_info \ - timeout 30 /usr/local/bin/droiddeck-glprobe > "${BL_DEBUG_DIR:-/tmp}/glprobe-trace.txt" 2>&1 - grep -v drirc "${BL_DEBUG_DIR:-/tmp}/glprobe-trace.txt" | head -120 | sed 's/^/== glprobe (trace): /' - echo "== glprobe (trace): last pre-device query before Zink gave up: $(grep 'droiddeck-mali-compat: trace:' "${BL_DEBUG_DIR:-/tmp}/glprobe-trace.txt" | grep -v 'trace: extensions:' | tail -1)" + timeout 30 /usr/local/bin/droiddeck-glprobe > "${DD_DEBUG_DIR:-/tmp}/glprobe-trace.txt" 2>&1 + grep -v drirc "${DD_DEBUG_DIR:-/tmp}/glprobe-trace.txt" | head -120 | sed 's/^/== glprobe (trace): /' + echo "== glprobe (trace): last pre-device query before Zink gave up: $(grep 'droiddeck-mali-compat: trace:' "${DD_DEBUG_DIR:-/tmp}/glprobe-trace.txt" | grep -v 'trace: extensions:' | tail -1)" command -v vulkaninfo >/dev/null 2>&1 && DROIDDECK_MALI_COMPAT_TRACE=1 timeout 20 vulkaninfo --summary 2>&1 | head -40 | sed 's/^/== glprobe (vulkaninfo): /' - bl_gl_ok= - for bl_variant in "ZINK_DEBUG=" "ZINK_DEBUG= ZINK_DESCRIPTORS=auto" "ZINK_DEBUG= LIBGL_KOPPER_DISABLE=true" "ZINK_DEBUG= DROIDDECK_MALI_COMPAT=0"; do - if env $bl_variant timeout 20 /usr/local/bin/droiddeck-glprobe 2>&1 | grep -v drirc | head -20 | sed "s/^/== glprobe ($bl_variant): /"; [ "${PIPESTATUS[0]}" = 0 ]; then - bl_gl_ok=$bl_variant + dd_gl_ok= + for dd_variant in "ZINK_DEBUG=" "ZINK_DEBUG= ZINK_DESCRIPTORS=auto" "ZINK_DEBUG= LIBGL_KOPPER_DISABLE=true" "ZINK_DEBUG= DROIDDECK_MALI_COMPAT=0"; do + if env $dd_variant timeout 20 /usr/local/bin/droiddeck-glprobe 2>&1 | grep -v drirc | head -20 | sed "s/^/== glprobe ($dd_variant): /"; [ "${PIPESTATUS[0]}" = 0 ]; then + dd_gl_ok=$dd_variant break fi done - if [ -n "$bl_gl_ok" ] && [ "$bl_gl_ok" != "ZINK_DEBUG= DROIDDECK_MALI_COMPAT=0" ]; then - for bl_kv in $bl_gl_ok; do - case $bl_kv in *=) unset "${bl_kv%=}" ;; *) export "$bl_kv" ;; esac + if [ -n "$dd_gl_ok" ] && [ "$dd_gl_ok" != "ZINK_DEBUG= DROIDDECK_MALI_COMPAT=0" ]; then + for dd_kv in $dd_gl_ok; do + case $dd_kv in *=) unset "${dd_kv%=}" ;; *) export "$dd_kv" ;; esac done - echo "== venus: GL through Zink starts with: $bl_gl_ok (the Steam client gets that)" + echo "== venus: GL through Zink starts with: $dd_gl_ok (the Steam client gets that)" else - [ -n "$bl_gl_ok" ] && echo "== venus: Zink starts only without the Mali compatibility layer (then without nullDescriptor); not used" + [ -n "$dd_gl_ok" ] && echo "== venus: Zink starts only without the Mali compatibility layer (then without nullDescriptor); not used" export GALLIUM_DRIVER=llvmpipe LIBGL_ALWAYS_SOFTWARE=1 unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 echo "== venus: GL through Zink did not start (see glprobe above); the Steam client's GL uses llvmpipe (software)" fi - unset bl_gl_ok bl_variant bl_kv + unset dd_gl_ok dd_variant dd_kv fi fi - rm -f "$HOME/.bl-restart-game" "$HOME/.bl-restarted-for" + rm -f "$HOME/.dd-restart-game" "$HOME/.dd-restarted-for" while :; do - rm -f "$HOME/.bl-restart-once" "$HOME/.bl-restart-lost" + rm -f "$HOME/.dd-restart-once" "$HOME/.dd-restart-lost" if [ -f "$steam_beta" ] && [ "$(cat "$steam_beta" 2>/dev/null)" != "$steam_channel" ]; then echo "== steam: client branch on disk was '$(cat "$steam_beta" 2>/dev/null)', set to '$steam_channel' to match -clientbeta" echo "$steam_channel" > "$steam_beta" fi - if [ -z "${_bl_counted:-}" ] && [ -z "${BL_DESKTOP:-}" ]; then + if [ -z "${_dd_counted:-}" ] && [ -z "${DD_DESKTOP:-}" ]; then echo start >> "$steam_root/package/droiddeck-unconfirmed" - _bl_counted=1 + _dd_counted=1 fi - if [ -n "${BL_STEAM_LANGUAGE:-}" ]; then + if [ -n "${DD_STEAM_LANGUAGE:-}" ]; then if [ "$steam_x64" = 1 ]; then - droiddeck-steam-language "${BL_X64_HOME:-$HOME/.droiddeck-x64}" "$BL_STEAM_LANGUAGE" || true + droiddeck-steam-language "${DD_X64_HOME:-$HOME/.droiddeck-x64}" "$DD_STEAM_LANGUAGE" || true else - droiddeck-steam-language "$HOME" "$BL_STEAM_LANGUAGE" || true + droiddeck-steam-language "$HOME" "$DD_STEAM_LANGUAGE" || true fi fi - step "starting the Steam client${BL_STEAM_UI:+ ($BL_STEAM_UI UI)}" + step "starting the Steam client${DD_STEAM_UI:+ ($DD_STEAM_UI UI)}" desktop_ui_pid= - if [ "${BL_STEAM_UI:-}" = desktop ]; then + if [ "${DD_STEAM_UI:-}" = desktop ]; then /usr/local/bin/droiddeck-steam-desktop-ui & desktop_ui_pid=$! fi steam_started=$SECONDS - PATH="$bl_steam_path" \ - BL_STEAM_WEBHELPER="$steam_root/steamrtarm64/steamwebhelper" \ - "${steam_client[@]}" "${_bl_ui[@]}" "${_bl_cdp[@]}" "${_bl_lang[@]}" -clientbeta "$steam_channel" \ - -no-cef-sandbox -cef-ozone-platform=x11 "${_bl_cef[@]}" "$@" + PATH="$dd_steam_path" \ + DD_STEAM_WEBHELPER="$steam_root/steamrtarm64/steamwebhelper" \ + "${steam_client[@]}" "${_dd_ui[@]}" "${_dd_cdp[@]}" "${_dd_lang[@]}" -clientbeta "$steam_channel" \ + -no-cef-sandbox -cef-ozone-platform=x11 "${_dd_cef[@]}" "$@" rc=$? steam_ran=$((SECONDS - steam_started)) if [ -n "$desktop_ui_pid" ]; then @@ -2017,20 +2020,20 @@ case $mode in if [ -f "$HOME/.config/droiddeck/fex-wanted" ] && [ -x /usr/local/bin/droiddeck-fex ]; then /usr/local/bin/droiddeck-fex status >/dev/null 2>&1 || true fi - if [ -n "${BL_ADDED_GAMES:-}" ] && [ -f "$BL_ADDED_GAMES" ]; then + if [ -n "${DD_ADDED_GAMES:-}" ] && [ -f "$DD_ADDED_GAMES" ]; then if [ "$steam_x64" = 0 ]; then - droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true - elif [ -n "${_bl_x64_tool:-}" ]; then - BL_COMPAT_TOOL=$_bl_x64_tool droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true + droiddeck-steam-shortcuts "$steam_root" "$DD_ADDED_GAMES" || true + elif [ -n "${_dd_x64_tool:-}" ]; then + DD_COMPAT_TOOL=$_dd_x64_tool droiddeck-steam-shortcuts "$steam_root" "$DD_ADDED_GAMES" || true fi fi if [ "$steam_x64" = 1 ]; then - [ -z "${_bl_x64_tool:-}" ] || - BL_COMPAT_TOOL=$_bl_x64_tool steam-compatibility "$steam_root" --x64 >/dev/null 2>&1 || true + [ -z "${_dd_x64_tool:-}" ] || + DD_COMPAT_TOOL=$_dd_x64_tool steam-compatibility "$steam_root" --x64 >/dev/null 2>&1 || true droiddeck-steam-x64 --map-direct || true fi - if [ -f "$HOME/.bl-stop-requested" ]; then - rm -f "$HOME/.bl-stop-requested" "$HOME/.bl-restart-once" + if [ -f "$HOME/.dd-stop-requested" ]; then + rm -f "$HOME/.dd-stop-requested" "$HOME/.dd-restart-once" break fi if [ -e "$STEAMOS_STEAM_SHUTDOWN_SENTINEL" ]; then @@ -2045,32 +2048,32 @@ case $mode in set -- continue fi - if [ -s "$HOME/.bl-restart-game" ]; then - _bl_again=$(cat "$HOME/.bl-restart-game" 2>/dev/null) - rm -f "$HOME/.bl-restart-game" - case $_bl_again in + if [ -s "$HOME/.dd-restart-game" ]; then + _dd_again=$(cat "$HOME/.dd-restart-game" 2>/dev/null) + rm -f "$HOME/.dd-restart-game" + case $_dd_again in ''|0*|*[!0-9]*) ;; *) - echo "== steam: starting the client again to launch $_bl_again" + echo "== steam: starting the client again to launch $_dd_again" set -- - steam_hold_launch "$_bl_again" & + steam_hold_launch "$_dd_again" & continue ;; esac fi - if [ -f "$HOME/.bl-restart-lost" ]; then - rm -f "$HOME/.bl-restart-lost" + if [ -f "$HOME/.dd-restart-lost" ]; then + rm -f "$HOME/.dd-restart-lost" echo "== steam: starting the client again so it lists every shortcut" set -- continue fi - if [ -f "$HOME/.bl-restart-once" ]; then + if [ -f "$HOME/.dd-restart-once" ]; then echo "== steam: restarting once so the new compatibility layer is in the client's lists" set -- continue fi - if [ "$steam_x64" = 1 ] && [ "$rc" -eq 132 ] && [ -z "${_bl_x64_sigill:-}" ]; then - _bl_x64_sigill=1 + if [ "$steam_x64" = 1 ] && [ "$rc" -eq 132 ] && [ -z "${_dd_x64_sigill:-}" ]; then + _dd_x64_sigill=1 echo "== steam: the x86-64 client stopped on an illegal instruction after it updated itself; starting it again once" set -- continue @@ -2090,14 +2093,14 @@ case $mode in kill "$games_watcher" 2>/dev/null || true wait "$games_watcher" 2>/dev/null || true fi - if [ -n "${BL_DESKTOP:-}" ]; then + if [ -n "${DD_DESKTOP:-}" ]; then if [ -n "${decky_supervisor:-}" ]; then kill "$decky_supervisor" 2>/dev/null || true wait "$decky_supervisor" 2>/dev/null || true echo "== Decky: session supervisor stopped" fi - _bl_jobs=$(jobs -p) - [ -n "$_bl_jobs" ] && kill $_bl_jobs 2>/dev/null + _dd_jobs=$(jobs -p) + [ -n "$_dd_jobs" ] && kill $_dd_jobs 2>/dev/null echo "== steam: the client on the desktop has exited" else if [ -n "${decky_supervisor:-}" ]; then @@ -2105,12 +2108,12 @@ case $mode in wait "$decky_supervisor" 2>/dev/null || true echo "== Decky: session supervisor stopped" fi - _bl_jobs=$(jobs -p) - [ -n "$_bl_jobs" ] && kill $_bl_jobs 2>/dev/null + _dd_jobs=$(jobs -p) + [ -n "$_dd_jobs" ] && kill $_dd_jobs 2>/dev/null reap_orphans fi - if [ -n "${BL_STEAM_EXIT_FILE:-}" ]; then - printf '%s\n' "$rc" > "$BL_STEAM_EXIT_FILE" + if [ -n "${DD_STEAM_EXIT_FILE:-}" ]; then + printf '%s\n' "$rc" > "$DD_STEAM_EXIT_FILE" fi exit "$rc" ;; diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index e96ce1c553..b39682bc29 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -1315,7 +1315,7 @@ def main(): files_only = sys.argv[1:2] == ["--files-only"] steam_root = sys.argv[2 if files_only else 1] try: - port = int(os.environ.get("BL_CDP_PORT", "")) + port = int(os.environ.get("DD_CDP_PORT", "")) except ValueError: say("no devtools port for this session; the client's mapping is kept through config.vdf") return 0 @@ -1339,7 +1339,7 @@ def main(): watcher = Watcher([COMPAT["state_path"]("request.json"), COMPAT["state_path"]("games.json"), os.path.join(steam_root, "appcache", "appinfo.vdf")] + [os.path.join(lib, "steamapps", "libraryfolders.vdf") for lib in (steam_root, COMPAT["LIBRARY"] + "-sd")]) - steamos = os.environ.get("BL_STEAMDECK") == "1" and os.environ.get("BL_STEAM_UI") != "desktop" + steamos = os.environ.get("DD_STEAMDECK") == "1" and os.environ.get("DD_STEAM_UI") != "desktop" helper = Helper(steam_root, port, steamos) failures = 0 last = None diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui index 88d60dde6a..37fefbafaa 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui @@ -21,9 +21,9 @@ def select_desktop(evaluate, timeout=90): if __name__ == '__main__': - base = os.environ.get('BL_LAUNCH_DIR') + base = os.environ.get('DD_LAUNCH_DIR') if not base: - raise SystemExit('BL_LAUNCH_DIR is not set') + raise SystemExit('DD_LAUNCH_DIR is not set') agent = runpy.run_path('/usr/local/bin/droiddeck-agent') selected = select_desktop(lambda expression: agent['cdp_eval']( Path(base) / 'agent', expression, timeout=2)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index e8e2ff4e61..c618cadf35 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -134,7 +134,7 @@ def method(obj, slot, result, *args): def probe(steam_root, ids): - library = C.CDLL(os.environ.get("BL_STEAMCLIENT") or str(Path(steam_root) / "steamrtarm64/steamclient.so")) + library = C.CDLL(os.environ.get("DD_STEAMCLIENT") or str(Path(steam_root) / "steamrtarm64/steamclient.so")) library.CreateInterface.argtypes = [C.c_char_p, C.c_void_p] library.CreateInterface.restype = C.c_void_p client = library.CreateInterface(b"SteamClient020", None) @@ -184,8 +184,8 @@ def downloads_idle(steam_root): def request_restart(steam_root): - Path(os.environ.get("HOME", "/root"), ".bl-restart-once").touch() - command = shlex.split(os.environ.get("BL_STEAM_SHUTDOWN", "")) or [str(Path(steam_root) / "steamrtarm64/steam"), "-shutdown"] + Path(os.environ.get("HOME", "/root"), ".dd-restart-once").touch() + command = shlex.split(os.environ.get("DD_STEAM_SHUTDOWN", "")) or [str(Path(steam_root) / "steamrtarm64/steam"), "-shutdown"] subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=30) @@ -231,7 +231,7 @@ def remember_tried(steam_root, account, appids): def watch(steam_root, listing): games = [game for game in read_json(listing, []) if not store_game(game) and not game.get("native")] - if os.environ.get("BL_STEAM_OFFLINE") == "1" or not games: + if os.environ.get("DD_STEAM_OFFLINE") == "1" or not games: return candidates, sources = {}, {} next_lookup = 0 @@ -259,7 +259,7 @@ def watch(steam_root, listing): elif candidates and (key != probed or now >= next_probe): probed, next_probe = key, now + 300 try: - probe_env = dict(os.environ, HOME=os.environ["BL_STEAM_IPC_HOME"]) if os.environ.get("BL_STEAM_IPC_HOME") else None + probe_env = dict(os.environ, HOME=os.environ["DD_STEAM_IPC_HOME"]) if os.environ.get("DD_STEAM_IPC_HOME") else None result = subprocess.run([sys.executable, __file__, "probe", steam_root, *map(str, sorted(set(candidates.values())))], capture_output=True, text=True, timeout=15, env=probe_env) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index f3098fd3ea..c58790f87a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -6,7 +6,7 @@ stable_channel=steamdeck_stable steam_root=${XDG_DATA_HOME:-$HOME/.local/share}/Steam channel_state=$steam_root/package/droiddeck-channel pinned=1 -wanted=${BL_STEAM_CHANNEL:-$(cat "$HOME/.config/droiddeck/steam-channel" 2>/dev/null || true)} +wanted=${DD_STEAM_CHANNEL:-$(cat "$HOME/.config/droiddeck/steam-channel" 2>/dev/null || true)} case $wanted in stable|"$stable_channel") steam_channel=$stable_channel ;; beta|"$beta_channel") steam_channel=$beta_channel ;; @@ -24,7 +24,7 @@ manifest=steam_client_${steam_channel}_linuxarm64 stamp=$steam_root/package/droiddeck-installed legacy_stamp=$steam_root/package/bannerlator-installed unconfirmed=$steam_root/package/droiddeck-unconfirmed -repair_request=$HOME/.bl-steam-repair +repair_request=$HOME/.dd-steam-repair parts=$steam_root/package/droiddeck-download if [ -f "$legacy_stamp" ] && [ ! -f "$stamp" ]; then mv -f "$legacy_stamp" "$stamp" || true @@ -85,7 +85,7 @@ size_of() { echo $((n)) } limits=(--connect-timeout 30 --speed-limit 4096 --speed-time 60) -read -r -a delays <<< "${BL_STEAM_RETRY_DELAYS:-5 10 20 30 30}" +read -r -a delays <<< "${DD_STEAM_RETRY_DELAYS:-5 10 20 30 30}" step() { echo "== STEP $(date -u +%H:%M:%S) $*"; } progress() { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index 346b32d7f2..62b7eb15d3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -11,13 +11,13 @@ case $target in *) url=steam://rungameid/$target ;; esac -if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then +if [ "$ui" = desktop ] && [ "${DD_DESKTOP:-}" = 1 ]; then case ",${MESA_VK_WSI_DEBUG:-}," in *,sw,*) ;; *) export MESA_VK_WSI_DEBUG=${MESA_VK_WSI_DEBUG:+$MESA_VK_WSI_DEBUG,}sw ;; esac - if [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ]; then - client_home=${BL_X64_HOME:-${HOME:-/root}/.droiddeck-x64} + if [ "${DD_STEAM_CLIENT_ARCH:-}" = x86_64 ]; then + client_home=${DD_X64_HOME:-${HOME:-/root}/.droiddeck-x64} client=(/usr/local/bin/droiddeck-steam-x64 --exec) else steam_root=${XDG_DATA_HOME:-${HOME:-/root}/.local/share}/Steam @@ -25,7 +25,7 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then client_home=$HOME client=("$steam_root/steamrtarm64/steam") fi - if [ "${BL_BOTTOM_DESKTOP:-}" = 1 ]; then + if [ "${DD_BOTTOM_DESKTOP:-}" = 1 ]; then pid=$(cat "$client_home/.steam/steam.pid" 2>/dev/null || true) if [ -p "$client_home/.steam/steam.pipe" ] && [[ "$pid" =~ ^[0-9]+$ ]] && kill -0 "$pid" 2>/dev/null; then # The top screen's client takes the request, so games open there. @@ -48,13 +48,13 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then exit 69 fi [ "$url" = steam://exit ] && exit 0 - export BL_INSIDE=1 BL_STEAM_UI=desktop + export DD_INSIDE=1 DD_STEAM_UI=desktop exec /usr/local/bin/droiddeck-session steam "${url:-steam://open/library}" fi -dir=${BL_LAUNCH_DIR:-} +dir=${DD_LAUNCH_DIR:-} if [ -z "$dir" ] || [ ! -d "$dir" ]; then - echo "droiddeck-steam-launch: not inside a DroidDeck session (BL_LAUNCH_DIR unset)" >&2 + echo "droiddeck-steam-launch: not inside a DroidDeck session (DD_LAUNCH_DIR unset)" >&2 exit 69 fi printf 'ui=%s\nurl=%s\n' "$ui" "$url" > "$dir/steam-launch.tmp" && mv -f "$dir/steam-launch.tmp" "$dir/steam-launch" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library index 2aeac02bb3..cac12173dc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library @@ -6,7 +6,7 @@ import runpy import sys BIN_DIR = os.path.dirname(os.path.abspath(__file__)) -LIBRARIES = (("/mnt/droiddeck-sd", os.environ.get("BL_LIBRARY_LABEL", "SD Card")),) +LIBRARIES = (("/mnt/droiddeck-sd", os.environ.get("DD_LIBRARY_LABEL", "SD Card")),) MAIN_LABEL = "Internal Storage" @@ -219,7 +219,7 @@ ADDED_DIR = "/mnt/droiddeck-lib/" def wanted(): - listing = os.environ.get("BL_STEAM_LIBRARIES") + listing = os.environ.get("DD_STEAM_LIBRARIES") if not listing: return None try: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim index 6ba870b14e..da8e2c48c4 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim @@ -1,6 +1,6 @@ #!/bin/bash set -u -if [ "${BL_DESKTOP:-}" = 1 ]; then +if [ "${DD_DESKTOP:-}" = 1 ]; then url= ui=desktop for arg in "$@"; do @@ -12,5 +12,5 @@ if [ "${BL_DESKTOP:-}" = 1 ]; then done exec /usr/local/bin/droiddeck-steam-launch "$ui" ${url:+"$url"} fi -[ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ] && exec /usr/local/bin/droiddeck-steam-x64 --exec "$@" +[ "${DD_STEAM_CLIENT_ARCH:-}" = x86_64 ] && exec /usr/local/bin/droiddeck-steam-x64 --exec "$@" exec "${HOME:-/root}/.local/share/Steam/steamrtarm64/steam" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 5e37501b35..4cb3301d41 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -345,7 +345,7 @@ def main(): cfg = os.path.join(steam_root, "config", "config.vdf") if os.path.isfile(cfg) and (ours or routes): tools = os.path.join(steam_root, "compatibilitytools.d") - x64_tool = os.environ.get("BL_COMPAT_TOOL") + x64_tool = os.environ.get("DD_COMPAT_TOOL") own = {} if x64_tool: protect = {compat.first_key(os.path.join(tools, e, "compatibilitytool.vdf"), ["compatibilitytools", "compat_tools"]) or e: e diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-taskset b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-taskset index 8973fc7f51..163183fc81 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-taskset +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-taskset @@ -4,7 +4,7 @@ # before starting the browser when Android denies sched_setaffinity. set -u if [ "$#" -ge 2 ] && [[ "$1" =~ ^(0[xX])?[0-9a-fA-F]+$ ]] && - [ -n "${BL_STEAM_WEBHELPER:-}" ] && [ "$2" -ef "$BL_STEAM_WEBHELPER" ]; then + [ -n "${DD_STEAM_WEBHELPER:-}" ] && [ "$2" -ef "$DD_STEAM_WEBHELPER" ]; then mask=$1 shift # Pin this wrapper before exec; never retry a helper that has already run. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index 0aeb0e594c..2c77626a1c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -7,7 +7,7 @@ X64_CHANNEL=steamdeck_publicbeta MANIFEST=steam_client_${X64_CHANNEL}_steamrt64 REAL_HOME=${HOME:-/root} -X64_HOME=${BL_X64_HOME:-$REAL_HOME/.droiddeck-x64} +X64_HOME=${DD_X64_HOME:-$REAL_HOME/.droiddeck-x64} ROOTFS=$X64_HOME/rootfs STEAM_X64=$X64_HOME/.local/share/Steam ARM_STEAM=${XDG_DATA_HOME:-$REAL_HOME/.local/share}/Steam @@ -88,7 +88,7 @@ x64_map_direct() { done python3 - "$mode" "$STEAM_X64/config/config.vdf" "$STEAM_X64/appcache/appinfo.vdf" "$X64_HOME/direct-auto.json" \ "$X64_HOME/direct-sniper" "$libraries" "$(x64_default_tool)" \ - "$REAL_HOME/.bl-compat-pending" ${BL_X64_DIRECT_APPS:-550} \ + "$REAL_HOME/.dd-compat-pending" ${DD_X64_DIRECT_APPS:-550} \ <<'PY' || { [ "$mode" = live ] || step "could not map titles to DroidDeck direct"; } # Steam does not swap an installed build when the tool changes: a title installed for Windows stays on Proton. import json, os, re, struct, sys @@ -356,7 +356,7 @@ if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then fi echo "== x86-64 rootfs: $(sed -n 's|.*/download/\([^/]*\)/.*|\1|p' <<<"$ROOTFS_URL") (sha256 ${ROOTFS_SHA256:0:12})" >&2 : > "$ROOTFS/etc/ld.so.preload" -for lib in libblsession libfakeinput; do +for lib in libddsession libfakeinput; do have=0 arches="x86_64 i386"; [ "$lib" = libfakeinput ] && arches=x86_64 rm -f "$ROOTFS/usr/local/lib/i386-linux-gnu/libfakeinput.so" @@ -371,11 +371,11 @@ for lib in libblsession libfakeinput; do elif [ "$have" = 1 ]; then echo "/usr/local/\$LIB/$lib.so" >> "$ROOTFS/etc/ld.so.preload" else step "warning: no x86 build of $lib (/usr/local/lib/droiddeck-fex/x86_64/$lib.so)"; fi done -rm -f "$ROOTFS/usr/local/lib/libblsession-x86_64.so" "$ROOTFS/usr/local/lib/libfakeinput-x86_64.so" +rm -f "$ROOTFS/usr/local/lib/libddsession-x86_64.so" "$ROOTFS/usr/local/lib/libfakeinput-x86_64.so" unconfirmed=$STEAM_X64/package/droiddeck-unconfirmed if [ -d "${unconfirmed%/*}" ] && ! grep -qx tracked "$unconfirmed" 2>/dev/null; then echo tracked > "$unconfirmed"; fi x64_repair= -if [ "${BL_X64_REPAIR:-0}" = 1 ]; then +if [ "${DD_X64_REPAIR:-0}" = 1 ]; then x64_repair=requested elif [ -f "$unconfirmed" ] && ! grep -qx repaired "$unconfirmed" && [ "$(grep -cx start "$unconfirmed")" -ge 2 ]; then x64_repair="the client was started $(grep -cx start "$unconfirmed") times without showing anything" @@ -502,7 +502,7 @@ marker=$(cat "${0%/*}/vac-marker" 2>/dev/null) case "$*" in *hl2.sh*|*hl2_linux*|*srcds*) [ -n "$marker" ] && [ -f "$marker" ] && set -- "$@" -condebug ;; esac # game-gpu.env is rewritten whenever the launcher runs; game-gpu.local is the user's and is read after it. gpu=$HOME/game-gpu.env -if [ -f "$gpu" ] && [ "${BL_X64_GAME_SOFTWARE:-0}" != 1 ]; then +if [ -f "$gpu" ] && [ "${DD_X64_GAME_SOFTWARE:-0}" != 1 ]; then . "$gpu" [ -f "$HOME/game-gpu.local" ] && . "$HOME/game-gpu.local" else @@ -580,9 +580,9 @@ VDF x64_sync_login if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then listing_ok=0 - if BL_X64_SHARED=$X64_HOME/shared/arm64 python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then + if DD_X64_SHARED=$X64_HOME/shared/arm64 python3 - "$STEAM_X64" "${DD_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then import json, os, re, sys -keep = {os.path.realpath(sys.argv[1]), os.path.realpath(os.environ["BL_X64_SHARED"])} +keep = {os.path.realpath(sys.argv[1]), os.path.realpath(os.environ["DD_X64_SHARED"])} # Without the session's list nothing is known about the card: leave the folders as they are. if not sys.argv[2]: sys.exit(3) @@ -622,7 +622,7 @@ PY step "could not check the x86-64 client's library folders" fi if [ "$listing_ok" = 1 ]; then - BL_STEAM_LIBRARIES=$BL_X64_STEAM_LIBRARIES droiddeck-steam-library "$STEAM_X64" || + DD_STEAM_LIBRARIES=$DD_X64_STEAM_LIBRARIES droiddeck-steam-library "$STEAM_X64" || step "could not add the card to the x86-64 client's library folders" fi fi @@ -706,11 +706,11 @@ PY } x64_gpu() { - [ "${BL_X64_SOFTWARE:-0}" != 1 ] && [ -d /usr/local/share/fex-emu/GuestThunks ] && [ -d /usr/local/lib/fex-emu/HostThunks ] + [ "${DD_X64_SOFTWARE:-0}" != 1 ] && [ -d /usr/local/share/fex-emu/GuestThunks ] && [ -d /usr/local/lib/fex-emu/HostThunks ] } x64_webhelper_gpu() { - x64_gpu && [ "${BL_X64_CLIENT_SOFTWARE:-0}" != 1 ] && [ "${BL_X64_CEF_GPU:-1}" != 0 ] + x64_gpu && [ "${DD_X64_CLIENT_SOFTWARE:-0}" != 1 ] && [ "${DD_X64_CEF_GPU:-1}" != 0 ] } x64_env() { @@ -729,7 +729,7 @@ if x64_gpu; then done } > "$X64_HOME/game-gpu.env" fi -if x64_gpu && [ "${BL_X64_CLIENT_SOFTWARE:-0}" != 1 ]; then +if x64_gpu && [ "${DD_X64_CLIENT_SOFTWARE:-0}" != 1 ]; then export FEX_THUNKCONFIG=$X64_HOME/thunks.json unset LIBGL_ALWAYS_SOFTWARE LIBGL_DRI3_DISABLE else @@ -737,7 +737,7 @@ unset FEX_THUNKCONFIG $gpu_vars export LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe export LIBGL_DRI3_DISABLE=1 fi -[ "${BL_X64_FP_OFF:-0}" = 1 ] && export PROOT_FP_OFF=1 +[ "${DD_X64_FP_OFF:-0}" = 1 ] && export PROOT_FP_OFF=1 export FEX_TSOENABLED=${FEX_TSOENABLED:-1} FEX_VECTORTSOENABLED=${FEX_VECTORTSOENABLED:-0} \ FEX_MEMCPYSETTSOENABLED=${FEX_MEMCPYSETTSOENABLED:-0} FEX_HALFBARRIERTSOENABLED=${FEX_HALFBARRIERTSOENABLED:-0} \ FEX_X87REDUCEDPRECISION=${FEX_X87REDUCEDPRECISION:-1} FEX_MULTIBLOCK=${FEX_MULTIBLOCK:-1} @@ -750,7 +750,7 @@ export STEAM_RUNTIME=1 [ -d "$X64_HOME/steamrt-shim/bin" ] && export PATH=$X64_HOME/steamrt-shim/bin:$PATH export LD_LIBRARY_PATH=$STEAM_X64/steamrt64:$STEAM_X64/steamrt64/panorama:$X64_HOME/steamrt-libs export STEAM_STEAMRT_RECURSION_GUARD=1 -export BL_WEBHELPER_HIDE_TRACER=1 +export DD_WEBHELPER_HIDE_TRACER=1 } x64_manifest_version() { @@ -760,7 +760,7 @@ x64_manifest_version() { } x64_gpu_probe() { - local fex=${BL_FEX:-/usr/local/bin/FEX} + local fex=${DD_FEX:-/usr/local/bin/FEX} echo "== x86-64 GPU probe (x86 glxinfo and vulkaninfo through FEX):" ( unset LD_LIBRARY_PATH @@ -795,23 +795,23 @@ x64_arm_webhelper_cpu_supported() { x64_exec() { x64_env cd "$STEAM_X64" - if [ "${BL_X64_X86_WEBHELPER:-0}" != 1 ] && [ -x /usr/local/bin/droiddeck-x64-arm-webhelper ] && + if [ "${DD_X64_X86_WEBHELPER:-0}" != 1 ] && [ -x /usr/local/bin/droiddeck-x64-arm-webhelper ] && [ -x "$ARM_STEAM/steamrtarm64/steamwebhelper" ] && x64_arm_webhelper_cpu_supported; then local chan x86_build arm_build chan=$(cat "$STEAM_X64/package/beta" 2>/dev/null || echo "$X64_CHANNEL") x86_build=$(awk -F'"' '$2 == "version" { print $4; exit }' "$STEAM_X64/package/steam_client_${chan}_steamrt64.manifest" 2>/dev/null || true) arm_build=$(awk -F'"' '$2 == "version" { print $4; exit }' "$ARM_STEAM/package/steam_client_${chan}_linuxarm64.manifest" 2>/dev/null || true) if [ -n "$x86_build" ] && [ "$x86_build" = "$arm_build" ]; then - export BL_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-arm-webhelper + export DD_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-arm-webhelper else echo "== x86-64 client build ${x86_build:-?}, arm64 web helper's ${arm_build:-?}: keeping the x86 web helper" >&2 fi fi - if [ -z "${BL_X64_ARM_WEBHELPER:-}" ] && x64_webhelper_gpu; then - export BL_WEBHELPER_ARGS="--ignore-gpu-blocklist --use-gl=angle --use-angle=gl --ozone-platform=x11" - [ -x /usr/local/bin/droiddeck-x64-webhelper ] && export BL_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-webhelper - elif [ -z "${BL_X64_ARM_WEBHELPER:-}" ]; then - export BL_WEBHELPER_ARGS=stock + if [ -z "${DD_X64_ARM_WEBHELPER:-}" ] && x64_webhelper_gpu; then + export DD_WEBHELPER_ARGS="--ignore-gpu-blocklist --use-gl=angle --use-angle=gl --ozone-platform=x11" + [ -x /usr/local/bin/droiddeck-x64-webhelper ] && export DD_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-webhelper + elif [ -z "${DD_X64_ARM_WEBHELPER:-}" ]; then + export DD_WEBHELPER_ARGS=stock local a args=() soft=0 for a in "$@"; do case $a in @@ -827,7 +827,7 @@ x64_exec() { grep --line-buffered -oE 'Downloading update \([0-9,]+ of [0-9,]+ KB\)|^[[:space:]]*(\[[^]]+\][[:space:]]*)*(Extracting package|Installing update)\.\.\.[[:space:]]*$' | sed -u 's/,//g' >&2 ) & echo "== x86-64 client: steamrt64 $(x64_manifest_version steamrt64) (the client may update itself)" >&2 x64_webhelper_gpu && { x64_gpu_watch >&2 & } - exec "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" + exec "${DD_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" } x64_share() { @@ -969,8 +969,8 @@ if pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1; then fi x64_prepare step "FEX, rootfs and client ready" -if [ -n "${BL_FEXSERVER_LOG:-}" ]; then - FEX_ROOTFS=$ROOTFS "$(dirname "${BL_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$BL_FEXSERVER_LOG" 2>&1 & +if [ -n "${DD_FEXSERVER_LOG:-}" ]; then + FEX_ROOTFS=$ROOTFS "$(dirname "${DD_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$DD_FEXSERVER_LOG" 2>&1 & sleep 1 fi x64_bus= x64_nm= x64_pin= @@ -1017,11 +1017,11 @@ if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then { [ -e "$f" ] || [ -L "$f" ]; } && rm -f "$f" done fi -if [ -n "${BL_CLIENT_CPUS:-}" ] && command -v taskset >/dev/null 2>&1; then +if [ -n "${DD_CLIENT_CPUS:-}" ] && command -v taskset >/dev/null 2>&1; then ( while sleep 5; do for pid in $(ps -A -o PID,ARGS | awk '($2 ~ /^(.*\/)?FEX(Interpreter)?$/) && ($3 ~ /steamrt64\/steam$/ || $3 ~ /steamwebhelper$/) {print $1} $2 ~ /steamrtarm64\/steamwebhelper$/ {print $1}'); do - taskset -a -p -c "$BL_CLIENT_CPUS" "$pid" >/dev/null 2>&1 + taskset -a -p -c "$DD_CLIENT_CPUS" "$pid" >/dev/null 2>&1 done done ) & @@ -1031,7 +1031,7 @@ for attempt in 1 2 3 4 5; do echo "$X64_CHANNEL" > "$STEAM_X64/package/beta" step "starting the x86-64 SteamRT3 client under FEX (attempt $attempt): $*" rc=0 - if [ "${BL_X64_X86_WEBHELPER:-0}" != 1 ] || x64_webhelper_gpu; then cef=(-cef-force-gpu -cef-ozone-platform=x11 -cef-use-gl=angle -cef-use-angle=vulkan); else cef=(-cef-disable-gpu); fi + if [ "${DD_X64_X86_WEBHELPER:-0}" != 1 ] || x64_webhelper_gpu; then cef=(-cef-force-gpu -cef-ozone-platform=x11 -cef-use-gl=angle -cef-use-angle=vulkan); else cef=(-cef-disable-gpu); fi ( x64_exec -clientbeta "$X64_CHANNEL" -no-cef-sandbox "${cef[@]}" "$@" ) >>"$LOG" 2>&1 || rc=$? step "client exited rc=$rc" [ "$rc" = 42 ] || break diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 98b533c79d..1a5bc27114 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -193,7 +193,7 @@ def server_socket(pfx): st = os.stat(pfx) except OSError: return None - base = os.environ.get("BL_WINE_SERVER_BASE") or "/tmp/.wine-%d" % os.getuid() + base = os.environ.get("DD_WINE_SERVER_BASE") or "/tmp/.wine-%d" % os.getuid() return Path(base) / ("server-%x-%x" % (st.st_dev, st.st_ino)) / "socket" @@ -265,7 +265,7 @@ BATTLENET_LAUNCH = re.compile(r'(?i)^--exec=\s*"?launch\s+([A-Za-z0-9_]{1,16})"? def battlenet(argv, env=os.environ): - if env.get("BL_BATTLENET"): + if env.get("DD_BATTLENET"): return None exe, code = False, None for raw in argv: @@ -286,7 +286,7 @@ def cloud_on(sidecar): def exited(argv, code=0): found = find_store_game(argv) - launch_dir = os.environ.get("BL_LAUNCH_DIR", "") + launch_dir = os.environ.get("DD_LAUNCH_DIR", "") if found is not None and launch_dir and str(found[1].get("store")) == "rockstar": ask(Path(launch_dir) / "stores", {"op": "rockstar-exited", "store": "rockstar", "id": str(found[1].get("id"))}, timeout=1.0) compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH") @@ -825,7 +825,7 @@ def provision_galaxy(compat_data, proton, timeout=90): ':existing', 'echo ready>"%s"' % answer, 'exit /b 0'] bat.write_bytes(("\r\n".join(lines) + "\r\n").encode()) env = os.environ.copy() - env["BL_COMET_BOOTSTRAP"] = "1" + env["DD_COMET_BOOTSTRAP"] = "1" run = subprocess.run([proton, "run", "cmd.exe", "/d", "/c", windows_path(str(bat))], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) if run.returncode or not result.is_file() or result.read_text().strip() != "ready": @@ -846,7 +846,7 @@ def prepare_gog(sidecar, compat_data, launch_dir): if not isinstance(answer, dict) or not answer.get("ready"): log("gog achievements: " + (str(answer.get("reason", "unavailable")) if isinstance(answer, dict) else "timeout")) return False - state = provision_galaxy(compat_data, os.environ.get("BL_STORE_PROTON", "")) + state = provision_galaxy(compat_data, os.environ.get("DD_STORE_PROTON", "")) log("gog achievements prefix: " + state) return state == "ready" @@ -1432,7 +1432,7 @@ def write_licenses(compat_data, licenses): def prepare_ea(folder, sidecar, compat_data, launch_dir): game = str(sidecar.get("id")) - proton = os.environ.get("BL_STORE_PROTON", "") + proton = os.environ.get("DD_STORE_PROTON", "") made = create_prefix(compat_data, proton) ready = made in ("present", "created") or (compat_data and (Path(compat_data) / "pfx/user.reg").is_file()) stub = install_origin_stub(compat_data) if ready else "no-prefix" @@ -1600,22 +1600,22 @@ def main(argv): return RAN_FAILED compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") prefix_id = os.path.basename(compat_data) if compat_data else "" - launch_dir = os.environ.get("BL_LAUNCH_DIR", "") + launch_dir = os.environ.get("DD_LAUNCH_DIR", "") if launch_dir and cloud_on(sidecar): - made = create_prefix(compat_data, os.environ.get("BL_STORE_PROTON", "")) + made = create_prefix(compat_data, os.environ.get("DD_STORE_PROTON", "")) if made != "present": log("cloud %s %s prefix=%s" % (store, game, made)) if store == "gog": prepare_gog(sidecar, compat_data, launch_dir) - log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) - log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) + log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("DD_STORE_PROTON", ""))) + log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("DD_STORE_PROTON", ""))) if store == "rockstar": if game not in ROCKSTAR_TITLES and not rockstar_sdk(folder, sidecar): if compat_data: (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) return STORE_GAME try: - state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")) + state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("DD_STORE_PROTON", "")) except (OSError, ValueError, subprocess.TimeoutExpired): state = "preparation-failed" log("rockstar %s: %s" % (game, state)) @@ -1624,7 +1624,7 @@ def main(argv): return STORE_GAME if state == "ready" else RAN_FAILED if store == "ubisoft": try: - log("ubisoft %s: %s" % (game, prepare_ubisoft(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")))) + log("ubisoft %s: %s" % (game, prepare_ubisoft(folder, sidecar, compat_data, launch_dir, os.environ.get("DD_STORE_PROTON", "")))) except OSError as e: try: (folder / UBISOFT_LAUNCH).unlink() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton index 1f82a06915..5098f84654 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton @@ -9,7 +9,7 @@ for v in $(compgen -e); do case $v in FEX_*) unset "$v" ;; esac done unset LD_LIBRARY_PATH LD_PRELOAD STEAM_RUNTIME_STEAMRT STEAM_STEAMRT_RECURSION_GUARD \ - LIBGL_ALWAYS_SOFTWARE LIBGL_DRI3_DISABLE GALLIUM_DRIVER BL_WEBHELPER_HIDE_TRACER PROOT_FP_OFF + LIBGL_ALWAYS_SOFTWARE LIBGL_DRI3_DISABLE GALLIUM_DRIVER DD_WEBHELPER_HIDE_TRACER PROOT_FP_OFF game_display=${DISPLAY:-} if [ -f "$x64_home/arm-session.env" ]; then @@ -18,7 +18,7 @@ else export HOME=/root fi [ -z "$game_display" ] || export DISPLAY=$game_display -export BL_X64_STEAM_ROOT=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-} +export DD_X64_STEAM_ROOT=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-} export STEAM_COMPAT_CLIENT_INSTALL_PATH=$HOME/.local/share/Steam arm_overlay=$STEAM_COMPAT_CLIENT_INSTALL_PATH/steamrtarm64/gameoverlayrenderer.so if [ "$overlay" = 1 ] && [ -f "$arm_overlay" ]; then diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper index bd89a4ddb1..d60d35c876 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper @@ -5,7 +5,7 @@ arm=/root/.local/share/Steam/steamrtarm64 for v in $(compgen -e); do case $v in FEX_*) unset "$v" ;; esac done -unset LD_PRELOAD LIBGL_ALWAYS_SOFTWARE LIBGL_DRI3_DISABLE BL_WEBHELPER_HIDE_TRACER BL_X64_ARM_WEBHELPER +unset LD_PRELOAD LIBGL_ALWAYS_SOFTWARE LIBGL_DRI3_DISABLE DD_WEBHELPER_HIDE_TRACER DD_X64_ARM_WEBHELPER if [ -f "$x64_home/arm-session.env" ]; then eval "$(grep -E '^declare -x (VK_ICD_FILENAMES|VK_DRIVER_FILES|GALLIUM_DRIVER|MESA_LOADER_DRIVER_OVERRIDE|LIBGL_KOPPER_DRI2|TU_DEBUG|ZINK_DEBUG|ZINK_DESCRIPTORS|MESA_NO_ERROR|MESA_DISK_CACHE_DATABASE)=' "$x64_home/arm-session.env")" fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper index 8c830ab9b1..62915bf645 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper @@ -1,6 +1,6 @@ #!/bin/bash -unset BL_X64_ARM_WEBHELPER -export BL_WEBHELPER_ARGS=stock DISABLE_GAMESCOPE_WSI=1 vk_xwayland_wait_ready=true LIBGL_KOPPER_DISABLE=true +unset DD_X64_ARM_WEBHELPER +export DD_WEBHELPER_ARGS=stock DISABLE_GAMESCOPE_WSI=1 vk_xwayland_wait_ready=true LIBGL_KOPPER_DISABLE=true if [ -x ./steamwebhelper ]; then exec ./steamwebhelper "$@" fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index 6e27070bcd..2b97aa3c9e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -385,7 +385,7 @@ def launch(command, env): for name in DLLS: if not (RUNTIME / 'windows' / name).is_file(): raise RuntimeError('Xbox Windows runtime is missing; update the Linux runtime') - launch_dir = env.get('BL_LAUNCH_DIR') + launch_dir = env.get('DD_LAUNCH_DIR') if not launch_dir: raise RuntimeError('No Xbox account channel; start the game from DroidDeck') reply = store['ask'](Path(launch_dir) / 'stores', {'op': 'xbox-prepare', 'id': sidecar['id']}, timeout=190) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 52a589d21d..4ad361e4e3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -59,73 +59,73 @@ TOOL_MANIFEST_VDF = """"manifest" """ % LAUNCHER -BL_STORE_SETUP = """ -bl_store_launch() { +DD_STORE_SETUP = """ +dd_store_launch() { [ "${verb:-}" = waitforexitandrun ] || return 0 if [ -x /usr/local/bin/droiddeck-open-url ]; then mkdir -p /tmp/droiddeck-browser ln -sfn /usr/local/bin/droiddeck-open-url /tmp/droiddeck-browser/xdg-open - [ -n "${BL_LAUNCH_DIR:-}" ] && printf '%s -' "$BL_LAUNCH_DIR" > /tmp/droiddeck-browser/launch-dir + [ -n "${DD_LAUNCH_DIR:-}" ] && printf '%s +' "$DD_LAUNCH_DIR" > /tmp/droiddeck-browser/launch-dir PATH="/tmp/droiddeck-browser:$PATH"; export PATH fi - if [ "${BL_DEBUG_BROWSER:-}" = 1 ]; then + if [ "${DD_DEBUG_BROWSER:-}" = 1 ]; then WINEDEBUG="${WINEDEBUG:+$WINEDEBUG,}+shell,+winebrowser"; export WINEDEBUG fi [ -x /usr/local/bin/droiddeck-store-launch ] || return 0 /usr/local/bin/droiddeck-store-launch "$@" rc=$? - [ $rc -eq 10 ] && BL_STORE_EXIT=1 + [ $rc -eq 10 ] && DD_STORE_EXIT=1 [ $rc -eq 11 ] && exit 0 [ $rc -eq 12 ] && exit 1 return 0 } -bl_run() { +dd_run() { if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "${verb:-}"; then set -- /usr/local/bin/droiddeck-steamvr-game "$@" fi - if [ -n "${BL_STORE_EXIT:-}" ]; then + if [ -n "${DD_STORE_EXIT:-}" ]; then trap : INT TERM HUP "$@" rc=$? - /usr/local/bin/droiddeck-store-launch --exited --code "$rc" "${BL_STORE_ARGS[@]}" || true + /usr/local/bin/droiddeck-store-launch --exited --code "$rc" "${DD_STORE_ARGS[@]}" || true exit $rc fi exec "$@" } """ -BL_DESKTOP_GPU_SETUP = """ -bl_desktop_gpu() { +DD_DESKTOP_GPU_SETUP = """ +dd_desktop_gpu() { local name saved gpu=/usr/local/bin/droiddeck-gpu local names=(LD_PRELOAD LD_LIBRARY_PATH ENABLE_VK_LAYER_VALVE_steam_overlay_1 ENABLE_VK_LAYER_VALVE_steam_fossilize_1) - if [ -n "${BL_DESKTOP_GPU_CHILD:-}" ]; then + if [ -n "${DD_DESKTOP_GPU_CHILD:-}" ]; then for name in "${names[@]}"; do - saved=BL_GPU_SAVED_$name + saved=DD_GPU_SAVED_$name [ -n "${!saved+x}" ] || continue export "$name=${!saved}" unset "$saved" done return 0 fi - [ "${BL_DESKTOP:-}" = 1 ] && [ "${verb:-}" = waitforexitandrun ] && [ -x "$gpu" ] || return 0 - local choice=${BL_DESKTOP_GPU:-on} + [ "${DD_DESKTOP:-}" = 1 ] && [ "${verb:-}" = waitforexitandrun ] && [ -x "$gpu" ] || return 0 + local choice=${DD_DESKTOP_GPU:-on} case "${choice,,}" in off | 0 | no | false) return 0 ;; esac case " $* " in *iscriptevaluator*) return 0 ;; esac local clear=() for name in "${names[@]}"; do [ -n "${!name+x}" ] || continue - export "BL_GPU_SAVED_$name=${!name}" + export "DD_GPU_SAVED_$name=${!name}" clear+=(-u "$name") done echo "droiddeck-gpu: the desktop starts this game on the GPU" >&2 exec env "${clear[@]}" "$gpu" "$0" "$verb" "$@" } -bl_desktop_gpu "$@" +dd_desktop_gpu "$@" """ -BL_COMPONENTS_SETUP = """ -bl_components() { +DD_COMPONENTS_SETUP = """ +dd_components() { base=$1 cm_dir="${HOME:-/root}/.local/share/droiddeck-components" cm_list="$cm_dir/desired.tsv" @@ -207,7 +207,7 @@ bl_components() { continue fi mkdir -p "$(dirname "$f")" - cp -f "$src" "$f.bl-new" && mv -f "$f.bl-new" "$f" || continue + cp -f "$src" "$f.dd-new" && mv -f "$f.dd-new" "$f" || continue case "$rel" in *.so) chmod 755 "$f" ;; *) chmod 644 "$f" ;; esac cm_fixed=$((cm_fixed + 1)) done @@ -219,17 +219,17 @@ bl_components() { } """ -BL_GAME_CPUS_SETUP = """ -bl_game_cpus() { - [ -n "${BL_GAME_CPUS:-}" ] || return 0 +DD_GAME_CPUS_SETUP = """ +dd_game_cpus() { + [ -n "${DD_GAME_CPUS:-}" ] || return 0 command -v taskset >/dev/null 2>&1 || return 0 - BL_TASKSET="taskset -c $BL_GAME_CPUS" - echo "droiddeck-proton: game cores $BL_GAME_CPUS" >&2 + DD_TASKSET="taskset -c $DD_GAME_CPUS" + echo "droiddeck-proton: game cores $DD_GAME_CPUS" >&2 } """ -BL_LIBPATH_SETUP = """ -bl_libpath() { +DD_LIBPATH_SETUP = """ +dd_libpath() { export PROTON_USE_PIPEWIRE=${PROTON_USE_PIPEWIRE:-0} [ -n "${LD_LIBRARY_PATH:-}" ] || return 0 local kept= dir old_ifs=$IFS @@ -245,9 +245,9 @@ bl_libpath() { } """ -BL_IDTECH3_SETUP = """ -bl_idtech3() { - BL_EXTRA_ARGS=() +DD_IDTECH3_SETUP = """ +dd_idtech3() { + DD_EXTRA_ARGS=() case "${SteamAppId:-${STEAM_COMPAT_APP_ID:-}}" in 2200|2350|9010|6020) ;; *) return 0 ;; @@ -257,15 +257,15 @@ bl_idtech3() { echo "droiddeck-proton: Quake-engine title; its launch options set the video mode, left as they are" >&2 return 0 ;; esac - w=${BL_WIDTH:-1280} - h=${BL_HEIGHT:-720} - BL_EXTRA_ARGS=(+set r_fullscreen 0 +set r_mode -1 +set r_customwidth "$w" +set r_customheight "$h") + w=${DD_WIDTH:-1280} + h=${DD_HEIGHT:-720} + DD_EXTRA_ARGS=(+set r_fullscreen 0 +set r_mode -1 +set r_customwidth "$w" +set r_customheight "$h") echo "droiddeck-proton: Quake-engine title: windowed at ${w}x${h}" >&2 } """ -BL_VACDIAG_SETUP = """ -bl_vacdiag() { +DD_VACDIAG_SETUP = """ +dd_vacdiag() { [ -f /root/.droiddeck-vac-diagnostics ] || return 0 [ "${verb:-}" = waitforexitandrun ] || return 0 local exe= a dir added=no app=${SteamAppId:-${STEAM_COMPAT_APP_ID:-0}} @@ -276,7 +276,7 @@ bl_vacdiag() { if ls "$dir"/*/gameinfo.txt >/dev/null 2>&1 || ls "$dir"/../../*/gameinfo.gi >/dev/null 2>&1; then case " $* " in *" -condebug "*) echo "droiddeck-proton: vac-diag: app $app already has -condebug" >&2 ;; - *) BL_EXTRA_ARGS+=(-condebug); added=yes + *) DD_EXTRA_ARGS+=(-condebug); added=yes echo "droiddeck-proton: vac-diag: app $app is a Source title; launched with -condebug" >&2 ;; esac else @@ -290,7 +290,7 @@ bl_vacdiag() { } """ -BL_DRIVER_QUERY_SKIP = """ +DD_DRIVER_QUERY_SKIP = """ case "$verb:${1##*/}:${STEAM_COMPAT_DATA_PATH%/}" in run:d3ddriverquery64.exe:*/compatdata/0 | run:d3ddriverquery.exe:*/compatdata/0) echo "droiddeck-proton: Steam's D3D driver query is not run (it fails here and would start Wine in compatdata/0)" >&2 @@ -298,23 +298,23 @@ case "$verb:${1##*/}:${STEAM_COMPAT_DATA_PATH%/}" in esac """ -BL_DIRECTAUDIO_SETUP = """ -bl_is_steam_installscript_target() { +DD_DIRECTAUDIO_SETUP = """ +dd_is_steam_installscript_target() { local target=${1:-} local steam_root=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-${XDG_DATA_HOME:-$HOME/.local/share}/Steam} local helper="$steam_root/legacycompat/iscriptevaluator.exe" [ -f "$helper" ] && [[ -n "$target" && "$target" -ef "$helper" ]] } -bl_directaudio() { +dd_directaudio() { case "${verb:-}" in run|waitforexitandrun|runinprefix) ;; *) return 0 ;; esac base=$1 - [ -n "${BL_DIRECTAUDIO:-}" ] || return 0 - [ -d "$BL_DIRECTAUDIO" ] || return 0 - if bl_is_steam_installscript_target "${2:-}"; then + [ -n "${DD_DIRECTAUDIO:-}" ] || return 0 + [ -d "$DD_DIRECTAUDIO" ] || return 0 + if dd_is_steam_installscript_target "${2:-}"; then echo "droiddeck-proton: DirectAudio skipped for Steam's install-script evaluator" >&2 return 0 fi @@ -338,7 +338,7 @@ bl_directaudio() { return 0 fi if grep -aq PsCreateSystemThread "$winepulse"; then set=linux-wine11-systhread; else set=linux-wine11; fi - da="$BL_DIRECTAUDIO/$set" + da="$DD_DIRECTAUDIO/$set" if [ ! -d "$da/lib/wine" ]; then echo "droiddeck-proton: DirectAudio left off - no driver set for the $set interface is staged" >&2 return 0 @@ -359,16 +359,16 @@ bl_directaudio() { dir="$pfx/drive_c/windows/${pair%%:*}" src="$da/lib/wine/${pair#*:}/winedirectaudio.drv" if [ -d "$dir" ] && [ -f "$src" ] && [ "$(readlink "$dir/winedirectaudio.drv" 2>/dev/null)" != "$src" ]; then - ln -sfn "$src" "$dir/winedirectaudio.drv.bl-new" && mv -f "$dir/winedirectaudio.drv.bl-new" "$dir/winedirectaudio.drv" + ln -sfn "$src" "$dir/winedirectaudio.drv.dd-new" && mv -f "$dir/winedirectaudio.drv.dd-new" "$dir/winedirectaudio.drv" fi done key='[Software\\\\Wine\\\\Drivers]' if [ "$(readlink "$pfx/drive_c/windows/system32/winedirectaudio.drv" 2>/dev/null)" != "$da/lib/wine/aarch64-windows/winedirectaudio.drv" ]; then echo "droiddeck-proton: DirectAudio could not be placed in the prefix; Proton's own audio stays" >&2 - elif ! BL_KEY="$key" awk 'index($0, "[") == 1 { inside = index($0, ENVIRON["BL_KEY"] " ") == 1 } inside && index($0, "\\"Audio\\"=") == 1 { last = $0 } END { exit last != "\\"Audio\\"=\\"directaudio,pulse\\"" }' "$reg" 2>/dev/null; then + elif ! DD_KEY="$key" awk 'index($0, "[") == 1 { inside = index($0, ENVIRON["DD_KEY"] " ") == 1 } inside && index($0, "\\"Audio\\"=") == 1 { last = $0 } END { exit last != "\\"Audio\\"=\\"directaudio,pulse\\"" }' "$reg" 2>/dev/null; then printf '\\n%s %s\\n"Audio"="directaudio,pulse"\\n' "$key" "$(date +%s)" >> "$reg" echo "droiddeck-proton: DirectAudio selected in the prefix" >&2 - srv="${BL_WINE_SERVER_BASE:-/tmp/.wine-$(id -u)}/server-$(printf '%x-%x' $(stat -c '%d %i' "$pfx" 2>/dev/null || echo 0 0))/socket" + srv="${DD_WINE_SERVER_BASE:-/tmp/.wine-$(id -u)}/server-$(printf '%x-%x' $(stat -c '%d %i' "$pfx" 2>/dev/null || echo 0 0))/socket" if [ -S "$srv" ]; then echo "droiddeck-proton: a wineserver is already running for this prefix; DirectAudio may only engage on the next launch" >&2 fi @@ -383,7 +383,7 @@ bl_directaudio() { LAUNCHER_SH = """#!/bin/bash verb=$1; shift steam_root=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-${XDG_DATA_HOME:-$HOME/.local/share}/Steam} -for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libblsession.so; do +for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libddsession.so; do if [ -f "$fake" ]; then case ":${LD_PRELOAD:-}:" in *":$fake:"*) ;; @@ -391,7 +391,7 @@ for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libblsession.so; do esac fi done -audit=/usr/local/lib/libblaudit.so +audit=/usr/local/lib/libddaudit.so if [ -n "${PROOT_FP_KEY:-}" ] && [ -f "$audit" ]; then case ":${LD_AUDIT:-}:" in *":$audit:"*) ;; @@ -416,16 +416,16 @@ for name in %s; do [ -n "$depot" ] && break done if [ -n "$depot" ]; then - bl_components "$depot" - bl_directaudio "$depot" "$@" - bl_game_cpus - bl_idtech3 "$@" - bl_vacdiag "$@" - bl_libpath - BL_STORE_PROTON="$depot/proton"; export BL_STORE_PROTON - bl_store_launch "$@" - BL_STORE_ARGS=("$@") - bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env "$depot/proton" "$verb" "$@" "${BL_EXTRA_ARGS[@]}" + dd_components "$depot" + dd_directaudio "$depot" "$@" + dd_game_cpus + dd_idtech3 "$@" + dd_vacdiag "$@" + dd_libpath + DD_STORE_PROTON="$depot/proton"; export DD_STORE_PROTON + dd_store_launch "$@" + DD_STORE_ARGS=("$@") + dd_run ${DD_TASKSET:-} /usr/local/bin/droiddeck-game-env "$depot/proton" "$verb" "$@" "${DD_EXTRA_ARGS[@]}" fi echo "droiddeck-proton: no ARM64 Proton depot yet - the client downloads one as this tool's dependency; retry the launch once it has" >&2 exit 1 @@ -435,8 +435,8 @@ LAUNCHER_TEMPLATE = LAUNCHER_SH def launcher_sh(sources=SOURCES): return (LAUNCHER_TEMPLATE % " ".join('"%s"' % n for n in sources)).replace( - "verb=$1; shift", "verb=$1; shift\n" + BL_DRIVER_QUERY_SKIP + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP - + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) + "verb=$1; shift", "verb=$1; shift\n" + DD_DRIVER_QUERY_SKIP + DD_DESKTOP_GPU_SETUP + DD_DIRECTAUDIO_SETUP + DD_GAME_CPUS_SETUP + DD_IDTECH3_SETUP + + DD_VACDIAG_SETUP + DD_COMPONENTS_SETUP + DD_LIBPATH_SETUP + DD_STORE_SETUP, 1) LAUNCHER_SH = launcher_sh() @@ -456,7 +456,7 @@ EXTRA_MANIFEST_VDF = """"manifest" EXTRA_WRAPPER_SH = """#!/bin/bash verb=$1; shift here=$(dirname "$0") -for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libblsession.so; do +for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libddsession.so; do if [ -f "$fake" ]; then case ":${LD_PRELOAD:-}:" in *":$fake:"*) ;; @@ -464,31 +464,31 @@ for fake in /usr/local/lib/libfakeinput.so /usr/local/lib/libblsession.so; do esac fi done -audit=/usr/local/lib/libblaudit.so +audit=/usr/local/lib/libddaudit.so if [ -n "${PROOT_FP_KEY:-}" ] && [ -f "$audit" ]; then case ":${LD_AUDIT:-}:" in *":$audit:"*) ;; *) LD_AUDIT="$audit${LD_AUDIT:+:$LD_AUDIT}"; export LD_AUDIT ;; esac fi -bl_components "$here" -bl_directaudio "$here" "$@" -bl_game_cpus -bl_idtech3 "$@" -bl_vacdiag "$@" -bl_libpath -BL_STORE_PROTON="$here/%s"; export BL_STORE_PROTON -bl_store_launch "$@" -BL_STORE_ARGS=("$@") -bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env "$BL_STORE_PROTON" "$verb" "$@" "${BL_EXTRA_ARGS[@]}" +dd_components "$here" +dd_directaudio "$here" "$@" +dd_game_cpus +dd_idtech3 "$@" +dd_vacdiag "$@" +dd_libpath +DD_STORE_PROTON="$here/%s"; export DD_STORE_PROTON +dd_store_launch "$@" +DD_STORE_ARGS=("$@") +dd_run ${DD_TASKSET:-} /usr/local/bin/droiddeck-game-env "$DD_STORE_PROTON" "$verb" "$@" "${DD_EXTRA_ARGS[@]}" """ def extra_wrapper_sh(entry_point): return (EXTRA_WRAPPER_SH % entry_point).replace( 'here=$(dirname "$0")', - 'here=$(dirname "$0")\n' + BL_DRIVER_QUERY_SKIP + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP - + BL_IDTECH3_SETUP + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) + 'here=$(dirname "$0")\n' + DD_DRIVER_QUERY_SKIP + DD_DESKTOP_GPU_SETUP + DD_DIRECTAUDIO_SETUP + DD_GAME_CPUS_SETUP + + DD_IDTECH3_SETUP + DD_VACDIAG_SETUP + DD_COMPONENTS_SETUP + DD_LIBPATH_SETUP + DD_STORE_SETUP, 1) EXTRA_COMPAT_TOOL_VDF = """"compatibilitytools" @@ -533,12 +533,12 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac -""" + BL_DESKTOP_GPU_SETUP + BL_GAME_CPUS_SETUP + """ -bl_game_cpus +""" + DD_DESKTOP_GPU_SETUP + DD_GAME_CPUS_SETUP + """ +dd_game_cpus if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "$verb"; then - exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" + exec /usr/local/bin/droiddeck-steamvr-game ${DD_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" fi -exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" +exec ${DD_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" """ @@ -1701,7 +1701,7 @@ def x64_repoint(steam_root, tool, live=False): write_changed(config, text) print("steam-compatibility: x86-64 client's Proton entries point at %s" % tool) if moved and live: - with open(os.path.join(os.path.expanduser("~"), ".bl-compat-pending"), "a") as f: + with open(os.path.join(os.path.expanduser("~"), ".dd-compat-pending"), "a") as f: f.write("".join("%s\n" % a for a in moved)) print("steam-compatibility: repointed while the client runs: %s" % " ".join(moved)) return moved @@ -1710,7 +1710,7 @@ def x64_repoint(steam_root, tool, live=False): def main(): steam_root = sys.argv[1] if "--x64" in sys.argv[2:]: - x64_repoint(steam_root, os.environ.get("BL_COMPAT_TOOL"), "--live" in sys.argv[2:]) + x64_repoint(steam_root, os.environ.get("DD_COMPAT_TOOL"), "--live" in sys.argv[2:]) return tools = os.path.join(steam_root, "compatibilitytools.d") os.makedirs(tools, exist_ok=True) diff --git a/tools/linuxfs/preload/binfmt.c b/tools/linuxfs/preload/binfmt.c index dbe2977265..94cecdeb86 100644 --- a/tools/linuxfs/preload/binfmt.c +++ b/tools/linuxfs/preload/binfmt.c @@ -19,7 +19,7 @@ typedef int (*spawn_fn)(pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char *const[], char *const[]); __attribute__((visibility("hidden"))) -char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); +char *const *dd_webhelper_argv(const char *path, char *const argv[], char *const envp[]); #if defined(__aarch64__) || defined(BINFMT_TEST) @@ -29,7 +29,7 @@ static int flag(const char *name) { } static int handing_off(void) { - return flag("BL_DESKTOP") || flag("BL_BINFMT"); + return flag("DD_DESKTOP") || flag("DD_BINFMT"); } static int foreign(const char *path, int error) { @@ -105,36 +105,36 @@ static int spawn_handler(pid_t *pid, const char *path, const posix_spawn_file_ac return real(pid, BINFMT_HANDLER, fa, attr, args, envp); } -__attribute__((visibility("hidden"))) void bl_binfmt_before(const char *path, char *const argv[], char *const envp[]) { +__attribute__((visibility("hidden"))) void dd_binfmt_before(const char *path, char *const argv[], char *const envp[]) { if (handing_off() && foreign(path, ENOEXEC)) hand_off(path, argv, envp); } -__attribute__((visibility("hidden"))) int bl_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error) { +__attribute__((visibility("hidden"))) int dd_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error) { if (wanted(path, error)) hand_off(path, argv, envp); errno = error; return -1; } -__attribute__((visibility("hidden"))) void bl_binfmt_before_search(const char *file, char *const argv[], char *const envp[]) { +__attribute__((visibility("hidden"))) void dd_binfmt_before_search(const char *file, char *const argv[], char *const envp[]) { char path[PATH_MAX]; - if (handing_off() && lookup(file, path, sizeof path)) bl_binfmt_before(path, argv, envp); + if (handing_off() && lookup(file, path, sizeof path)) dd_binfmt_before(path, argv, envp); } -__attribute__((visibility("hidden"))) int bl_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error) { +__attribute__((visibility("hidden"))) int dd_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error) { char path[PATH_MAX]; - if (handing_off() && lookup(file, path, sizeof path)) return bl_binfmt_retry(path, argv, envp, error); + if (handing_off() && lookup(file, path, sizeof path)) return dd_binfmt_retry(path, argv, envp, error); errno = error; return -1; } -__attribute__((visibility("hidden"))) int bl_binfmt_runnable(const char *path, int mode) { +__attribute__((visibility("hidden"))) int dd_binfmt_runnable(const char *path, int mode) { if (mode != X_OK || !handing_off()) return 0; int runs = foreign(path, EACCES) != 0; errno = EACCES; return runs; } -__attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, +__attribute__((visibility("hidden"))) int dd_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[], spawn_fn real) { if (handing_off() && foreign(path, ENOEXEC)) return spawn_handler(pid, path, fa, attr, argv, envp, real); @@ -145,54 +145,54 @@ __attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char int execvpe(const char *file, char *const argv[], char *const envp[]) { char resolved[PATH_MAX]; const char *path = lookup(file, resolved, sizeof resolved) ? resolved : file; - char *const *adjusted = bl_webhelper_argv(path, argv, envp); + char *const *adjusted = dd_webhelper_argv(path, argv, envp); static int (*real)(const char *, char *const[], char *const[]); if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execvpe"); - bl_binfmt_before_search(file, (char *const *)adjusted, envp); + dd_binfmt_before_search(file, (char *const *)adjusted, envp); real(file, (char *const *)adjusted, envp); - return bl_binfmt_after_search(file, (char *const *)adjusted, envp, errno); + return dd_binfmt_after_search(file, (char *const *)adjusted, envp, errno); } int posix_spawnp(pid_t *pid, const char *file, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[]) { char path[PATH_MAX]; int found = lookup(file, path, sizeof path); - char *const *adjusted = bl_webhelper_argv(found ? path : file, argv, envp); + char *const *adjusted = dd_webhelper_argv(found ? path : file, argv, envp); static spawn_fn real, spawn; if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawnp"); if (!spawn) spawn = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn"); if (!handing_off() || !found) return real(pid, file, fa, attr, (char *const *)adjusted, envp); - return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, spawn); + return dd_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, spawn); } #else -__attribute__((visibility("hidden"))) int bl_binfmt_runnable(const char *path, int mode) { +__attribute__((visibility("hidden"))) int dd_binfmt_runnable(const char *path, int mode) { (void)path, (void)mode; return 0; } -__attribute__((visibility("hidden"))) void bl_binfmt_before(const char *path, char *const argv[], char *const envp[]) { +__attribute__((visibility("hidden"))) void dd_binfmt_before(const char *path, char *const argv[], char *const envp[]) { (void)path, (void)argv, (void)envp; } -__attribute__((visibility("hidden"))) int bl_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error) { +__attribute__((visibility("hidden"))) int dd_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error) { (void)path, (void)argv, (void)envp; errno = error; return -1; } -__attribute__((visibility("hidden"))) void bl_binfmt_before_search(const char *file, char *const argv[], char *const envp[]) { +__attribute__((visibility("hidden"))) void dd_binfmt_before_search(const char *file, char *const argv[], char *const envp[]) { (void)file, (void)argv, (void)envp; } -__attribute__((visibility("hidden"))) int bl_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error) { +__attribute__((visibility("hidden"))) int dd_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error) { (void)file, (void)argv, (void)envp; errno = error; return -1; } -__attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, +__attribute__((visibility("hidden"))) int dd_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[], spawn_fn real) { return real(pid, path, fa, attr, argv, envp); diff --git a/tools/linuxfs/preload/clockpause.c b/tools/linuxfs/preload/clockpause.c index eed7a401d7..8fe0b7ce77 100644 --- a/tools/linuxfs/preload/clockpause.c +++ b/tools/linuxfs/preload/clockpause.c @@ -14,10 +14,10 @@ #include #include -#if defined(__aarch64__) || defined(BL_CLOCK_ANY_ARCH) +#if defined(__aarch64__) || defined(DD_CLOCK_ANY_ARCH) #ifndef CP_CTL -#define CP_CTL "/tmp/.bl-clock" +#define CP_CTL "/tmp/.dd-clock" #endif #ifndef FUTEX_LOCK_PI2 #define FUTEX_LOCK_PI2 13 @@ -255,7 +255,7 @@ int timerfd_settime(int fd, int flags, const struct itimerspec *value, struct it return cp_tfd_settime(fd, flags, cp_timer(fd, flags, value, &moved), old); } -__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { +__attribute__((visibility("hidden"))) int dd_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { struct timespec moved; struct itimerspec timer; int64_t shift; @@ -302,7 +302,7 @@ __attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const lo #else -__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { +__attribute__((visibility("hidden"))) int dd_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { (void)number; (void)args; (void)real; diff --git a/tools/linuxfs/preload/descriptor.c b/tools/linuxfs/preload/descriptor.c index 681dce999e..686030988c 100644 --- a/tools/linuxfs/preload/descriptor.c +++ b/tools/linuxfs/preload/descriptor.c @@ -14,12 +14,12 @@ #define STORE "/.droiddeck-descriptors" #define ENTRY_MAX (PATH_MAX * 2) -int bl_is_wineserver(void) __attribute__((visibility("hidden"))); +int dd_is_wineserver(void) __attribute__((visibility("hidden"))); static int store_seen; static int kept(const char *name) { - return name != NULL && strcmp(name, DESCRIPTOR) == 0 && bl_is_wineserver(); + return name != NULL && strcmp(name, DESCRIPTOR) == 0 && dd_is_wineserver(); } static int store_root(char *out, size_t size) { @@ -226,7 +226,7 @@ int fremovexattr(int fd, const char *name) { static int tracked(const char *path, char *out, size_t size) { int saved = errno, found; - found = bl_is_wineserver() && store_exists() && resolved(path, out, size) == 0; + found = dd_is_wineserver() && store_exists() && resolved(path, out, size) == 0; errno = saved; return found; } @@ -259,7 +259,7 @@ static void follow(const char *from, const char *to) { } __attribute__((visibility("hidden"))) -int bl_descriptor_unlink(const char *path, int (*real)(const char *)) { +int dd_descriptor_unlink(const char *path, int (*real)(const char *)) { char target[PATH_MAX]; int known = tracked(path, target, sizeof(target)), result = real(path); @@ -268,7 +268,7 @@ int bl_descriptor_unlink(const char *path, int (*real)(const char *)) { } __attribute__((visibility("hidden"))) -int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) { +int dd_descriptor_rmdir(const char *path, int (*real)(const char *)) { char target[PATH_MAX]; int known = tracked(path, target, sizeof(target)), result = real(path); @@ -277,12 +277,12 @@ int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) { } __attribute__((visibility("hidden"))) -int bl_descriptor_remove(const char *path, int (*real)(const char *)) { - return bl_descriptor_rmdir(path, real); +int dd_descriptor_remove(const char *path, int (*real)(const char *)) { + return dd_descriptor_rmdir(path, real); } __attribute__((visibility("hidden"))) -int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) { +int dd_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) { char old[PATH_MAX], new[PATH_MAX]; int known = tracked(from, old, sizeof(old)), result = real(from, to); diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index a94717bd78..e322c6cde3 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -112,7 +112,7 @@ static void after_fork(void) { static int enabled(void) { static int cached = -1; if (cached < 0) { - const char *off = getenv("BL_NO_DIR_CACHE"); + const char *off = getenv("DD_NO_DIR_CACHE"); cached = strcmp(program_invocation_short_name, "steam") == 0 && (strstr(program_invocation_name, "steamrtarm64") != NULL || strstr(program_invocation_name, "steamrt64") != NULL) && !(off && strcmp(off, "1") == 0); @@ -816,9 +816,9 @@ static void end(struct expect *x, int nx) { give(&lock); } -int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, +int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) __attribute__((visibility("hidden"))); -int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, +int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) { struct side s; if (!(flags & O_CREAT) || (dirfd != AT_FDCWD && (path == NULL || path[0] != '/')) || !watching(path) || !split(path, &s)) @@ -860,17 +860,17 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, } ONE_PATH(mkdir, ADDED, IN_CREATE, next_mkdir(path, mode), mode_t mode) -int bl_descriptor_unlink(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); -int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); -int bl_descriptor_remove(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); -int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) +int dd_descriptor_unlink(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int dd_descriptor_rmdir(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int dd_descriptor_remove(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int dd_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) __attribute__((visibility("hidden"))); -static int moved(const char *from, const char *to) { return bl_descriptor_rename(from, to, next_rename); } +static int moved(const char *from, const char *to) { return dd_descriptor_rename(from, to, next_rename); } -ONE_PATH(rmdir, REMOVED, IN_DELETE, bl_descriptor_rmdir(path, next_rmdir)) -ONE_PATH(unlink, REMOVED, IN_DELETE, bl_descriptor_unlink(path, next_unlink)) -ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) +ONE_PATH(rmdir, REMOVED, IN_DELETE, dd_descriptor_rmdir(path, next_rmdir)) +ONE_PATH(unlink, REMOVED, IN_DELETE, dd_descriptor_unlink(path, next_unlink)) +ONE_PATH(remove, REMOVED, IN_DELETE, dd_descriptor_remove(path, next_remove)) #define TWO_PATHS(name, gone, event, call) \ int name(const char *from, const char *to) { \ @@ -900,8 +900,8 @@ ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) return r; \ } -int bl_link_lock(const char *oldpath, const char *newpath, int result) __attribute__((visibility("hidden"))); -static int link_or_lock(const char *from, const char *to) { return bl_link_lock(from, to, next_link(from, to)); } +int dd_link_lock(const char *oldpath, const char *newpath, int result) __attribute__((visibility("hidden"))); +static int link_or_lock(const char *from, const char *to) { return dd_link_lock(from, to, next_link(from, to)); } TWO_PATHS(rename, 1, IN_MOVED_TO, moved) TWO_PATHS(link, 0, IN_CREATE, link_or_lock) @@ -938,8 +938,8 @@ static int listed_absent(const char *dir, const char *name, long long now) { return 0; } -int bl_dircache_absent(const char *path) __attribute__((visibility("hidden"))); -int bl_dircache_absent(const char *path) { +int dd_dircache_absent(const char *path) __attribute__((visibility("hidden"))); +int dd_dircache_absent(const char *path) { struct side s; if (!watching(path) || !split(path, &s)) return 0; for (const char *c = s.name; *c; c++) @@ -957,15 +957,15 @@ int bl_dircache_absent(const char *path) { #else -int bl_dircache_absent(const char *path) __attribute__((visibility("hidden"))); -int bl_dircache_absent(const char *path) { +int dd_dircache_absent(const char *path) __attribute__((visibility("hidden"))); +int dd_dircache_absent(const char *path) { (void)path; return 0; } -int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, +int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) __attribute__((visibility("hidden"))); -int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, +int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) { return real(dirfd, path, flags, mode); } diff --git a/tools/linuxfs/preload/drm.c b/tools/linuxfs/preload/drm.c index 9c40a39294..4a47a3cd76 100644 --- a/tools/linuxfs/preload/drm.c +++ b/tools/linuxfs/preload/drm.c @@ -43,7 +43,7 @@ static int is_kgsl(int fd) { struct stat st; pthread_mutex_lock(&lock); if (kgsl_state == 0) { - const char *standin = getenv("BL_DRM_STANDIN"); + const char *standin = getenv("DD_DRM_STANDIN"); kgsl_state = stat("/dev/kgsl-3d0", &st) == 0 || (standin && *standin && stat(standin, &st) == 0) ? 1 : -1; if (kgsl_state > 0) kgsl_dev = st.st_rdev; } @@ -52,7 +52,7 @@ static int is_kgsl(int fd) { } /* Keep the opt-in separate from GPU detection: manual ICDs must retain native DRM behavior. */ -struct bl_drm_version { +struct dd_drm_version { int major, minor, patch; size_t name_len; char *name; @@ -61,21 +61,21 @@ struct bl_drm_version { size_t desc_len; char *desc; }; -#define BL_DRM_VERSION _IOWR('d', 0x00, struct bl_drm_version) +#define DD_DRM_VERSION _IOWR('d', 0x00, struct dd_drm_version) static int is_powervr(int fd) { - const char *enabled = getenv("BL_POWERVR_DRM_HANDLES"); + const char *enabled = getenv("DD_POWERVR_DRM_HANDLES"); if (!enabled || strcmp(enabled, "1")) return 0; - const char *path = getenv("BL_POWERVR_RENDER_NODE"); + const char *path = getenv("DD_POWERVR_RENDER_NODE"); if (!path || !*path) return 0; struct stat node, candidate; if (stat(path, &node) || fstat(fd, &candidate) || !S_ISCHR(candidate.st_mode) || !S_ISCHR(node.st_mode) || candidate.st_rdev != node.st_rdev) return 0; char name[16] = {0}; - struct bl_drm_version version = {.name_len = sizeof(name) - 1, .name = name}; + struct dd_drm_version version = {.name_len = sizeof(name) - 1, .name = name}; /* Bypass the preload's ioctl dispatcher to avoid recursively entering this hook. */ - return syscall(SYS_ioctl, fd, BL_DRM_VERSION, &version) == 0 && + return syscall(SYS_ioctl, fd, DD_DRM_VERSION, &version) == 0 && version.name_len == 3 && !memcmp(name, "pvr", 3); } @@ -118,7 +118,7 @@ static int same_file_description(int a, int b) { } #endif if (ret < 0) { - const char *standin = getenv("BL_DRM_STANDIN"); + const char *standin = getenv("DD_DRM_STANDIN"); ret = standin && *standin ? same_by_flock(a, b) : 0; } errno = saved_errno; @@ -324,7 +324,7 @@ int drmCloseBufferHandle(int fd, uint32_t handle) { return fn ? fn(fd, handle) : -ENOSYS; } -__attribute__((visibility("hidden"))) int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) { +__attribute__((visibility("hidden"))) int dd_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) { if (request != GEM_CLOSE || !arg) { return 0; } diff --git a/tools/linuxfs/preload/fsync.c b/tools/linuxfs/preload/fsync.c index 7a4529aa94..da60e28f1d 100644 --- a/tools/linuxfs/preload/fsync.c +++ b/tools/linuxfs/preload/fsync.c @@ -98,11 +98,11 @@ static int (*fs_real_shm_unlink)(const char *); static void *(*fs_real_mmap)(void *, size_t, int, int, int, off_t); static void *(*fs_real_mmap64)(void *, size_t, int, int, int, off64_t); static int (*fs_real_munmap)(void *, size_t); -__attribute__((visibility("hidden"))) int bl_noexec_retry(int prot, int flags, int fd); +__attribute__((visibility("hidden"))) int dd_noexec_retry(int prot, int flags, int fd); static int fs_on(void) { if (fs_state < 0) { - const char *e = getenv("BL_FSYNC"); + const char *e = getenv("DD_FSYNC"); fs_state = e && e[0] == '1'; } return fs_state; @@ -511,14 +511,14 @@ static long fs_wake(uint32_t key, int n) { return woken; } -void bl_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); -void bl_fsync_fds_closed(unsigned int first, unsigned int last) { +void dd_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); +void dd_fsync_fds_closed(unsigned int first, unsigned int last) { int fd = __atomic_load_n(&fs_fd, __ATOMIC_ACQUIRE); if (fd >= 0 && (unsigned int)fd >= first && (unsigned int)fd <= last) __atomic_store_n(&fs_fd, -1, __ATOMIC_RELEASE); } -int bl_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); -int bl_fsync_syscall(long number, const long *args, long *ret) { +int dd_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); +int dd_fsync_syscall(long number, const long *args, long *ret) { if (number == SYS_futex_waitv) { if (!fs_on()) return 0; if (!args[0] && !args[1]) { @@ -617,15 +617,15 @@ int shm_unlink(const char *name) { return r; } -int bl_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, +int dd_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, void *(*real)(void *, size_t, int, int, int, off_t), void **out) __attribute__((weak, visibility("hidden"))); void *mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) { void *p; if (!fs_real_mmap) fs_real_mmap = (void *(*)(void *, size_t, int, int, int, off_t))dlsym(RTLD_NEXT, "mmap"); - if (bl_venc_mmap && bl_venc_mmap(addr, len, prot, flags, fd, off, fs_real_mmap, &p)) return p; + if (dd_venc_mmap && dd_venc_mmap(addr, len, prot, flags, fd, off, fs_real_mmap, &p)) return p; p = fs_real_mmap(addr, len, prot, flags, fd, off); - if (p == MAP_FAILED && bl_noexec_retry(prot, flags, fd)) p = fs_real_mmap(addr, len, prot & ~PROT_EXEC, flags, fd, off); + if (p == MAP_FAILED && dd_noexec_retry(prot, flags, fd)) p = fs_real_mmap(addr, len, prot & ~PROT_EXEC, flags, fd, off); if (p != MAP_FAILED && __builtin_expect(fs_fd >= 0, 0)) fs_track(p, len, flags, fd, off); return p; } @@ -633,10 +633,10 @@ void *mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) { void *mmap64(void *addr, size_t len, int prot, int flags, int fd, off64_t off) { void *p; if (!fs_real_mmap64) fs_real_mmap64 = (void *(*)(void *, size_t, int, int, int, off64_t))dlsym(RTLD_NEXT, "mmap64"); - if (bl_venc_mmap && bl_venc_mmap(addr, len, prot, flags, fd, off, (void *(*)(void *, size_t, int, int, int, off_t))fs_real_mmap64, &p)) + if (dd_venc_mmap && dd_venc_mmap(addr, len, prot, flags, fd, off, (void *(*)(void *, size_t, int, int, int, off_t))fs_real_mmap64, &p)) return p; p = fs_real_mmap64(addr, len, prot, flags, fd, off); - if (p == MAP_FAILED && bl_noexec_retry(prot, flags, fd)) p = fs_real_mmap64(addr, len, prot & ~PROT_EXEC, flags, fd, off); + if (p == MAP_FAILED && dd_noexec_retry(prot, flags, fd)) p = fs_real_mmap64(addr, len, prot & ~PROT_EXEC, flags, fd, off); if (p != MAP_FAILED && __builtin_expect(fs_fd >= 0, 0)) fs_track(p, len, flags, fd, off); return p; } diff --git a/tools/linuxfs/preload/inputudev.c b/tools/linuxfs/preload/inputudev.c index eb78ce1efb..d33a0adaac 100644 --- a/tools/linuxfs/preload/inputudev.c +++ b/tools/linuxfs/preload/inputudev.c @@ -168,7 +168,7 @@ static struct pad *pad_for_syslink(const char *path) { static void *next_symbol(const char *name) { return dlsym(RTLD_NEXT, name); } -char *bl_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) +char *dd_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) __attribute__((visibility("hidden"))); static int caller_is_winebus(void *caller) { @@ -178,7 +178,7 @@ static int caller_is_winebus(void *caller) { return strstr(info.dli_fname, "winebus.so") != NULL; } -__attribute__((visibility("hidden"))) int bl_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, +__attribute__((visibility("hidden"))) int dd_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, void *caller, int *rc) { struct ff_effect *effect = arg; @@ -204,7 +204,7 @@ char *realpath(const char *path, char *resolved) { } if (real_realpath == NULL) real_realpath = next_symbol("realpath"); if (real_realpath == NULL) return NULL; - return bl_cached_realpath(path, resolved, real_realpath); + return dd_cached_realpath(path, resolved, real_realpath); } void *udev_device_new_from_syspath(void *udev, const char *syspath) { diff --git a/tools/linuxfs/preload/kgslid.c b/tools/linuxfs/preload/kgslid.c index c909f4618d..6ab0d2fe32 100644 --- a/tools/linuxfs/preload/kgslid.c +++ b/tools/linuxfs/preload/kgslid.c @@ -28,7 +28,7 @@ static const struct { {0x44050A21, 0x44050A31}, }; -void bl_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc) { +void dd_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc) { if (rc != 0 || request != IOCTL_KGSL_DEVICE_GETPROPERTY || arg == NULL) return; struct kgsl_device_getproperty *prop = arg; if (prop->type != KGSL_PROP_DEVICE_INFO || prop->value == NULL diff --git a/tools/linuxfs/preload/kgslpoll.c b/tools/linuxfs/preload/kgslpoll.c index adc6fb28c4..41ea0e34ae 100644 --- a/tools/linuxfs/preload/kgslpoll.c +++ b/tools/linuxfs/preload/kgslpoll.c @@ -69,7 +69,7 @@ static int read_retired(int (*real)(int, unsigned long, void *), int fd, } /* Quest refuses some KGSL ioctls, and Mesa 27 turns a failed timestamp read into VK_ERROR_UNKNOWN. */ -__attribute__((visibility("hidden"))) void bl_kgsl_track(int (*real)(int, unsigned long, void *), +__attribute__((visibility("hidden"))) void dd_kgsl_track(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) { int saved = errno; @@ -113,12 +113,12 @@ static int enabled(void) { const char *off; if (cached >= 0) return cached; - off = getenv("BL_NO_KGSL_POLL_FIX"); + off = getenv("DD_NO_KGSL_POLL_FIX"); cached = !(off != NULL && off[0] == '1'); return cached; } -__attribute__((visibility("hidden"))) int bl_kgsl_poll(int (*real)(int, unsigned long, void *), +__attribute__((visibility("hidden"))) int dd_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) { const struct kgsl_device_waittimestamp_ctxtid *wait = arg; diff --git a/tools/linuxfs/preload/links.c b/tools/linuxfs/preload/links.c index 350990b61d..79293c7d85 100644 --- a/tools/linuxfs/preload/links.c +++ b/tools/linuxfs/preload/links.c @@ -19,7 +19,7 @@ static int lock_name(const char *path) { return n > 2 && strcmp(path + n - 2, "-l") == 0; } -__attribute__((visibility("hidden"))) int bl_link_lock(const char *oldpath, const char *newpath, int result) { +__attribute__((visibility("hidden"))) int dd_link_lock(const char *oldpath, const char *newpath, int result) { static int (*real_symlink)(const char *, const char *); if (result == 0 || !refused(errno)) return result; if (moves_instead()) return renameat2(AT_FDCWD, oldpath, AT_FDCWD, newpath, RENAME_NOREPLACE); @@ -32,7 +32,7 @@ __attribute__((visibility("hidden"))) int bl_link_lock(const char *oldpath, cons int link(const char *oldpath, const char *newpath) { static int (*real_link)(const char *, const char *); if (real_link == NULL) real_link = dlsym(RTLD_NEXT, "link"); - return bl_link_lock(oldpath, newpath, real_link(oldpath, newpath)); + return dd_link_lock(oldpath, newpath, real_link(oldpath, newpath)); } #endif diff --git a/tools/linuxfs/preload/lock.c b/tools/linuxfs/preload/lock.c index 6e36a1ee9c..feb95d72c0 100644 --- a/tools/linuxfs/preload/lock.c +++ b/tools/linuxfs/preload/lock.c @@ -61,8 +61,8 @@ static int is_lock_query(int cmd) { } } -int bl_nl_before_dup(int fd, void **state) __attribute__((visibility("hidden"))); -void bl_nl_after_dup(void *state, int fd) __attribute__((visibility("hidden"))); +int dd_nl_before_dup(int fd, void **state) __attribute__((visibility("hidden"))); +void dd_nl_after_dup(void *state, int fd) __attribute__((visibility("hidden"))); static int fcntl_with(int (**real_fcntl)(int, int, ...), const char *name, int fd, int cmd, void *arg) { int result; @@ -74,9 +74,9 @@ static int fcntl_with(int (**real_fcntl)(int, int, ...), const char *name, int f } void *nl_state = NULL; int duplicate = cmd == F_DUPFD || cmd == F_DUPFD_CLOEXEC; - if (duplicate && bl_nl_before_dup(fd, &nl_state) != 0) return -1; + if (duplicate && dd_nl_before_dup(fd, &nl_state) != 0) return -1; result = (*real_fcntl)(fd, cmd, arg); - if (duplicate) bl_nl_after_dup(nl_state, result); + if (duplicate) dd_nl_after_dup(nl_state, result); if (result >= 0 || !unsupported(errno)) return result; if (is_lock_command(cmd)) return 0; if (is_lock_query(cmd) && arg != NULL) { diff --git a/tools/linuxfs/preload/net.c b/tools/linuxfs/preload/net.c index e45ed9c5c0..f7c9db9406 100644 --- a/tools/linuxfs/preload/net.c +++ b/tools/linuxfs/preload/net.c @@ -20,7 +20,7 @@ static const char *net_dir(void) { static char dir[256]; if (!dir[0]) { - const char *base = getenv("BL_SYSV_DIR"); + const char *base = getenv("DD_SYSV_DIR"); snprintf(dir, sizeof(dir), "%s/net", base && *base ? base : "/dev/shm/wnsysv"); char parent[256]; snprintf(parent, sizeof(parent), "%s", dir); @@ -110,18 +110,18 @@ typedef int (*connect_fn)(int, const struct sockaddr *, socklen_t); typedef int (*accept4_fn)(int, struct sockaddr *, socklen_t *, int); static unsigned guarded_port(void); -__attribute__((visibility("hidden"))) int bl_udevmon_stand_in(int fd); -__attribute__((visibility("hidden"))) int bl_nl_bind(int fd, const struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_udevmon_stand_in(int fd); +__attribute__((visibility("hidden"))) int dd_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_connect(int fd, const struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc); int bind(int fd, const struct sockaddr *addr, socklen_t len) { static bind_fn real; int nl_rc; if (!real) real = (bind_fn)dlsym(RTLD_NEXT, "bind"); - if (bl_nl_bind(fd, addr, len, &nl_rc)) return nl_rc; - if (bl_udevmon_stand_in(fd)) { + if (dd_nl_bind(fd, addr, len, &nl_rc)) return nl_rc; + if (dd_udevmon_stand_in(fd)) { if (addr == NULL || len < sizeof(struct sockaddr_nl) || addr->sa_family != AF_NETLINK) { errno = EINVAL; return -1; @@ -183,7 +183,7 @@ static void bind_before_loopback_connect(int fd, const struct sockaddr *addr, so static unsigned guarded_port(void) { static int port = -1; if (port < 0) { - const char *value = getenv("BL_CDP_GUARD"); + const char *value = getenv("DD_CDP_GUARD"); port = value && *value ? atoi(value) : 0; if (port < 0 || port > 65535) port = 0; } @@ -230,7 +230,7 @@ static int guest_peer(int fd) { int connect(int fd, const struct sockaddr *addr, socklen_t len) { static connect_fn real; int nl_rc; - if (bl_nl_connect(fd, addr, len, &nl_rc)) return nl_rc; + if (dd_nl_connect(fd, addr, len, &nl_rc)) return nl_rc; if (!real) real = (connect_fn)dlsym(RTLD_NEXT, "connect"); bind_before_loopback_connect(fd, addr, len); unsigned peer = loopback_family(addr, len) ? addr_port(addr, len) : 0; @@ -267,13 +267,13 @@ int accept(int fd, struct sockaddr *addr, socklen_t *len) { extern char **environ; typedef int (*spawn_fn)(pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char *const[], char *const[]); -__attribute__((visibility("hidden"))) void bl_binfmt_before(const char *path, char *const argv[], char *const envp[]); -__attribute__((visibility("hidden"))) int bl_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error); -__attribute__((visibility("hidden"))) void bl_binfmt_before_search(const char *file, char *const argv[], char *const envp[]); -__attribute__((visibility("hidden"))) int bl_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error); +__attribute__((visibility("hidden"))) void dd_binfmt_before(const char *path, char *const argv[], char *const envp[]); +__attribute__((visibility("hidden"))) int dd_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error); +__attribute__((visibility("hidden"))) void dd_binfmt_before_search(const char *file, char *const argv[], char *const envp[]); +__attribute__((visibility("hidden"))) int dd_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error); __attribute__((visibility("hidden"))) -char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); -__attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, +char *const *dd_webhelper_argv(const char *path, char *const argv[], char *const envp[]); +__attribute__((visibility("hidden"))) int dd_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[], spawn_fn real); @@ -320,7 +320,7 @@ static int maybe_answer_lsof(const char *path, char *const argv[]) { } static char **web_helper_redirect(const char *path, char *const argv[], const char **launcher) { - const char *want = getenv("BL_X64_ARM_WEBHELPER"); + const char *want = getenv("DD_X64_ARM_WEBHELPER"); if (!want || !*want || !path) return NULL; const char *base = strrchr(path, '/'); if (strcmp(base ? base + 1 : path, "steamwebhelper") != 0) return NULL; @@ -342,7 +342,7 @@ static char **web_helper_redirect(const char *path, char *const argv[], const ch } int execve(const char *path, char *const argv_in[], char *const envp[]) { - char *const *argv = bl_webhelper_argv(path, argv_in, envp); + char *const *argv = dd_webhelper_argv(path, argv_in, envp); static int (*real)(const char *, char *const[], char *const[]); if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execve"); maybe_answer_lsof(path, argv); @@ -352,9 +352,9 @@ int execve(const char *path, char *const argv_in[], char *const envp[]) { real(launcher, redirected, envp); free(redirected); } - bl_binfmt_before(path, argv, envp); + dd_binfmt_before(path, argv, envp); real(path, argv, envp); - return bl_binfmt_retry(path, argv, envp, errno); + return dd_binfmt_retry(path, argv, envp, errno); } static int answer_lsof_via_spawn(const char *path, char *const argv[], pid_t *pid) { @@ -373,17 +373,17 @@ static int answer_lsof_via_spawn(const char *path, char *const argv[], pid_t *pi } int execvp(const char *file, char *const argv_in[]) { - char *const *argv = bl_webhelper_argv(file, argv_in, environ); + char *const *argv = dd_webhelper_argv(file, argv_in, environ); static int (*real)(const char *, char *const[]); if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execvp"); maybe_answer_lsof(file, argv); - bl_binfmt_before_search(file, argv, environ); + dd_binfmt_before_search(file, argv, environ); real(file, argv); - return bl_binfmt_after_search(file, argv, environ, errno); + return dd_binfmt_after_search(file, argv, environ, errno); } int execv(const char *path, char *const argv_in[]) { - char *const *argv = bl_webhelper_argv(path, argv_in, environ); + char *const *argv = dd_webhelper_argv(path, argv_in, environ); static int (*real)(const char *, char *const[]); if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execv"); maybe_answer_lsof(path, argv); @@ -393,9 +393,9 @@ int execv(const char *path, char *const argv_in[]) { real(launcher, redirected); free(redirected); } - bl_binfmt_before(path, argv, environ); + dd_binfmt_before(path, argv, environ); real(path, argv); - return bl_binfmt_retry(path, argv, environ, errno); + return dd_binfmt_retry(path, argv, environ, errno); } int posix_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, @@ -407,6 +407,6 @@ int posix_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t * } static spawn_fn real; if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn"); - char *const *adjusted = bl_webhelper_argv(path, argv, envp); - return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, real); + char *const *adjusted = dd_webhelper_argv(path, argv, envp); + return dd_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, real); } diff --git a/tools/linuxfs/preload/netif.c b/tools/linuxfs/preload/netif.c index aeeeb9eb24..5be0dde22a 100644 --- a/tools/linuxfs/preload/netif.c +++ b/tools/linuxfs/preload/netif.c @@ -411,19 +411,19 @@ static int is_link_query(unsigned long request) { || request == SIOCGIFBRDADDR; } -void bl_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc); +void dd_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc); #include "../../quest/kgsl_compat.h" -int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request, +int dd_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -void bl_kgsl_track(int (*real)(int, unsigned long, void *), int fd, unsigned long request, +void dd_kgsl_track(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_venc_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_vdec_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, +int dd_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int dd_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int dd_venc_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int dd_vdec_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int dd_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, void *caller, int *rc) __attribute__((visibility("hidden"))); -int bl_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, +int dd_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int ioctl(int fd, unsigned long request, ...) { @@ -435,16 +435,16 @@ int ioctl(int fd, unsigned long request, ...) { va_end(ap); int rc; - if (bl_ntsync_ioctl(fd, request, arg, &rc)) return rc; - if (bl_venc_ioctl(fd, request, arg, &rc)) return rc; - if (bl_vdec_ioctl(fd, request, arg, &rc)) return rc; - if (bl_drm_gem_close(fd, request, arg, &rc)) return rc; + if (dd_ntsync_ioctl(fd, request, arg, &rc)) return rc; + if (dd_venc_ioctl(fd, request, arg, &rc)) return rc; + if (dd_vdec_ioctl(fd, request, arg, &rc)) return rc; + if (dd_drm_gem_close(fd, request, arg, &rc)) return rc; if (real == NULL) real = (ioctl_fn) dlsym(RTLD_NEXT, "ioctl"); - if (bl_winebus_rumble_ioctl(real, fd, request, arg, __builtin_return_address(0), &rc)) return rc; - if (bl_writewatch_ioctl(real, fd, request, arg, &rc)) return rc; - if (!bl_kgsl_poll(real, fd, request, arg, &rc)) rc = quest_kgsl_ioctl(real, fd, request, arg); - bl_kgsl_track(real, fd, request, arg, &rc); - bl_kgsl_chip_id_fixup(request, arg, rc); + if (dd_winebus_rumble_ioctl(real, fd, request, arg, __builtin_return_address(0), &rc)) return rc; + if (dd_writewatch_ioctl(real, fd, request, arg, &rc)) return rc; + if (!dd_kgsl_poll(real, fd, request, arg, &rc)) rc = quest_kgsl_ioctl(real, fd, request, arg); + dd_kgsl_track(real, fd, request, arg, &rc); + dd_kgsl_chip_id_fixup(request, arg, rc); if (arg == NULL || !is_link_query(request)) return rc; int saved = errno; if (answer_ifreq(request, (struct ifreq *) arg, rc)) return 0; @@ -595,19 +595,19 @@ static FILE *synthesize(const char *table) { return out; } -int bl_status_without_tracer(const char *path, int flags, const void *caller) __attribute__((visibility("hidden"))); +int dd_status_without_tracer(const char *path, int flags, const void *caller) __attribute__((visibility("hidden"))); -const char *bl_oom_adj_redirect(const char *path, int writing) __attribute__((visibility("hidden"))); +const char *dd_oom_adj_redirect(const char *path, int writing) __attribute__((visibility("hidden"))); static FILE *open_stream(fopen_fn real, const char *path, const char *mode, const void *caller) { int status = mode && mode[0] == 'r' && !strchr(mode, '+') - ? bl_status_without_tracer(path, O_RDONLY | O_CLOEXEC, caller) : -1; + ? dd_status_without_tracer(path, O_RDONLY | O_CLOEXEC, caller) : -1; if (status >= 0) { FILE *copy = fdopen(status, "r"); if (copy == NULL) close(status); return copy; } - path = bl_oom_adj_redirect(path, mode && (mode[0] == 'w' || mode[0] == 'a' || strchr(mode, '+'))); + path = dd_oom_adj_redirect(path, mode && (mode[0] == 'w' || mode[0] == 'a' || strchr(mode, '+'))); int table = path && mode && mode[0] == 'r' ? denied_table(path) : -1; FILE *f; if (table >= 0 && denied_recently(table, path) && (f = synthesize(net_tables[table])) != NULL) return f; @@ -705,9 +705,9 @@ struct nl_reply { int overflow; }; -static const char nl_client_magic[12] = "bl-nl-c-v1"; -static const char nl_peer_magic[12] = "bl-nl-p-v1"; -static const char nl_reservation_magic[12] = "bl-nl-r-v1"; +static const char nl_client_magic[12] = "dd-nl-c-v1"; +static const char nl_peer_magic[12] = "dd-nl-p-v1"; +static const char nl_reservation_magic[12] = "dd-nl-r-v1"; static struct nl_socket *nl_sockets; static struct nl_fd *nl_fds; static struct nl_fd_page *nl_fd_pages[NL_FD_BUCKETS]; @@ -1206,36 +1206,36 @@ static unsigned nl_port_of(int fd) { return port; } -__attribute__((visibility("hidden"))) int bl_nl_socket(int type, int *fd); -__attribute__((visibility("hidden"))) int bl_nl_bind(int fd, const struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_socket(int type, int *fd); +__attribute__((visibility("hidden"))) int dd_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_getsockname(int fd, struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_owns(int fd); -__attribute__((visibility("hidden"))) void bl_nl_closed(int fd); -__attribute__((visibility("hidden"))) void bl_nl_range_closed(unsigned int first, unsigned int last); -__attribute__((visibility("hidden"))) int bl_nl_before_dup(int fd, void **state); -__attribute__((visibility("hidden"))) void bl_nl_after_dup(void *state, int fd); -__attribute__((visibility("hidden"))) int bl_nl_connect(int fd, const struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_owns(int fd); +__attribute__((visibility("hidden"))) void dd_nl_closed(int fd); +__attribute__((visibility("hidden"))) void dd_nl_range_closed(unsigned int first, unsigned int last); +__attribute__((visibility("hidden"))) int dd_nl_before_dup(int fd, void **state); +__attribute__((visibility("hidden"))) void dd_nl_after_dup(void *state, int fd); +__attribute__((visibility("hidden"))) int dd_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_getpeername(int fd, struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_setsockopt(int fd, int level, int option, +__attribute__((visibility("hidden"))) int dd_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, int (*real)(int, int, int, const void *, socklen_t), int *rc); -__attribute__((visibility("hidden"))) int bl_nl_getsockopt(int fd, int level, int option, +__attribute__((visibility("hidden"))) int dd_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, int (*real)(int, int, int, void *, socklen_t *), int *rc); -__attribute__((visibility("hidden"))) void bl_nl_received(struct msghdr *msg); -__attribute__((visibility("hidden"))) int bl_nl_recvmsg(int fd, struct msghdr *msg, int flags, +__attribute__((visibility("hidden"))) void dd_nl_received(struct msghdr *msg); +__attribute__((visibility("hidden"))) int dd_nl_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real)(int, struct msghdr *, int), ssize_t *rc); -int bl_nl_owns(int fd) { return nl_peer_of(fd) >= 0; } +int dd_nl_owns(int fd) { return nl_peer_of(fd) >= 0; } -int bl_nl_socket(int type, int *fd) { +int dd_nl_socket(int type, int *fd) { int kind = type & 0xf; *fd = -1; if (type & ~(0xf | SOCK_CLOEXEC | SOCK_NONBLOCK)) { @@ -1342,10 +1342,10 @@ static int nl_autobind(int fd) { return nl_bind_port(fd, 0, 1); } -int bl_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { +int dd_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { const struct sockaddr_nl *nl; if (addr && len >= sizeof(sa_family_t) && addr->sa_family == AF_NETLINK) nl_discover(fd); - if (!bl_nl_owns(fd)) return 0; + if (!dd_nl_owns(fd)) return 0; if (addr == NULL || len < sizeof(struct sockaddr_nl) || addr->sa_family != AF_NETLINK) { errno = EINVAL; *rc = -1; @@ -1361,10 +1361,10 @@ int bl_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { return 1; } -int bl_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { +int dd_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { struct sockaddr_nl nl; socklen_t size; - if (!bl_nl_owns(fd)) return 0; + if (!dd_nl_owns(fd)) return 0; if (addr == NULL || len == NULL) { errno = EFAULT; *rc = -1; @@ -1380,13 +1380,13 @@ int bl_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { return 1; } -void bl_nl_closed(int fd) { +void dd_nl_closed(int fd) { if (!nl_tracked(fd)) return; if (nl_foreign()) return; - bl_nl_range_closed((unsigned int) fd, (unsigned int) fd); + dd_nl_range_closed((unsigned int) fd, (unsigned int) fd); } -void bl_nl_range_closed(unsigned int first, unsigned int last) { +void dd_nl_range_closed(unsigned int first, unsigned int last) { if (__atomic_load_n(&nl_fd_count, __ATOMIC_ACQUIRE) == 0) return; if (nl_foreign()) return; pthread_mutex_lock(&nl_sockets_lock); @@ -1400,7 +1400,7 @@ void bl_nl_range_closed(unsigned int first, unsigned int last) { pthread_mutex_unlock(&nl_sockets_lock); } -int bl_nl_before_dup(int fd, void **state) { +int dd_nl_before_dup(int fd, void **state) { *state = NULL; if (!nl_tracked(fd)) return 0; if (nl_foreign()) return 0; @@ -1421,7 +1421,7 @@ int bl_nl_before_dup(int fd, void **state) { return 0; } -void bl_nl_after_dup(void *state, int fd) { +void dd_nl_after_dup(void *state, int fd) { int saved = errno; struct nl_fd *reserved = state; if (reserved == NULL && !nl_tracked(fd)) { @@ -1456,9 +1456,9 @@ int dup(int fd) { static int (*real)(int); void *state; if (real == NULL) real = (int (*)(int)) dlsym(RTLD_NEXT, "dup"); - if (bl_nl_before_dup(fd, &state) != 0) return -1; + if (dd_nl_before_dup(fd, &state) != 0) return -1; int result = real(fd); - bl_nl_after_dup(state, result); + dd_nl_after_dup(state, result); return result; } @@ -1470,9 +1470,9 @@ static int nl_destination(const struct sockaddr *addr, socklen_t len) { return destination->nl_pid == 0 ? 0 : -ECONNREFUSED; } -int bl_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { +int dd_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { if (addr && len >= sizeof(sa_family_t) && addr->sa_family == AF_NETLINK) nl_discover(fd); - if (!bl_nl_owns(fd)) return 0; + if (!dd_nl_owns(fd)) return 0; int disconnect = addr && len >= sizeof(sa_family_t) && addr->sa_family == AF_UNSPEC; int error = disconnect ? 0 : nl_destination(addr, len); if (error) { @@ -1493,8 +1493,8 @@ static void nl_source_name(struct sockaddr *addr, socklen_t *len) { *len = sizeof(source); } -int bl_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { - if (!bl_nl_owns(fd)) return 0; +int dd_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { + if (!dd_nl_owns(fd)) return 0; if (addr == NULL || len == NULL) { errno = EFAULT; *rc = -1; @@ -1505,7 +1505,7 @@ int bl_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { return 1; } -int bl_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, +int dd_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, int (*real)(int, int, int, const void *, socklen_t), int *rc) { if (level == SOL_NETLINK) nl_discover(fd); int peer = nl_peer_of(fd); @@ -1542,7 +1542,7 @@ int bl_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t return 1; } -int bl_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, +int dd_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, int (*real)(int, int, int, void *, socklen_t *), int *rc) { if (level != SOL_SOCKET || (option != SO_TYPE && option != SO_DOMAIN && option != SO_PROTOCOL)) return 0; @@ -1580,7 +1580,7 @@ int bl_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, return 1; } -void bl_nl_received(struct msghdr *msg) { +void dd_nl_received(struct msghdr *msg) { for (struct cmsghdr *control = CMSG_FIRSTHDR(msg); control; control = CMSG_NXTHDR(msg, control)) { if (control->cmsg_len < CMSG_LEN(0)) break; if (control->cmsg_level != SOL_SOCKET || control->cmsg_type != SCM_RIGHTS) continue; @@ -1593,11 +1593,11 @@ void bl_nl_received(struct msghdr *msg) { } } -int bl_nl_recvmsg(int fd, struct msghdr *msg, int flags, +int dd_nl_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real)(int, struct msghdr *, int), ssize_t *rc) { ssize_t result; socklen_t capacity = 0; - if (!bl_nl_owns(fd)) return 0; + if (!dd_nl_owns(fd)) return 0; if (msg && msg->msg_name) capacity = msg->msg_namelen; result = real(fd, msg, flags); if (result >= 0 && msg && msg->msg_name) { @@ -1614,7 +1614,7 @@ ssize_t recvfrom(int fd, void *buffer, size_t length, int flags, if (real == NULL) real = (ssize_t (*)(int, void *, size_t, int, struct sockaddr *, socklen_t *)) dlsym(RTLD_NEXT, "recvfrom"); - int owned = bl_nl_owns(fd); + int owned = dd_nl_owns(fd); socklen_t capacity = owned && addr && addrlen ? *addrlen : 0; ssize_t result = real(fd, buffer, length, flags, addr, addrlen); if (result >= 0 && owned && addr && addrlen) { @@ -2108,7 +2108,7 @@ static ssize_t sendmsg_request(int fd, const struct msghdr *msg, int flags) { ssize_t sendmsg(int fd, const struct msghdr *msg, int flags) { static ssize_t (*real)(int, const struct msghdr *, int); - if (bl_nl_owns(fd)) { + if (dd_nl_owns(fd)) { int error = msg && msg->msg_name ? nl_destination(msg->msg_name, msg->msg_namelen) : 0; if (error) { errno = -error; @@ -2128,7 +2128,7 @@ ssize_t sendto(int fd, const void *buffer, size_t length, int flags, const struct sockaddr *addr, socklen_t addrlen) { static ssize_t (*real)(int, const void *, size_t, int, const struct sockaddr *, socklen_t); ssize_t rc; - if (bl_nl_owns(fd)) { + if (dd_nl_owns(fd)) { int error = addr ? nl_destination(addr, addrlen) : 0; if (error) { errno = -error; @@ -2149,7 +2149,7 @@ ssize_t sendto(int fd, const void *buffer, size_t length, int flags, ssize_t send(int fd, const void *buffer, size_t length, int flags) { static ssize_t (*real)(int, const void *, size_t, int); ssize_t rc; - if (bl_nl_owns(fd) && deliver(fd, buffer, length, flags, &rc)) return rc; + if (dd_nl_owns(fd) && deliver(fd, buffer, length, flags, &rc)) return rc; if (real == NULL) real = (ssize_t (*)(int, const void *, size_t, int)) dlsym(RTLD_NEXT, "send"); if (real == NULL) { errno = ENOSYS; @@ -2161,7 +2161,7 @@ ssize_t send(int fd, const void *buffer, size_t length, int flags) { ssize_t write(int fd, const void *buffer, size_t length) { static ssize_t (*real)(int, const void *, size_t); ssize_t rc; - if (bl_nl_owns(fd) && deliver(fd, buffer, length, 0, &rc)) return rc; + if (dd_nl_owns(fd) && deliver(fd, buffer, length, 0, &rc)) return rc; if (real == NULL) real = (ssize_t (*)(int, const void *, size_t)) dlsym(RTLD_NEXT, "write"); if (real == NULL) { errno = ENOSYS; @@ -2172,7 +2172,7 @@ ssize_t write(int fd, const void *buffer, size_t length) { ssize_t writev(int fd, const struct iovec *iov, int iovcnt) { static ssize_t (*real)(int, const struct iovec *, int); - if (iovcnt >= 0 && bl_nl_owns(fd)) { + if (iovcnt >= 0 && dd_nl_owns(fd)) { struct msghdr msg = { .msg_iov = (struct iovec *) iov, .msg_iovlen = (size_t) iovcnt }; return sendmsg_request(fd, &msg, 0); } diff --git a/tools/linuxfs/preload/noexec.c b/tools/linuxfs/preload/noexec.c index 5abeb93487..e19d3c6725 100644 --- a/tools/linuxfs/preload/noexec.c +++ b/tools/linuxfs/preload/noexec.c @@ -25,7 +25,7 @@ static int in_fex(void) { return known; } -__attribute__((visibility("hidden"))) int bl_noexec_retry(int prot, int flags, int fd) { +__attribute__((visibility("hidden"))) int dd_noexec_retry(int prot, int flags, int fd) { int error = errno; struct statvfs vfs; int retry = (error == EACCES || error == EPERM) && (prot & PROT_EXEC) && fd >= 0 && !(flags & MAP_ANONYMOUS) && @@ -146,7 +146,7 @@ int mprotect(void *addr, size_t len, int prot) { #else -__attribute__((visibility("hidden"))) int bl_noexec_retry(int prot, int flags, int fd) { +__attribute__((visibility("hidden"))) int dd_noexec_retry(int prot, int flags, int fd) { (void)prot, (void)flags, (void)fd; return 0; } diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index 6e012e3b6b..d5a8cc6853 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -189,7 +189,7 @@ static int (*ns_real_close)(int); static int ns_on(void) { if (ns_state < 0) { - const char *e = getenv("BL_SYNC"); + const char *e = getenv("DD_SYNC"); ns_state = e && e[0] == '1'; } return ns_state; @@ -276,7 +276,7 @@ static __thread struct ns_cs ns_cs; static uintptr_t ns_handlers[_NSIG]; static uint8_t ns_siginfo[_NSIG]; -int bl_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); +int dd_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); static int ns_deferrable(int sig) { return sig > 0 && sig < _NSIG && sig != SIGKILL && sig != SIGSTOP && sig != SIGSEGV && sig != SIGBUS && sig != SIGILL @@ -383,7 +383,7 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *old) { struct sigaction mine; const struct sigaction *use = act; if (act && act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN && !(act->sa_flags & SA_RESETHAND) && - bl_from_ntdll(__builtin_return_address(0))) { + dd_from_ntdll(__builtin_return_address(0))) { mine = *act; mine.sa_sigaction = ns_trampoline; mine.sa_flags |= SA_SIGINFO; @@ -1373,8 +1373,8 @@ static int ns_dev_ioctl(struct ns_dev *d, unsigned long req, void *arg, int *fd) return ENOTTY; } -int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) __attribute__((visibility("hidden"))); -int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { +int dd_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) __attribute__((visibility("hidden"))); +int dd_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { if (_IOC_TYPE(req) != 'N' || _IOC_NR(req) < 0x80 || _IOC_NR(req) > 0x8d) return 0; if (!__atomic_load_n(&ns_ndev, __ATOMIC_ACQUIRE) && !ns_on()) return 0; uint64_t e = ns_lookup(fd); @@ -1393,8 +1393,8 @@ int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { return 1; } -int bl_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); -int bl_ntsync_open(const char *path, int flags) { +int dd_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); +int dd_ntsync_open(const char *path, int flags) { if (!path || strcmp(path, "/dev/ntsync") != 0 || !ns_on()) return -2; int fd = (int)syscall(SYS_openat, AT_FDCWD, path, flags, 0); if (fd >= 0) return fd; @@ -1440,41 +1440,41 @@ static void ns_received(struct msghdr *msg) { } } -int bl_udevmon_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real_recvmsg)(int, struct msghdr *, int), +int dd_udevmon_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real_recvmsg)(int, struct msghdr *, int), ssize_t *result) __attribute__((visibility("hidden"))); -int bl_nl_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real_recvmsg)(int, struct msghdr *, int), +int dd_nl_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real_recvmsg)(int, struct msghdr *, int), ssize_t *result) __attribute__((visibility("hidden"))); -void bl_nl_received(struct msghdr *msg) __attribute__((visibility("hidden"))); -void bl_nl_closed(int fd) __attribute__((visibility("hidden"))); -void bl_nl_range_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); -int bl_nl_before_dup(int fd, void **state) __attribute__((visibility("hidden"))); -void bl_nl_after_dup(void *state, int fd) __attribute__((visibility("hidden"))); +void dd_nl_received(struct msghdr *msg) __attribute__((visibility("hidden"))); +void dd_nl_closed(int fd) __attribute__((visibility("hidden"))); +void dd_nl_range_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); +int dd_nl_before_dup(int fd, void **state) __attribute__((visibility("hidden"))); +void dd_nl_after_dup(void *state, int fd) __attribute__((visibility("hidden"))); ssize_t recvmsg(int fd, struct msghdr *msg, int flags) { static ssize_t (*real)(int, struct msghdr *, int); if (!real) real = (ssize_t (*)(int, struct msghdr *, int))dlsym(RTLD_NEXT, "recvmsg"); ssize_t answered; - if (msg && bl_nl_recvmsg(fd, msg, flags, real, &answered)) return answered; - if (msg && bl_udevmon_recvmsg(fd, msg, flags, real, &answered)) return answered; + if (msg && dd_nl_recvmsg(fd, msg, flags, real, &answered)) return answered; + if (msg && dd_udevmon_recvmsg(fd, msg, flags, real, &answered)) return answered; ssize_t r = real(fd, msg, flags); if (r >= 0 && msg && msg->msg_control && msg->msg_controllen) { int saved = errno; - bl_nl_received(msg); + dd_nl_received(msg); if (ns_on()) ns_received(msg); errno = saved; } return r; } -void bl_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); -void bl_venc_closed(int fd) __attribute__((visibility("hidden"))); -void bl_vdec_closed(int fd) __attribute__((visibility("hidden"))); +void dd_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); +void dd_venc_closed(int fd) __attribute__((visibility("hidden"))); +void dd_vdec_closed(int fd) __attribute__((visibility("hidden"))); int close(int fd) { - if (fd >= 0) bl_fsync_fds_closed((unsigned int)fd, (unsigned int)fd); - bl_venc_closed(fd); - bl_vdec_closed(fd); - bl_nl_closed(fd); + if (fd >= 0) dd_fsync_fds_closed((unsigned int)fd, (unsigned int)fd); + dd_venc_closed(fd); + dd_vdec_closed(fd); + dd_nl_closed(fd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && fd >= 0 && fd < NS_FDS && __atomic_load_n(&t[fd], __ATOMIC_ACQUIRE)) ns_forget(fd); int saved = errno; @@ -1492,12 +1492,12 @@ int dup2(int oldfd, int newfd) { if (!real) real = (int (*)(int, int))dlsym(RTLD_NEXT, "dup2"); if (oldfd == newfd) return real(oldfd, newfd); void *nl_state; - if (bl_nl_before_dup(oldfd, &nl_state) != 0) return -1; - if (oldfd != newfd && newfd >= 0) bl_fsync_fds_closed((unsigned int)newfd, (unsigned int)newfd); + if (dd_nl_before_dup(oldfd, &nl_state) != 0) return -1; + if (oldfd != newfd && newfd >= 0) dd_fsync_fds_closed((unsigned int)newfd, (unsigned int)newfd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && oldfd != newfd && newfd >= 0 && newfd < NS_FDS && __atomic_load_n(&t[newfd], __ATOMIC_ACQUIRE)) ns_forget(newfd); int result = real(oldfd, newfd); - bl_nl_after_dup(nl_state, result); + dd_nl_after_dup(nl_state, result); return result; } @@ -1506,12 +1506,12 @@ int dup3(int oldfd, int newfd, int flags) { if (!real) real = (int (*)(int, int, int))dlsym(RTLD_NEXT, "dup3"); if (oldfd == newfd) return real(oldfd, newfd, flags); void *nl_state; - if (bl_nl_before_dup(oldfd, &nl_state) != 0) return -1; - if (oldfd != newfd && newfd >= 0) bl_fsync_fds_closed((unsigned int)newfd, (unsigned int)newfd); + if (dd_nl_before_dup(oldfd, &nl_state) != 0) return -1; + if (oldfd != newfd && newfd >= 0) dd_fsync_fds_closed((unsigned int)newfd, (unsigned int)newfd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && oldfd != newfd && newfd >= 0 && newfd < NS_FDS && __atomic_load_n(&t[newfd], __ATOMIC_ACQUIRE)) ns_forget(newfd); int result = real(oldfd, newfd, flags); - bl_nl_after_dup(nl_state, result); + dd_nl_after_dup(nl_state, result); return result; } @@ -1526,7 +1526,7 @@ int close_range(unsigned int first, unsigned int last, int flags) { static int (*real)(unsigned int, unsigned int, int); if (!real) real = (int (*)(unsigned int, unsigned int, int))dlsym(RTLD_NEXT, "close_range"); if (!(flags & CLOSE_RANGE_CLOEXEC)) { - bl_fsync_fds_closed(first, last); + dd_fsync_fds_closed(first, last); ns_forget_range(first, last); } if (!real) { @@ -1534,7 +1534,7 @@ int close_range(unsigned int first, unsigned int last, int flags) { return -1; } int result = real(first, last, flags); - if (result == 0 && !(flags & CLOSE_RANGE_CLOEXEC)) bl_nl_range_closed(first, last); + if (result == 0 && !(flags & CLOSE_RANGE_CLOEXEC)) dd_nl_range_closed(first, last); return result; } @@ -1542,12 +1542,12 @@ void closefrom(int lowfd) { static void (*real)(int); if (!real) real = (void (*)(int))dlsym(RTLD_NEXT, "closefrom"); if (lowfd >= 0) { - bl_fsync_fds_closed((unsigned int)lowfd, ~0u); + dd_fsync_fds_closed((unsigned int)lowfd, ~0u); ns_forget_range((unsigned int)lowfd, ~0u); } if (real) { real(lowfd); - if (lowfd >= 0) bl_nl_range_closed((unsigned int)lowfd, ~0u); + if (lowfd >= 0) dd_nl_range_closed((unsigned int)lowfd, ~0u); } } diff --git a/tools/linuxfs/preload/oomadj.c b/tools/linuxfs/preload/oomadj.c index 19e5f4251d..18dc592e9b 100644 --- a/tools/linuxfs/preload/oomadj.c +++ b/tools/linuxfs/preload/oomadj.c @@ -33,7 +33,7 @@ static int is_oom_score_adj(const char *path) { return strcmp(p, "oom_score_adj") == 0 || strcmp(p, "oom_adj") == 0; } -__attribute__((visibility("hidden"))) const char *bl_oom_adj_redirect(const char *path, int writing) { +__attribute__((visibility("hidden"))) const char *dd_oom_adj_redirect(const char *path, int writing) { static int logged; if (!writing || !is_oom_score_adj(path)) return path; if (!__atomic_exchange_n(&logged, 1, __ATOMIC_RELAXED)) { diff --git a/tools/linuxfs/preload/opens.c b/tools/linuxfs/preload/opens.c index 5b35396fcc..c9df092b40 100644 --- a/tools/linuxfs/preload/opens.c +++ b/tools/linuxfs/preload/opens.c @@ -11,13 +11,13 @@ #include #include -int bl_status_without_tracer(const char *path, int flags, const void *caller) __attribute__((visibility("hidden"))); -int bl_writable_retry(int dirfd, const char *path, int flags) __attribute__((visibility("hidden"))); -int bl_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); -const char *bl_oom_adj_redirect(const char *path, int writing) __attribute__((visibility("hidden"))); -int bl_venc_open(const char *path, int flags) __attribute__((visibility("hidden"))); -int bl_vdec_open(const char *path, int flags) __attribute__((visibility("hidden"))); -int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, +int dd_status_without_tracer(const char *path, int flags, const void *caller) __attribute__((visibility("hidden"))); +int dd_writable_retry(int dirfd, const char *path, int flags) __attribute__((visibility("hidden"))); +int dd_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); +const char *dd_oom_adj_redirect(const char *path, int writing) __attribute__((visibility("hidden"))); +int dd_venc_open(const char *path, int flags) __attribute__((visibility("hidden"))); +int dd_vdec_open(const char *path, int flags) __attribute__((visibility("hidden"))); +int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) __attribute__((visibility("hidden"))); static int (*real_open)(const char *, int, ...); @@ -49,19 +49,19 @@ static int open_from(const char *path, int flags, mode_t mode, const void *calle errno = EACCES; return -1; } - path = bl_oom_adj_redirect(path, (flags & O_ACCMODE) != O_RDONLY); - if ((fd = bl_status_without_tracer(path, flags, caller)) >= 0) return fd; - if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; - if ((fd = bl_venc_open(path, flags)) != -2) return fd; - if ((fd = bl_vdec_open(path, flags)) != -2) return fd; + path = dd_oom_adj_redirect(path, (flags & O_ACCMODE) != O_RDONLY); + if ((fd = dd_status_without_tracer(path, flags, caller)) >= 0) return fd; + if ((fd = dd_ntsync_open(path, flags)) != -2) return fd; + if ((fd = dd_venc_open(path, flags)) != -2) return fd; + if ((fd = dd_vdec_open(path, flags)) != -2) return fd; if (real_open == NULL) real_open = dlsym(RTLD_NEXT, "open"); if (real_open == NULL) { errno = ENOSYS; return -1; } - fd = bl_dircache_create(AT_FDCWD, path, flags, mode, via_open); + fd = dd_dircache_create(AT_FDCWD, path, flags, mode, via_open); if (retry_without_noatime(fd, flags)) fd = real_open(path, flags & ~O_NOATIME, mode); - if (fd < 0 && bl_writable_retry(AT_FDCWD, path, flags)) fd = real_open(path, flags & ~O_NOATIME, mode); + if (fd < 0 && dd_writable_retry(AT_FDCWD, path, flags)) fd = real_open(path, flags & ~O_NOATIME, mode); return fd; } @@ -72,19 +72,19 @@ static int openat_from(int dirfd, const char *path, int flags, mode_t mode, cons errno = EACCES; return -1; } - path = bl_oom_adj_redirect(path, (flags & O_ACCMODE) != O_RDONLY); - if ((fd = bl_status_without_tracer(path, flags, caller)) >= 0) return fd; - if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; - if ((fd = bl_venc_open(path, flags)) != -2) return fd; - if ((fd = bl_vdec_open(path, flags)) != -2) return fd; + path = dd_oom_adj_redirect(path, (flags & O_ACCMODE) != O_RDONLY); + if ((fd = dd_status_without_tracer(path, flags, caller)) >= 0) return fd; + if ((fd = dd_ntsync_open(path, flags)) != -2) return fd; + if ((fd = dd_venc_open(path, flags)) != -2) return fd; + if ((fd = dd_vdec_open(path, flags)) != -2) return fd; if (real_openat == NULL) real_openat = dlsym(RTLD_NEXT, "openat"); if (real_openat == NULL) { errno = ENOSYS; return -1; } - fd = bl_dircache_create(dirfd, path, flags, mode, via_openat); + fd = dd_dircache_create(dirfd, path, flags, mode, via_openat); if (retry_without_noatime(fd, flags)) fd = real_openat(dirfd, path, flags & ~O_NOATIME, mode); - if (fd < 0 && bl_writable_retry(dirfd, path, flags)) fd = real_openat(dirfd, path, flags & ~O_NOATIME, mode); + if (fd < 0 && dd_writable_retry(dirfd, path, flags)) fd = real_openat(dirfd, path, flags & ~O_NOATIME, mode); return fd; } diff --git a/tools/linuxfs/preload/owner.c b/tools/linuxfs/preload/owner.c index 1e493f8a80..9c5b290c57 100644 --- a/tools/linuxfs/preload/owner.c +++ b/tools/linuxfs/preload/owner.c @@ -13,7 +13,7 @@ #define EXFAT_MAGIC 0x2011bab0 __attribute__((visibility("hidden"))) -int bl_is_wineserver(void) { +int dd_is_wineserver(void) { static int cached = -1; char exe[PATH_MAX]; const char *base; @@ -40,11 +40,11 @@ static int has_no_unix_owner(int fd) { } __attribute__((visibility("hidden"))) -void bl_storage_owner(int fd, struct stat *st) { +void dd_storage_owner(int fd, struct stat *st) { int saved = errno; uid_t uid; - if (st != NULL && bl_is_wineserver()) { + if (st != NULL && dd_is_wineserver()) { uid = getuid(); if (st->st_uid != uid && has_no_unix_owner(fd)) st->st_uid = uid; } @@ -61,7 +61,7 @@ int fchmod(int fd, mode_t mode) { return -1; } result = next_fchmod(fd, mode); - if (result != 0 && errno == EPERM && bl_is_wineserver()) { + if (result != 0 && errno == EPERM && dd_is_wineserver()) { if (has_no_unix_owner(fd)) { errno = saved; return 0; diff --git a/tools/linuxfs/preload/pathcache.c b/tools/linuxfs/preload/pathcache.c index 59f2cbf069..400a1e5786 100644 --- a/tools/linuxfs/preload/pathcache.c +++ b/tools/linuxfs/preload/pathcache.c @@ -40,7 +40,7 @@ static int enabled(void) { const char *off; if (cached >= 0) return cached; - off = getenv("BL_NO_PATH_CACHE"); + off = getenv("DD_NO_PATH_CACHE"); cached = strcmp(program_invocation_short_name, "steam") == 0 && (strstr(program_invocation_name, "steamrtarm64") != NULL || strstr(program_invocation_name, "steamrt64") != NULL) && @@ -83,7 +83,7 @@ static void store(const char *path, int kind, int mode, int flags, unsigned h, c } __attribute__((visibility("hidden"))) -char *bl_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) { +char *dd_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) { char out[PATH_MAX]; unsigned h; struct entry *e; @@ -111,7 +111,7 @@ char *bl_cached_realpath(const char *path, char *resolved, char *(*real)(const c return strdup(out); } -int bl_dircache_absent(const char *path) __attribute__((weak, visibility("hidden"))); +int dd_dircache_absent(const char *path) __attribute__((weak, visibility("hidden"))); static int cached_access(const char *path, int mode, int flags, int (*check)(const char *, int, int)) { unsigned h; @@ -124,7 +124,7 @@ static int cached_access(const char *path, int mode, int flags, int (*check)(con hit = find(path, KIND_ACCESS, mode, flags, h) != NULL; pthread_mutex_unlock(&lock); if (hit) return 0; - if (bl_dircache_absent && bl_dircache_absent(path)) { + if (dd_dircache_absent && dd_dircache_absent(path)) { errno = ENOENT; return -1; } @@ -144,11 +144,11 @@ static int (*next_faccessat(void))(int, const char *, int, int) { return real; } -__attribute__((visibility("hidden"))) int bl_binfmt_runnable(const char *path, int mode); -__attribute__((visibility("hidden"))) int bl_writable_access(int dirfd, const char *path, int mode, int flags); +__attribute__((visibility("hidden"))) int dd_binfmt_runnable(const char *path, int mode); +__attribute__((visibility("hidden"))) int dd_writable_access(int dirfd, const char *path, int mode, int flags); static int writable_as_owner(int (*real)(int, const char *, int, int), int dirfd, const char *path, int mode, int flags) { - if (!bl_writable_access(dirfd, path, mode, flags)) return -1; + if (!dd_writable_access(dirfd, path, mode, flags)) return -1; if ((mode & ~W_OK) == 0 || real(dirfd, path, mode & ~W_OK, flags) == 0) return 0; return -1; } @@ -165,7 +165,7 @@ static int check_cwd(const char *path, int mode, int flags) { result = real(AT_FDCWD, path, mode, flags); if (result == 0) return 0; err = errno; - if (err == EACCES && bl_binfmt_runnable(path, mode)) return 0; + if (err == EACCES && dd_binfmt_runnable(path, mode)) return 0; errno = err; if (writable_as_owner(real, AT_FDCWD, path, mode, flags) == 0) return 0; errno = err; diff --git a/tools/linuxfs/preload/perms.c b/tools/linuxfs/preload/perms.c index e90bad6fe7..9ca5f6a9c0 100644 --- a/tools/linuxfs/preload/perms.c +++ b/tools/linuxfs/preload/perms.c @@ -60,7 +60,7 @@ static int grant_owner_write(int dirfd, const char *path) { } __attribute__((visibility("hidden"))) -int bl_writable_retry(int dirfd, const char *path, int flags) { +int dd_writable_retry(int dirfd, const char *path, int flags) { int saved = errno; int granted = 0; char parent[PATH_MAX]; @@ -84,7 +84,7 @@ int bl_writable_retry(int dirfd, const char *path, int flags) { } __attribute__((visibility("hidden"))) -int bl_writable_access(int dirfd, const char *path, int mode, int flags) { +int dd_writable_access(int dirfd, const char *path, int mode, int flags) { int saved = errno; struct stat st; int owned; diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index 377b895672..6d3393b506 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -21,22 +21,22 @@ #define SYS_openat2 437 #endif -#define BL_RESOLVE_BENEATH 0x08 -#define BL_RESOLVE_IN_ROOT 0x10 -#define BL_MAX_SYMLINKS 40 -#define BL_PROC_ROOT_INO 1 +#define DD_RESOLVE_BENEATH 0x08 +#define DD_RESOLVE_IN_ROOT 0x10 +#define DD_MAX_SYMLINKS 40 +#define DD_PROC_ROOT_INO 1 #ifdef SYS_newfstatat -#define BL_SYS_FSTATAT SYS_newfstatat -#define BL_FSTATAT_NAME "fstatat" -typedef struct stat bl_stat; +#define DD_SYS_FSTATAT SYS_newfstatat +#define DD_FSTATAT_NAME "fstatat" +typedef struct stat dd_stat; #else -#define BL_SYS_FSTATAT SYS_fstatat64 -#define BL_FSTATAT_NAME "fstatat64" -typedef struct stat64 bl_stat; +#define DD_SYS_FSTATAT SYS_fstatat64 +#define DD_FSTATAT_NAME "fstatat64" +typedef struct stat64 dd_stat; #endif -struct bl_open_how { +struct dd_open_how { uint64_t flags; uint64_t mode; uint64_t resolve; @@ -45,7 +45,7 @@ struct bl_open_how { static long (*real_syscall)(long, ...); static void *(*real_dlopen)(const char *, int); static int openat2_missing; -static int (*next_fstatat)(int, const char *, bl_stat *, int); +static int (*next_fstatat)(int, const char *, dd_stat *, int); static int (*next_openat)(int, const char *, int, ...); static ssize_t (*next_readlinkat)(int, const char *, char *, size_t); static int (*next_statx)(int, const char *, int, unsigned int, struct statx *); @@ -53,7 +53,7 @@ static int (*next_statx)(int, const char *, int, unsigned int, struct statx *); static int find_fastpath(struct dl_phdr_info *info, size_t size, void *name) { (void)size; const char *slash = strrchr(info->dlpi_name, '/'); - if (!slash || strcmp(slash + 1, "libblfastpath.so") != 0 || strlen(info->dlpi_name) >= PATH_MAX) { + if (!slash || strcmp(slash + 1, "libddfastpath.so") != 0 || strlen(info->dlpi_name) >= PATH_MAX) { return 0; } strcpy(name, info->dlpi_name); @@ -65,16 +65,16 @@ __attribute__((constructor)) static void find_fastpath_calls(void) { dl_iterate_phdr(find_fastpath, name); void *fastpath = *name ? dlopen(name, RTLD_NOLOAD | RTLD_LAZY) : NULL; if (fastpath) { - next_fstatat = (int (*)(int, const char *, bl_stat *, int))dlsym(fastpath, BL_FSTATAT_NAME); + next_fstatat = (int (*)(int, const char *, dd_stat *, int))dlsym(fastpath, DD_FSTATAT_NAME); next_openat = (int (*)(int, const char *, int, ...))dlsym(fastpath, "openat"); next_readlinkat = (ssize_t (*)(int, const char *, char *, size_t))dlsym(fastpath, "readlinkat"); next_statx = (int (*)(int, const char *, int, unsigned int, struct statx *))dlsym(fastpath, "statx"); } } -static long path_stat(int dirfd, const char *path, bl_stat *st, int flags) { +static long path_stat(int dirfd, const char *path, dd_stat *st, int flags) { if (!next_fstatat) { - return real_syscall(BL_SYS_FSTATAT, (long)dirfd, (long)path, (long)st, (long)flags); + return real_syscall(DD_SYS_FSTATAT, (long)dirfd, (long)path, (long)st, (long)flags); } return next_fstatat(dirfd, path, st, flags); } @@ -112,7 +112,7 @@ void *dlopen(const char *filename, int flags) { return real_dlopen(filename, flags); } -int bl_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); +int dd_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); static struct robust_list_head *thread_robust_head(void) { pthread_mutexattr_t attr; @@ -159,10 +159,10 @@ static int is_magic_link(int dirfd, char *link, size_t parent_len) { } char saved = link[parent_len]; link[parent_len] = 0; - bl_stat parent; + dd_stat parent; long result = path_stat(dirfd, (parent_len ? link : "."), &parent, 0); link[parent_len] = saved; - return result != 0 || parent.st_ino != BL_PROC_ROOT_INO; + return result != 0 || parent.st_ino != DD_PROC_ROOT_INO; } static long openat_in_root(int dirfd, const char *path, int flags, long mode) { @@ -217,16 +217,16 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { } memcpy(resolved + resolved_len + separator, name, len); resolved[candidate_len] = 0; - bl_stat st; + dd_stat st; int follow = !last || trailing_slash || !nofollow; long stat_result = follow ? path_stat(dirfd, resolved, &st, AT_SYMLINK_NOFOLLOW) : -1; if (stat_result == 0 && S_ISLNK(st.st_mode)) { - if (++symlinks > BL_MAX_SYMLINKS) { + if (++symlinks > DD_MAX_SYMLINKS) { errno = ELOOP; return -1; } if (!have_root) { - bl_stat root; + dd_stat root; struct statfs root_fs; if (path_stat(dirfd, ".", &root, 0) != 0) { return -1; @@ -265,7 +265,7 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { while (*inside == '/') { inside++; } - bl_stat probe; + dd_stat probe; int host = *inside && path_stat(dirfd, inside, &probe, AT_SYMLINK_NOFOLLOW) != 0 && errno == ENOENT && path_stat(AT_FDCWD, pending, &probe, 0) == 0; pending[target_len] = saved; @@ -302,22 +302,22 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { static long openat2_via_openat(const long *args) { const char *path = (const char *)args[1]; - const struct bl_open_how *how = (const struct bl_open_how *)args[2]; + const struct dd_open_how *how = (const struct dd_open_how *)args[2]; if (!path || !how || (size_t)args[3] < sizeof(*how)) { errno = EINVAL; return -1; } - if ((how->resolve & BL_RESOLVE_IN_ROOT) && (int)args[0] != AT_FDCWD) { + if ((how->resolve & DD_RESOLVE_IN_ROOT) && (int)args[0] != AT_FDCWD) { return openat_in_root((int)args[0], path, (int)how->flags, (long)how->mode); } - if (how->resolve & BL_RESOLVE_IN_ROOT) { + if (how->resolve & DD_RESOLVE_IN_ROOT) { while (*path == '/') { path++; } if (!*path) { path = "."; } - } else if ((how->resolve & BL_RESOLVE_BENEATH) && *path == '/') { + } else if ((how->resolve & DD_RESOLVE_BENEATH) && *path == '/') { errno = EXDEV; return -1; } @@ -346,14 +346,14 @@ static long openat2_call(const long *args) { return openat2_via_openat(args); } -int bl_openat2(int dirfd, const char *path, void *how, size_t size) __asm__("openat2"); -int bl_openat2(int dirfd, const char *path, void *how, size_t size) { +int dd_openat2(int dirfd, const char *path, void *how, size_t size) __asm__("openat2"); +int dd_openat2(int dirfd, const char *path, void *how, size_t size) { long args[6] = {dirfd, (long)path, (long)how, (long)size, 0, 0}; return (int)openat2_call(args); } -int bl_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) __attribute__((visibility("hidden"))); -int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) __attribute__((visibility("hidden"))); +int dd_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) __attribute__((visibility("hidden"))); +int dd_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) __attribute__((visibility("hidden"))); long syscall(long number, ...) { va_list ap; @@ -374,16 +374,16 @@ long syscall(long number, ...) { return 0; } long handled; - if (bl_fsync_syscall(number, args, &handled)) { + if (dd_fsync_syscall(number, args, &handled)) { return handled; } if (!real_syscall) { real_syscall = (long (*)(long, ...)) dlsym(RTLD_NEXT, "syscall"); } - if (bl_clock_syscall(number, args, real_syscall, &handled)) { + if (dd_clock_syscall(number, args, real_syscall, &handled)) { return handled; } - if (bl_writewatch_syscall(number, args, real_syscall, &handled)) { + if (dd_writewatch_syscall(number, args, real_syscall, &handled)) { return handled; } if (number == SYS_openat2) { @@ -392,8 +392,8 @@ long syscall(long number, ...) { if (number == SYS_openat) { return path_open((int)args[0], (const char *)args[1], (int)args[2], args[3]); } - if (number == BL_SYS_FSTATAT) { - return path_stat((int)args[0], (const char *)args[1], (bl_stat *)args[2], (int)args[3]); + if (number == DD_SYS_FSTATAT) { + return path_stat((int)args[0], (const char *)args[1], (dd_stat *)args[2], (int)args[3]); } if (number == SYS_readlinkat) { return path_readlink((int)args[0], (const char *)args[1], (char *)args[2], (size_t)args[3]); diff --git a/tools/linuxfs/preload/rptouch.c b/tools/linuxfs/preload/rptouch.c index b8eb5ea90b..705195d528 100644 --- a/tools/linuxfs/preload/rptouch.c +++ b/tools/linuxfs/preload/rptouch.c @@ -9,8 +9,8 @@ #include "../../../app/src/main/cpp/venc/venc_proto.h" -int bl_venc_streaming(void) __attribute__((visibility("hidden"))); -int bl_venc_connect(void) __attribute__((visibility("hidden"))); +int dd_venc_streaming(void) __attribute__((visibility("hidden"))); +int dd_venc_connect(void) __attribute__((visibility("hidden"))); static pthread_mutex_t rt_lock = PTHREAD_MUTEX_INITIALIZER; static int rt_fd = -1, rt_down, rt_x, rt_y, rt_screen; @@ -18,10 +18,10 @@ static int rt_fd = -1, rt_down, rt_x, rt_y, rt_screen; static int rt_enabled(void) { static int enabled = -1; if (enabled < 0) { - const char *v = getenv("BL_REMOTE_TOUCH"); + const char *v = getenv("DD_REMOTE_TOUCH"); enabled = v == NULL || strcmp(v, "0") != 0; } - return enabled && bl_venc_streaming(); + return enabled && dd_venc_streaming(); } static uint32_t rt_fraction(int value, int extent) { @@ -40,7 +40,7 @@ static void rt_send(void *dpy, uint32_t action) { .x = rt_fraction(rt_x, width(dpy, rt_screen)), .y = rt_fraction(rt_y, height(dpy, rt_screen)), }; for (int attempt = 0; attempt < 2; attempt++) { - if (rt_fd < 0) rt_fd = bl_venc_connect(); + if (rt_fd < 0) rt_fd = dd_venc_connect(); if (rt_fd < 0) return; if (send(rt_fd, &m, sizeof m, MSG_NOSIGNAL) == (ssize_t)sizeof m) return; close(rt_fd); diff --git a/tools/linuxfs/preload/space.c b/tools/linuxfs/preload/space.c index 950197f655..e3da12a7fa 100644 --- a/tools/linuxfs/preload/space.c +++ b/tools/linuxfs/preload/space.c @@ -7,7 +7,7 @@ #include static const char *content_of(const char *path, char *buf, size_t len) { - const char *roots = getenv("BL_LIBRARY_SPACE"); + const char *roots = getenv("DD_LIBRARY_SPACE"); if (!path || !roots || !*roots) return NULL; diff --git a/tools/linuxfs/preload/storage.c b/tools/linuxfs/preload/storage.c index 53ce078e93..29737871a4 100644 --- a/tools/linuxfs/preload/storage.c +++ b/tools/linuxfs/preload/storage.c @@ -13,7 +13,7 @@ #include static int (*next_fstat)(int, struct stat *); -void bl_storage_owner(int fd, struct stat *st) __attribute__((visibility("hidden"))); +void dd_storage_owner(int fd, struct stat *st) __attribute__((visibility("hidden"))); static int (*next_fallocate)(int, int, off_t, off_t); static int (*next_posix_fallocate)(int, off_t, off_t); static ssize_t (*next_pwrite)(int, const void *, size_t, off_t); @@ -59,8 +59,8 @@ static void initialize(void) { while (__atomic_load_n(&init_state, __ATOMIC_ACQUIRE) != 2) { } return; } - const char *on = getenv("BL_STORAGE_DIAGNOSTICS"); - const char *device = getenv("BL_STORAGE_DEVICE"); + const char *on = getenv("DD_STORAGE_DIAGNOSTICS"); + const char *device = getenv("DD_STORAGE_DEVICE"); if (on != NULL && strcmp(on, "1") == 0 && device != NULL && *device != '\0') { char *end = NULL; errno = 0; @@ -105,7 +105,7 @@ static void comm_name(char *out, size_t size) { } static void append_line(const char *line, size_t length) { - const char *path = getenv("BL_STORAGE_LOG"); + const char *path = getenv("DD_STORAGE_LOG"); struct stat st; int saved = errno; if (path == NULL || *path == '\0' || length == 0 || length > 2048) goto done; @@ -288,7 +288,7 @@ int fstat(int fd, struct stat *out) { errno = entry_errno; if (!enabled) { int result = next_fstat(fd, out); - if (result == 0) bl_storage_owner(fd, out); + if (result == 0) dd_storage_owner(fd, out); return result; } uint64_t start = now_ns(); @@ -296,7 +296,7 @@ int fstat(int fd, struct stat *out) { int result = next_fstat(fd, out); int call_errno = errno; uint64_t elapsed = now_ns() - start; - if (result == 0) bl_storage_owner(fd, out); + if (result == 0) dd_storage_owner(fd, out); if (result == 0 && on_selected_device(fd, out)) { add(&stats.fstat_calls, 1); add(&stats.fstat_elapsed_ns, elapsed); diff --git a/tools/linuxfs/preload/subreaper.c b/tools/linuxfs/preload/subreaper.c index 90ed7548d3..5aea82a3f5 100644 --- a/tools/linuxfs/preload/subreaper.c +++ b/tools/linuxfs/preload/subreaper.c @@ -1,6 +1,6 @@ /* tools/linuxfs/preload/subreaper.c * - * Mark every process that loads libblsession.so as a child subreaper. + * Mark every process that loads libddsession.so as a child subreaper. * * wlroots starts Xwayland with a double fork: gamescope -> middle process * (exits immediately) -> Xwayland. With no subreaper in the tree, Xwayland @@ -18,7 +18,7 @@ #include __attribute__((constructor)) -static void bl_session_set_subreaper(void) +static void dd_session_set_subreaper(void) { (void)prctl(PR_SET_CHILD_SUBREAPER, 1); } diff --git a/tools/linuxfs/preload/sysv.c b/tools/linuxfs/preload/sysv.c index 4d3752f854..77d14d3e5a 100644 --- a/tools/linuxfs/preload/sysv.c +++ b/tools/linuxfs/preload/sysv.c @@ -48,7 +48,7 @@ static char g_dir[PATH_MAX - NAME_MAX - 2]; static const char *object_dir(void) { if (!g_dir[0]) { - const char *d = getenv("BL_SYSV_DIR"); + const char *d = getenv("DD_SYSV_DIR"); snprintf(g_dir, sizeof(g_dir), "%s", d && *d ? d : DIR_DEFAULT); mkdir(g_dir, 0700); } diff --git a/tools/linuxfs/preload/tracer.c b/tools/linuxfs/preload/tracer.c index 7f5ac8e8cd..ec8dd003f9 100644 --- a/tools/linuxfs/preload/tracer.c +++ b/tools/linuxfs/preload/tracer.c @@ -16,7 +16,7 @@ #define STATUS_MAX 16384 #define TRACER_FIELD "\nTracerPid:\t" -int bl_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); +int dd_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); static const char *skip_digits(const char *s) { const char *end = s; @@ -41,7 +41,7 @@ static int is_web_helper(const void *caller) { if (strcmp(program_invocation_short_name, "steamwebhelper") != 0 && strcmp(program_invocation_short_name, "vrwebhelper") != 0) return 0; - const char *hide = getenv("BL_WEBHELPER_HIDE_TRACER"); + const char *hide = getenv("DD_WEBHELPER_HIDE_TRACER"); Dl_info info; if (hide && hide[0] == '1' && caller && dladdr(caller, &info) && info.dli_fname && strstr(info.dli_fname, "libtier0_s.so")) @@ -72,14 +72,14 @@ static int read_only_copy(const char *data, size_t len, int flags) { return ro; } -__attribute__((visibility("hidden"))) int bl_status_without_tracer(const char *path, int flags, const void *caller) { +__attribute__((visibility("hidden"))) int dd_status_without_tracer(const char *path, int flags, const void *caller) { char text[STATUS_MAX]; size_t len = 0; int saved = errno; int out = -1; long pid; - if ((flags & O_ACCMODE) != O_RDONLY || (pid = status_pid(path)) < 0 || is_web_helper(caller) || bl_from_ntdll(caller)) + if ((flags & O_ACCMODE) != O_RDONLY || (pid = status_pid(path)) < 0 || is_web_helper(caller) || dd_from_ntdll(caller)) return -1; // through the next open(): the native userland's hook gives the app's ids as root's there static int (*next_open)(const char *, int, ...) = NULL; diff --git a/tools/linuxfs/preload/udevmon.c b/tools/linuxfs/preload/udevmon.c index 2d4e9bf70d..d3af29ef43 100644 --- a/tools/linuxfs/preload/udevmon.c +++ b/tools/linuxfs/preload/udevmon.c @@ -102,17 +102,17 @@ static int make_stand_in(int type) { return -1; } -__attribute__((visibility("hidden"))) int bl_nl_socket(int type, int *fd); -__attribute__((visibility("hidden"))) int bl_nl_owns(int fd); -__attribute__((visibility("hidden"))) int bl_nl_getsockname(int fd, struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_socket(int type, int *fd); +__attribute__((visibility("hidden"))) int dd_nl_owns(int fd); +__attribute__((visibility("hidden"))) int dd_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_getpeername(int fd, struct sockaddr *addr, +__attribute__((visibility("hidden"))) int dd_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc); -__attribute__((visibility("hidden"))) int bl_nl_setsockopt(int fd, int level, int option, +__attribute__((visibility("hidden"))) int dd_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, int (*real)(int, int, int, const void *, socklen_t), int *rc); -__attribute__((visibility("hidden"))) int bl_nl_getsockopt(int fd, int level, int option, +__attribute__((visibility("hidden"))) int dd_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, int (*real)(int, int, int, void *, socklen_t *), int *rc); @@ -128,7 +128,7 @@ int socket(int domain, int type, int protocol) { } if (domain == AF_NETLINK && protocol == NETLINK_ROUTE) { int route_fd; - bl_nl_socket(type, &route_fd); + dd_nl_socket(type, &route_fd); return route_fd; } fd = real_socket(domain, type, protocol); @@ -142,7 +142,7 @@ int socket(int domain, int type, int protocol) { return make_stand_in(type); } -__attribute__((visibility("hidden"))) int bl_udevmon_stand_in(int fd) { +__attribute__((visibility("hidden"))) int dd_udevmon_stand_in(int fd) { return is_stand_in(fd); } @@ -151,7 +151,7 @@ int getsockname(int fd, struct sockaddr *addr, socklen_t *len) { struct sockaddr_nl nl; int route_rc; - if (bl_nl_getsockname(fd, addr, len, &route_rc)) return route_rc; + if (dd_nl_getsockname(fd, addr, len, &route_rc)) return route_rc; if (is_stand_in(fd)) { if (addr == NULL || len == NULL) { errno = EFAULT; @@ -175,7 +175,7 @@ int getsockname(int fd, struct sockaddr *addr, socklen_t *len) { int getpeername(int fd, struct sockaddr *addr, socklen_t *len) { static int (*real)(int, struct sockaddr *, socklen_t *); int route_rc; - if (bl_nl_getpeername(fd, addr, len, &route_rc)) return route_rc; + if (dd_nl_getpeername(fd, addr, len, &route_rc)) return route_rc; if (real == NULL) real = dlsym(RTLD_NEXT, "getpeername"); return real(fd, addr, len); } @@ -189,7 +189,7 @@ int setsockopt(int fd, int level, int optname, const void *optval, socklen_t opt errno = ENOSYS; return -1; } - if (bl_nl_setsockopt(fd, level, optname, optval, optlen, real_setsockopt, &route_rc)) return route_rc; + if (dd_nl_setsockopt(fd, level, optname, optval, optlen, real_setsockopt, &route_rc)) return route_rc; if (is_stand_in(fd)) { if (level == SOL_NETLINK) return 0; @@ -207,7 +207,7 @@ int getsockopt(int fd, int level, int option, void *value, socklen_t *len) { errno = ENOSYS; return -1; } - if (bl_nl_getsockopt(fd, level, option, value, len, real, &route_rc)) return route_rc; + if (dd_nl_getsockopt(fd, level, option, value, len, real, &route_rc)) return route_rc; return real(fd, level, option, value, len); } @@ -249,7 +249,7 @@ static unsigned murmur_hash2(const char *key, size_t len) { return h; } -__attribute__((visibility("default"))) int bl_udevmon_inject(const char *action, const char *devpath, +__attribute__((visibility("default"))) int dd_udevmon_inject(const char *action, const char *devpath, const char *subsystem, const char *devname, unsigned major, unsigned minor) { static unsigned long long seqnum = 900000; @@ -280,7 +280,7 @@ __attribute__((visibility("default"))) int bl_udevmon_inject(const char *action, return sent; } -__attribute__((visibility("hidden"))) int bl_udevmon_recvmsg(int fd, struct msghdr *msg, int flags, +__attribute__((visibility("hidden"))) int dd_udevmon_recvmsg(int fd, struct msghdr *msg, int flags, ssize_t (*real_recvmsg)(int, struct msghdr *, int), ssize_t *result) { if (!is_stand_in(fd)) return 0; diff --git a/tools/linuxfs/preload/usr2.c b/tools/linuxfs/preload/usr2.c index a7129fdc08..3a3cfd036f 100644 --- a/tools/linuxfs/preload/usr2.c +++ b/tools/linuxfs/preload/usr2.c @@ -28,7 +28,7 @@ static int find_ntdll(struct dl_phdr_info *info, size_t size, void *data) { return 0; } -__attribute__((visibility("hidden"))) int bl_from_ntdll(const void *caller) { +__attribute__((visibility("hidden"))) int dd_from_ntdll(const void *caller) { uintptr_t pc = (uintptr_t)caller, lo = __atomic_load_n(&ntdll_lo, __ATOMIC_ACQUIRE); if (!lo) { dl_iterate_phdr(find_ntdll, NULL); @@ -42,53 +42,53 @@ __attribute__((visibility("hidden"))) int bl_from_ntdll(const void *caller) { #include #include -#define BL_STR2(x) #x -#define BL_STR(x) BL_STR2(x) +#define DD_STR2(x) #x +#define DD_STR(x) DD_STR2(x) -#define BL_HWCAP_GCS (1UL << 32) -#define BL_FRAME_SIZE 4688 -#define BL_REGS 312 -#define BL_SP 560 -#define BL_PC 568 -#define BL_PSTATE 576 -#define BL_FPSIMD 592 +#define DD_HWCAP_GCS (1UL << 32) +#define DD_FRAME_SIZE 4688 +#define DD_REGS 312 +#define DD_SP 560 +#define DD_PC 568 +#define DD_PSTATE 576 +#define DD_FPSIMD 592 -struct bl_sigframe { +struct dd_sigframe { siginfo_t info; ucontext_t uc; }; -struct bl_kernel_sigaction { +struct dd_kernel_sigaction { void (*handler)(int, siginfo_t *, void *); unsigned long flags; void *restorer; uint64_t mask; }; -struct bl_usr2_call { +struct dd_usr2_call { void (*handler)(int, siginfo_t *, void *); uint64_t old_mask; }; -_Static_assert(sizeof(struct bl_sigframe) == BL_FRAME_SIZE, "rt_sigframe size"); -_Static_assert(offsetof(struct bl_sigframe, uc.uc_mcontext.regs) == BL_REGS, "regs offset"); -_Static_assert(offsetof(struct bl_sigframe, uc.uc_mcontext.sp) == BL_SP, "sp offset"); -_Static_assert(offsetof(struct bl_sigframe, uc.uc_mcontext.pc) == BL_PC, "pc offset"); -_Static_assert(offsetof(struct bl_sigframe, uc.uc_mcontext.pstate) == BL_PSTATE, "pstate offset"); -_Static_assert(offsetof(struct bl_sigframe, uc.uc_mcontext.__reserved) == BL_FPSIMD, "reserved offset"); +_Static_assert(sizeof(struct dd_sigframe) == DD_FRAME_SIZE, "rt_sigframe size"); +_Static_assert(offsetof(struct dd_sigframe, uc.uc_mcontext.regs) == DD_REGS, "regs offset"); +_Static_assert(offsetof(struct dd_sigframe, uc.uc_mcontext.sp) == DD_SP, "sp offset"); +_Static_assert(offsetof(struct dd_sigframe, uc.uc_mcontext.pc) == DD_PC, "pc offset"); +_Static_assert(offsetof(struct dd_sigframe, uc.uc_mcontext.pstate) == DD_PSTATE, "pstate offset"); +_Static_assert(offsetof(struct dd_sigframe, uc.uc_mcontext.__reserved) == DD_FPSIMD, "reserved offset"); _Static_assert(sizeof(struct fpsimd_context) + sizeof(struct _aarch64_ctx) <= sizeof(((mcontext_t *)0)->__reserved), "reserved space"); -__attribute__((visibility("hidden"))) void bl_usr2_frame(struct bl_usr2_call *call); -__attribute__((visibility("hidden"), used)) void bl_usr2_run(struct bl_usr2_call *call, struct bl_sigframe *frame); +__attribute__((visibility("hidden"))) void dd_usr2_frame(struct dd_usr2_call *call); +__attribute__((visibility("hidden"), used)) void dd_usr2_run(struct dd_usr2_call *call, struct dd_sigframe *frame); __asm__(".text\n" ".p2align 2\n" - ".type bl_usr2_frame, %function\n" - "bl_usr2_frame:\n" - " mov x16, #" BL_STR(BL_FRAME_SIZE) "\n" + ".type dd_usr2_frame, %function\n" + "dd_usr2_frame:\n" + " mov x16, #" DD_STR(DD_FRAME_SIZE) "\n" " sub sp, sp, x16\n" - " add x17, sp, #" BL_STR(BL_REGS) "\n" + " add x17, sp, #" DD_STR(DD_REGS) "\n" " stp x0, x1, [x17, #0]\n" " stp x2, x3, [x17, #16]\n" " stp x4, x5, [x17, #32]\n" @@ -107,12 +107,12 @@ __asm__(".text\n" " str x30, [x17, #240]\n" " str xzr, [x17, #0]\n" " add x16, sp, x16\n" - " str x16, [sp, #" BL_STR(BL_SP) "]\n" + " str x16, [sp, #" DD_STR(DD_SP) "]\n" " adr x16, 1f\n" - " str x16, [sp, #" BL_STR(BL_PC) "]\n" + " str x16, [sp, #" DD_STR(DD_PC) "]\n" " mrs x16, nzcv\n" - " str x16, [sp, #" BL_STR(BL_PSTATE) "]\n" - " add x17, sp, #" BL_STR(BL_FPSIMD) "\n" + " str x16, [sp, #" DD_STR(DD_PSTATE) "]\n" + " add x17, sp, #" DD_STR(DD_FPSIMD) "\n" " mrs x16, fpsr\n" " str w16, [x17, #8]\n" " mrs x16, fpcr\n" @@ -134,13 +134,13 @@ __asm__(".text\n" " stp q28, q29, [x17, #464]\n" " stp q30, q31, [x17, #496]\n" " mov x1, sp\n" - " bl bl_usr2_run\n" - " mov x8, #" BL_STR(__NR_rt_sigreturn) "\n" + " bl dd_usr2_run\n" + " mov x8, #" DD_STR(__NR_rt_sigreturn) "\n" " svc #0\n" " brk #0\n" "1:\n" " ret\n" - ".size bl_usr2_frame, .-bl_usr2_frame\n"); + ".size dd_usr2_frame, .-dd_usr2_frame\n"); static int (*usr2_real_raise)(int); @@ -160,7 +160,7 @@ static uint64_t usr2_ssbs(void) { return value & (1UL << 12); } -void bl_usr2_run(struct bl_usr2_call *call, struct bl_sigframe *frame) { +void dd_usr2_run(struct dd_usr2_call *call, struct dd_sigframe *frame) { struct fpsimd_context *fp = (struct fpsimd_context *)frame->uc.uc_mcontext.__reserved; struct _aarch64_ctx *end = (struct _aarch64_ctx *)(fp + 1); @@ -192,11 +192,11 @@ int raise(int sig) { real = (int (*)(int))dlsym(RTLD_NEXT, "raise"); __atomic_store_n(&usr2_real_raise, real, __ATOMIC_RELEASE); } - if (sig != SIGUSR2 || (getauxval(AT_HWCAP) & BL_HWCAP_GCS) || !bl_from_ntdll(__builtin_return_address(0))) { + if (sig != SIGUSR2 || (getauxval(AT_HWCAP) & DD_HWCAP_GCS) || !dd_from_ntdll(__builtin_return_address(0))) { return real(sig); } - struct bl_kernel_sigaction action; + struct dd_kernel_sigaction action; if (usr2_sys(__NR_rt_sigaction, SIGUSR2, 0, (long)&action, sizeof(action.mask)) != 0) return real(sig); if (!(action.flags & SA_SIGINFO) || (action.flags & SA_RESETHAND) || (uintptr_t)action.handler <= 1) { return real(sig); @@ -204,7 +204,7 @@ int raise(int sig) { uint64_t bit = 1ULL << (SIGUSR2 - 1); uint64_t block = action.mask | ((action.flags & SA_NODEFER) ? 0 : bit); - struct bl_usr2_call call = {action.handler, 0}; + struct dd_usr2_call call = {action.handler, 0}; if (usr2_sys(__NR_rt_sigprocmask, SIG_BLOCK, (long)&block, (long)&call.old_mask, sizeof(block)) != 0) { return real(sig); } @@ -212,7 +212,7 @@ int raise(int sig) { usr2_sys(__NR_rt_sigprocmask, SIG_SETMASK, (long)&call.old_mask, 0, sizeof(call.old_mask)); return real(sig); } - bl_usr2_frame(&call); + dd_usr2_frame(&call); return 0; } #endif diff --git a/tools/linuxfs/preload/vdec.c b/tools/linuxfs/preload/vdec.c index 9a0abbe504..7d3761e290 100644 --- a/tools/linuxfs/preload/vdec.c +++ b/tools/linuxfs/preload/vdec.c @@ -4,7 +4,7 @@ #include #include -#if defined(__aarch64__) || defined(BL_VDEC_ANY_ARCH) +#if defined(__aarch64__) || defined(DD_VDEC_ANY_ARCH) #include #include @@ -220,12 +220,12 @@ static int vd_have_ffmpeg(void) { return vd_ffmpeg > 0; } -__attribute__((visibility("hidden"))) int bl_venc_connect(void); +__attribute__((visibility("hidden"))) int dd_venc_connect(void); static int vd_enabled(void) { pthread_mutex_lock(&vd_lock); if (vd_state == 0) { - const char *flag = getenv("BL_REMOTE_PLAY_DECODE"), *socket = getenv("BL_VENC_SOCKET"); + const char *flag = getenv("DD_REMOTE_PLAY_DECODE"), *socket = getenv("DD_VENC_SOCKET"); vd_state = -1; if (strcmp(program_invocation_short_name, "streaming_client") == 0 && (flag == NULL || strcmp(flag, "0") != 0)) { vd_heap = open("/dev/dma_heap/system", O_RDONLY | O_CLOEXEC); @@ -245,7 +245,7 @@ static struct vdec *vd_find(int fd) { return NULL; } -__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { +__attribute__((visibility("hidden"))) int dd_vdec_open(const char *path, int flags) { (void)flags; if (path == NULL || strcmp(path, VDEC_DEVICE) != 0 || !vd_enabled()) return -2; int fd = memfd_create("droiddeck-vdec", 0); @@ -314,7 +314,7 @@ static void vd_send_capture(struct vdec *v, uint32_t index) { static int vd_open_hardware(struct vdec *v) { if (v->hw_failed) return -1; - int sock = bl_venc_connect(); + int sock = dd_venc_connect(); if (sock < 0) return -1; struct vdec_config c = { .type = VDEC_CONFIG, .codec = v->fourcc == V4L2_PIX_FMT_HEVC ? VENC_HEVC : VENC_H264, @@ -740,7 +740,7 @@ static int vd_ioctl(struct vdec *v, unsigned long req, void *arg) { } } -__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { +__attribute__((visibility("hidden"))) int dd_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { struct vdec *v = vd_find(fd); if (v == NULL) return 0; pthread_mutex_lock(&vd_lock); @@ -755,7 +755,7 @@ __attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long re return 1; } -__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { +__attribute__((visibility("hidden"))) void dd_vdec_closed(int fd) { struct vdec *v = vd_find(fd); if (v == NULL) return; pthread_mutex_lock(&vd_lock); @@ -768,7 +768,7 @@ __attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { pthread_mutex_unlock(&vd_lock); } -__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, +__attribute__((visibility("hidden"))) int dd_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(struct pollfd *, nfds_t, int), int *ret) { if (n != 1 || vd_find(fds[0].fd) == NULL) return 0; struct vdec *v = vd_find(fds[0].fd); @@ -949,13 +949,13 @@ void SDL_UnloadObject(void *handle) { #else -__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { +__attribute__((visibility("hidden"))) int dd_vdec_open(const char *path, int flags) { (void)path; (void)flags; return -2; } -__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { +__attribute__((visibility("hidden"))) int dd_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { (void)fd; (void)req; (void)arg; @@ -963,9 +963,9 @@ __attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long re return 0; } -__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { (void)fd; } +__attribute__((visibility("hidden"))) void dd_vdec_closed(int fd) { (void)fd; } -__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, +__attribute__((visibility("hidden"))) int dd_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(struct pollfd *, nfds_t, int), int *ret) { (void)fds; (void)n; diff --git a/tools/linuxfs/preload/venc.c b/tools/linuxfs/preload/venc.c index 92c60c3bff..63480b8146 100644 --- a/tools/linuxfs/preload/venc.c +++ b/tools/linuxfs/preload/venc.c @@ -115,14 +115,14 @@ static void vn_free_queue(struct vq *q) { memset(q, 0, sizeof *q); } -__attribute__((visibility("hidden"))) int bl_venc_streaming(void) { +__attribute__((visibility("hidden"))) int dd_venc_streaming(void) { return __atomic_load_n(&vn_open_count, __ATOMIC_ACQUIRE) > 0; } -__attribute__((visibility("hidden"))) int bl_venc_connect(void); +__attribute__((visibility("hidden"))) int dd_venc_connect(void); -int bl_venc_connect(void) { - const char *path = getenv("BL_VENC_SOCKET"); +int dd_venc_connect(void) { + const char *path = getenv("DD_VENC_SOCKET"); if (path == NULL || *path == '\0') return -1; struct sockaddr_un addr = { .sun_family = AF_UNIX }; if (strlen(path) >= sizeof addr.sun_path) return -1; @@ -138,10 +138,10 @@ int bl_venc_connect(void) { return fd; } -__attribute__((visibility("hidden"))) int bl_venc_open(const char *path, int flags) { +__attribute__((visibility("hidden"))) int dd_venc_open(const char *path, int flags) { (void)flags; if (path == NULL || strcmp(path, VENC_DEVICE) != 0) return -2; - int fd = bl_venc_connect(); + int fd = dd_venc_connect(); if (fd < 0) return -2; pthread_mutex_lock(&vn_lock); struct venc *v = NULL; @@ -546,7 +546,7 @@ static int vn_ioctl(struct venc *v, unsigned long req, void *arg) { } } -__attribute__((visibility("hidden"))) int bl_venc_ioctl(int fd, unsigned long req, void *arg, int *rc) { +__attribute__((visibility("hidden"))) int dd_venc_ioctl(int fd, unsigned long req, void *arg, int *rc) { struct venc *v = vn_find(fd); if (v == NULL) return 0; pthread_mutex_lock(&vn_lock); @@ -561,7 +561,7 @@ __attribute__((visibility("hidden"))) int bl_venc_ioctl(int fd, unsigned long re return 1; } -__attribute__((visibility("hidden"))) int bl_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, +__attribute__((visibility("hidden"))) int dd_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, void *(*real)(void *, size_t, int, int, int, off_t), void **out) { struct venc *v = vn_find(fd); if (v == NULL) return 0; @@ -579,7 +579,7 @@ __attribute__((visibility("hidden"))) int bl_venc_mmap(void *addr, size_t len, i return 1; } -__attribute__((visibility("hidden"))) void bl_venc_closed(int fd) { +__attribute__((visibility("hidden"))) void dd_venc_closed(int fd) { struct venc *v = vn_find(fd); if (v == NULL) return; pthread_mutex_lock(&vn_lock); @@ -623,14 +623,14 @@ static int vn_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(str return r + ready; } -__attribute__((weak, visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, +__attribute__((weak, visibility("hidden"))) int dd_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(struct pollfd *, nfds_t, int), int *ret); int poll(struct pollfd *fds, nfds_t n, int timeout_ms) { static int (*real)(struct pollfd *, nfds_t, int); if (!real) real = (int (*)(struct pollfd *, nfds_t, int))dlsym(RTLD_NEXT, "poll"); int ret; - if (bl_vdec_poll && bl_vdec_poll(fds, n, timeout_ms, real, &ret)) return ret; + if (dd_vdec_poll && dd_vdec_poll(fds, n, timeout_ms, real, &ret)) return ret; if (__atomic_load_n(&vn_open_count, __ATOMIC_ACQUIRE) == 0) return real(fds, n, timeout_ms); return vn_poll(fds, n, timeout_ms, real); } diff --git a/tools/linuxfs/preload/venus.c b/tools/linuxfs/preload/venus.c index aae9ebbec2..9f76ad9a73 100644 --- a/tools/linuxfs/preload/venus.c +++ b/tools/linuxfs/preload/venus.c @@ -14,7 +14,7 @@ extern char **environ; -__attribute__((constructor)) static void bl_venus_keep_kopper(void) { +__attribute__((constructor)) static void dd_venus_keep_kopper(void) { static const char name[] = "LIBGL_KOPPER_DISABLE="; const char *debug = getenv("VN_DEBUG"); if (!debug || !strstr(debug, "vtest") || !environ) return; diff --git a/tools/linuxfs/preload/webhelper.c b/tools/linuxfs/preload/webhelper.c index 7642a34632..81aba8e8a5 100644 --- a/tools/linuxfs/preload/webhelper.c +++ b/tools/linuxfs/preload/webhelper.c @@ -57,10 +57,10 @@ static char *const *chromium_argv(const char *path, char *const argv[]) { } __attribute__((visibility("hidden"))) -char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]) { +char *const *dd_webhelper_argv(const char *path, char *const argv[], char *const envp[]) { if (electron_node_mode(envp)) return argv; if (!is_webhelper_browser(path, argv)) return chromium_argv(path, argv); - const char *spec = getenv("BL_WEBHELPER_ARGS"); + const char *spec = getenv("DD_WEBHELPER_ARGS"); if (!spec || !*spec) spec = WEBHELPER_DEFAULT; if (!strcmp(spec, "stock")) return argv; diff --git a/tools/linuxfs/preload/writewatch.c b/tools/linuxfs/preload/writewatch.c index b804e3f39c..eb1810f172 100644 --- a/tools/linuxfs/preload/writewatch.c +++ b/tools/linuxfs/preload/writewatch.c @@ -18,7 +18,7 @@ static int ww_uffd = -1; static int scan_blocked; #endif -__attribute__((visibility("hidden"))) int bl_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) { +__attribute__((visibility("hidden"))) int dd_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) { #if defined(__aarch64__) && defined(PAGEMAP_SCAN) && defined(UFFD_USER_MODE_ONLY) if (number != WINE_ARM64_USERFAULTFD || (args[0] & ~(long)(O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY))) return 0; *rc = real(SYS_userfaultfd, args[0]); @@ -89,7 +89,7 @@ done: } #endif -__attribute__((visibility("hidden"))) int bl_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, +__attribute__((visibility("hidden"))) int dd_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) { #if defined(PAGEMAP_SCAN) && defined(UFFD_USER_MODE_ONLY) if (request != PAGEMAP_SCAN) return 0; diff --git a/tools/linuxfs/preload/xmode.c b/tools/linuxfs/preload/xmode.c index e6842d73ab..2d6d1c690b 100644 --- a/tools/linuxfs/preload/xmode.c +++ b/tools/linuxfs/preload/xmode.c @@ -15,7 +15,7 @@ typedef Atom (*intern_atom_fn)(Display *, const char *, Bool); static int following(void) { static int cached = -1; if (cached < 0) { - const char *v = getenv("BL_FOLLOW_OUTPUT"); + const char *v = getenv("DD_FOLLOW_OUTPUT"); cached = v && v[0] == '1'; } return cached; diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index e271668bea..177fe8efef 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -17,7 +17,7 @@ #define MADV_PAGEOUT 21 #endif #ifndef ZR_CTL -#define ZR_CTL "/tmp/.bl-zram" +#define ZR_CTL "/tmp/.dd-zram" #endif #define ZR_SWAPPED (1ULL << 62) #define ZR_BATCH 512 diff --git a/tools/mangoapp/mangoapp b/tools/mangoapp/mangoapp index 755a7e44da..deb44bbb0a 100644 --- a/tools/mangoapp/mangoapp +++ b/tools/mangoapp/mangoapp @@ -8,10 +8,10 @@ if [ "$(wc -l < "$starts")" -gt 5 ]; then echo "mangoapp: started $(wc -l < "$starts") times in 60 s; the performance overlay stays off for this session" >&2 exec sleep infinity fi -# The system PowerVR route (BL_POWERVR_RENDER_NODE): Zink could not make mangoapp a swapchain there +# The system PowerVR route (DD_POWERVR_RENDER_NODE): Zink could not make mangoapp a swapchain there # ("zink: could not create swapchain", then GLXBadCurrentWindow) and it crashed at every start. The # overlay is a few text lines: llvmpipe draws it. -if [ -n "${BL_POWERVR_RENDER_NODE:-}" ]; then +if [ -n "${DD_POWERVR_RENDER_NODE:-}" ]; then export GALLIUM_DRIVER=llvmpipe LIBGL_ALWAYS_SOFTWARE=1 unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 fi diff --git a/tools/nativeguest/hook/privileged.c b/tools/nativeguest/hook/privileged.c index 6b527ae4f3..7bf0a8b692 100644 --- a/tools/nativeguest/hook/privileged.c +++ b/tools/nativeguest/hook/privileged.c @@ -609,7 +609,7 @@ long syscall(long number, ...) { #ifdef __NR_close_range if (number == __NR_close_range) { - // libblsession's close_range() calls syscall() again: the nested call goes straight to the kernel + // libddsession's close_range() calls syscall() again: the nested call goes straight to the kernel if (t_syscall_redirect) return call_orig_syscall(number, arg1, arg2, arg3, 0, 0, 0); t_syscall_redirect++; long ret = (long)close_range((unsigned int)arg1, (unsigned int)arg2, (int)arg3); @@ -620,7 +620,7 @@ long syscall(long number, ...) { #ifdef __NR_openat2 if (number == __NR_openat2) { - // libblsession's openat2() calls syscall() again (an endless loop until the stack ran out): the nested + // libddsession's openat2() calls syscall() again (an endless loop until the stack ran out): the nested // call maps the path and goes straight to the kernel if (t_syscall_redirect) { char nested_buf[PATH_MAX]; diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index ebb7c9fda8..e7fc6d4adb 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -99,7 +99,7 @@ Added by DroidDeck: `get_robust_list`. proot still answers the first with `ENOSYS` but keeps the head each thread offered (cleared on `execve`, none in a new task), and answers the second for the calling thread with it. SteamVR's `vrclient.so` asks for the head through libc's `syscall()`, which - `libblsession.so`'s robust.c never sees: `libopenvr_api.so` opens it `RTLD_DEEPBIND`. Steam + `libddsession.so`'s robust.c never sees: `libopenvr_api.so` opens it `RTLD_DEEPBIND`. Steam aborted on "futex robust_list not initialized by pthreads" as soon as SteamVR was registered. - `0029-proc-pid-root-guest.patch` - `/proc//root` of a tracee resolved to the rootfs's host diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index e2c11b6d43..16d4c9342c 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -79,13 +79,13 @@ def required(): paths = ['assets/graphics_driver/adrenotools-turnip25.1.0-quest1.tzst'] paths += [f'assets/graphics_driver/adrenotools-{name}.tzst' for name in ['turnip26.3.0-a6xx', 'turnip26.3.0-quest2']] - paths += ['assets/linuxfs/' + name for name in ['libfakeinput.so', 'libblsession.so', - 'libblfastpath.so', 'libddnatv-hook.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', + paths += ['assets/linuxfs/' + name for name in ['libfakeinput.so', 'libddsession.so', + 'libddfastpath.so', 'libddnatv-hook.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', 'usr/local/bin/droiddeck-gog-maintenance', 'usr/local/bin/gamescope', 'usr/local/lib/droiddeck/uruntime', 'usr/local/lib/droiddeck-pipewire.tzst']] for arch in ['x86_64', 'i386']: - paths += ['assets/linuxfs/' + arch + '/' + lib for lib in ['libfakeinput.so', 'libblsession.so']] + paths += ['assets/linuxfs/' + arch + '/' + lib for lib in ['libfakeinput.so', 'libddsession.so']] paths += ['assets/linuxfs/x86_64/' + lib for lib in ['libfaultreport.so', 'libvulkan-thunk.so', 'libwebkitinput.so']] paths += ['assets/linuxfs/i386/libfaultreport.so'] diff --git a/tools/tests/drm_handles_test.c b/tools/tests/drm_handles_test.c index 08d337f55e..fc3e7fff33 100644 --- a/tools/tests/drm_handles_test.c +++ b/tools/tests/drm_handles_test.c @@ -110,8 +110,8 @@ static long fixture_syscall(long number, ...) { if (number == SYS_ioctl) { (void)va_arg(ap, int); unsigned long request = va_arg(ap, unsigned long); - struct bl_drm_version *v = va_arg(ap, void *); - assert(request == BL_DRM_VERSION); + struct dd_drm_version *v = va_arg(ap, void *); + assert(request == DD_DRM_VERSION); snprintf(v->name, v->name_len, "%s", driver_name); v->name_len = strlen(driver_name); va_end(ap); @@ -184,23 +184,23 @@ static void *stress_fallback_imports(void *opaque) { int main(void) { int drm = test_open("/dev/null"), dma = test_open("/dev/zero"); uint32_t handle = 0; - unsetenv("BL_POWERVR_DRM_HANDLES"); - setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1); + unsetenv("DD_POWERVR_DRM_HANDLES"); + setenv("DD_POWERVR_RENDER_NODE", pvr_node, 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); - setenv("BL_POWERVR_DRM_HANDLES", "yes", 1); + setenv("DD_POWERVR_DRM_HANDLES", "yes", 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); - setenv("BL_POWERVR_DRM_HANDLES", "1", 1); - unsetenv("BL_POWERVR_RENDER_NODE"); + setenv("DD_POWERVR_DRM_HANDLES", "1", 1); + unsetenv("DD_POWERVR_RENDER_NODE"); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* no selected node */ - setenv("BL_POWERVR_RENDER_NODE", "", 1); + setenv("DD_POWERVR_RENDER_NODE", "", 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); - setenv("BL_POWERVR_RENDER_NODE", "/dev/dri/renderD128", 1); + setenv("DD_POWERVR_RENDER_NODE", "/dev/dri/renderD128", 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* another GPU owns 128 */ - setenv("BL_POWERVR_RENDER_NODE", "/dev/dri/renderD130", 1); + setenv("DD_POWERVR_RENDER_NODE", "/dev/dri/renderD130", 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* selected node is absent */ - setenv("BL_POWERVR_RENDER_NODE", __FILE__, 1); + setenv("DD_POWERVR_RENDER_NODE", __FILE__, 1); assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* regular files are not DRM nodes */ - setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1); + setenv("DD_POWERVR_RENDER_NODE", pvr_node, 1); driver_name = "other"; assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); driver_name = "pvr"; @@ -253,7 +253,7 @@ int main(void) { assert(drmPrimeHandleToFD(separate, handle, O_CLOEXEC | O_RDWR, &out) != 0); struct gem_close close_request = {.handle = handle}; int rc = 123; - assert(bl_drm_gem_close(separate, GEM_CLOSE, &close_request, &rc) == 0 && rc == 123); + assert(dd_drm_gem_close(separate, GEM_CLOSE, &close_request, &rc) == 0 && rc == 123); assert(drmPrimeHandleToFD(alias, handle, O_CLOEXEC | O_RDWR, &out) == 0); assert(fcntl(out, F_GETFD) & FD_CLOEXEC); struct stat src, dst; @@ -274,7 +274,7 @@ int main(void) { assert(drmCloseBufferHandle(drm, handle) != 0); assert(drmPrimeHandleToFD(alias, handle, O_CLOEXEC, &out) == 0); fixture_close(out); - assert(bl_drm_gem_close(alias, GEM_CLOSE, &close_request, &rc) == 1 && rc == 0); + assert(dd_drm_gem_close(alias, GEM_CLOSE, &close_request, &rc) == 1 && rc == 0); assert(drmPrimeHandleToFD(alias, handle, O_CLOEXEC, &out) != 0); fixture_close(alias); fixture_close(separate); @@ -288,7 +288,7 @@ int main(void) { assert(drmPrimeHandleToFD(drm, handle, O_CLOEXEC, &out) == 0); fixture_close(out); close_request.handle = handle; - assert(bl_drm_gem_close(drm, GEM_CLOSE, &close_request, &rc) == 0); + assert(dd_drm_gem_close(drm, GEM_CLOSE, &close_request, &rc) == 0); assert(drmCloseBufferHandle(drm, handle) == 0); assert(native_imports && native_exports && native_closes); kernel_error = EINVAL; @@ -321,19 +321,19 @@ int main(void) { /* Preserve the original device layout when PowerVR owns renderD128. */ pvr_node = "/dev/dri/renderD128"; - setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1); + setenv("DD_POWERVR_RENDER_NODE", pvr_node, 1); assert(drmPrimeFDToHandle(drm, dma, &handle) == 0 && (handle & PVR_HANDLE_BIT)); assert(drmCloseBufferHandle(drm, handle) == 0); /* Retain the old KGSL path with the PowerVR opt-in unset. */ - unsetenv("BL_POWERVR_DRM_HANDLES"); + unsetenv("DD_POWERVR_DRM_HANDLES"); kgsl_present = 1; kgsl_state = 0; assert(drmPrimeFDToHandle(dma, drm, &handle) == 0 && !(handle & PVR_HANDLE_BIT)); assert(drmPrimeHandleToFD(dma, handle, O_CLOEXEC | O_RDWR, &out) == 0); fixture_close(out); close_request.handle = handle; - assert(bl_drm_gem_close(dma, GEM_CLOSE, &close_request, &rc) == 1 && rc == 0); + assert(dd_drm_gem_close(dma, GEM_CLOSE, &close_request, &rc) == 1 && rc == 0); assert(drmCloseBufferHandle(dma, handle) == -EINVAL); empty_table(); assert(count_fds() == baseline); diff --git a/tools/tests/netlink_stubs.c b/tools/tests/netlink_stubs.c index 58ba3bc61c..8cec065a2e 100644 --- a/tools/tests/netlink_stubs.c +++ b/tools/tests/netlink_stubs.c @@ -1,19 +1,19 @@ #include #include -int bl_nl_socket(int type, int *fd) { +int dd_nl_socket(int type, int *fd) { (void)type; *fd = -1; errno = ENOSYS; return 1; } -int bl_nl_owns(int fd) { +int dd_nl_owns(int fd) { (void)fd; return 0; } -int bl_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { +int dd_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { (void)fd; (void)addr; (void)len; @@ -21,20 +21,20 @@ int bl_nl_bind(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { return 0; } -int bl_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { - return bl_nl_bind(fd, addr, len, rc); +int dd_nl_connect(int fd, const struct sockaddr *addr, socklen_t len, int *rc) { + return dd_nl_bind(fd, addr, len, rc); } -int bl_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { +int dd_nl_getsockname(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { (void)len; - return bl_nl_bind(fd, addr, 0, rc); + return dd_nl_bind(fd, addr, 0, rc); } -int bl_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { - return bl_nl_getsockname(fd, addr, len, rc); +int dd_nl_getpeername(int fd, struct sockaddr *addr, socklen_t *len, int *rc) { + return dd_nl_getsockname(fd, addr, len, rc); } -int bl_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, +int dd_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t len, int (*real)(int, int, int, const void *, socklen_t), int *rc) { (void)fd; (void)level; @@ -46,7 +46,7 @@ int bl_nl_setsockopt(int fd, int level, int option, const void *value, socklen_t return 0; } -int bl_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, +int dd_nl_getsockopt(int fd, int level, int option, void *value, socklen_t *len, int (*real)(int, int, int, void *, socklen_t *), int *rc) { (void)fd; (void)level; diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 40c16bfcd4..cc92c78cc4 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -56,7 +56,7 @@ class StoreDebugEnvironmentTest(Temp): def env(self, values=None): debug_dir = self.tmp / "session" debug_dir.mkdir(exist_ok=True) - base = {"HOME": str(self.tmp), "BL_DEBUG_DIR": str(debug_dir)} + base = {"HOME": str(self.tmp), "DD_DEBUG_DIR": str(debug_dir)} base.update(values or {}) return base @@ -871,7 +871,7 @@ class OpenTest(Temp): self.alive.extend([(50, [str(client)]), (51, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"])]) started = [] with mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: started.append((cmd, kw)) or mock.Mock()), \ - mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}), \ + mock.patch.dict(os.environ, {"DD_DESKTOP": "1"}), \ mock.patch.dict(BNET, {"CACHE": str(self.tmp / "cache"), "acquire": lambda: self.fail("took the lock")}): self.assertIsNone(BNET["show"](self.root, wait=60, poll=0)) cmd, kw = started[0] @@ -1076,7 +1076,7 @@ class LaunchTest(Harness): self.install() pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") - with mock.patch.dict(os.environ, {"BL_WIDTH": "160", "BL_HEIGHT": "90"}), \ + with mock.patch.dict(os.environ, {"DD_WIDTH": "160", "DD_HEIGHT": "90"}), \ mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): self.assertTrue(BNET["wallpaper"](self.root)) self.assertTrue(BNET["wallpaper"](self.root)) @@ -1092,7 +1092,7 @@ class LaunchTest(Harness): self.install() pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") - with mock.patch.dict(os.environ, {"BL_WIDTH": "2560", "BL_HEIGHT": "1600"}), \ + with mock.patch.dict(os.environ, {"DD_WIDTH": "2560", "DD_HEIGHT": "1600"}), \ mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): self.assertTrue(BNET["wallpaper"](self.root)) image = pfx / "drive_c/users/steamuser/AppData/Local/DroidDeck/wallpaper-1152x720.bmp" @@ -1145,17 +1145,17 @@ class LaunchTest(Harness): sizes = {("1280", "720"): 96, ("1920", "1080"): 96, ("2400", "1504"): 120, ("2448", "1848"): 120, ("1080", "2400"): 96, ("3840", "2160"): 192, ("2560", "1600"): 120} for (width, height), want in sizes.items(): - with mock.patch.dict(os.environ, {"BL_WIDTH": width, "BL_HEIGHT": height}): + with mock.patch.dict(os.environ, {"DD_WIDTH": width, "DD_HEIGHT": height}): self.assertEqual(BNET["desktop_dpi"](), want, (width, height)) def test_battle_nets_desktop_scale_is_written_once_and_follows_the_size(self): self.install() pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) (pfx / "user.reg").write_text('WINE REGISTRY Version 2\n\n[Control Panel\\\\Desktop] 1\n"LogPixels"=dword:00000060\n') - with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720"}): + with mock.patch.dict(os.environ, {"DD_WIDTH": "1280", "DD_HEIGHT": "720"}): self.assertTrue(BNET["dpi"](self.root)) self.assertEqual((pfx / "user.reg").read_text().count("LogPixels"), 1) - with mock.patch.dict(os.environ, {"BL_WIDTH": "2448", "BL_HEIGHT": "1848"}): + with mock.patch.dict(os.environ, {"DD_WIDTH": "2448", "DD_HEIGHT": "1848"}): self.assertTrue(BNET["dpi"](self.root)) self.assertTrue(BNET["dpi"](self.root)) reg = (pfx / "user.reg").read_text() @@ -1206,10 +1206,10 @@ class LaunchTest(Harness): self.assertFalse(BNET["is_game"](argv)) def test_battle_net_shows_in_the_desktops_window_or_as_the_steam_launch(self): - with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "SteamGameId": "123"}): + with mock.patch.dict(os.environ, {"DD_DESKTOP": "1", "SteamGameId": "123"}): self.assertEqual(BNET["proton_options"](), ["--window"]) with mock.patch.dict(os.environ, {"SteamGameId": "11151176786366644224"}): - os.environ.pop("BL_DESKTOP", None) + os.environ.pop("DD_DESKTOP", None) self.assertEqual(BNET["proton_options"](), ["--game-id", "11151176786366644224"]) os.environ["SteamGameId"] = "0" self.assertEqual(BNET["proton_options"](), []) @@ -1220,32 +1220,32 @@ class LaunchTest(Harness): with open(gpu, "w") as out: out.write("#!/bin/sh\n") os.chmod(gpu, 0o755) - with mock.patch.dict(BNET, {"BIN": tmp}), mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}): - os.environ.pop("BL_DESKTOP_GPU", None) - os.environ.pop("BL_DESKTOP_GPU_CHILD", None) + with mock.patch.dict(BNET, {"BIN": tmp}), mock.patch.dict(os.environ, {"DD_DESKTOP": "1"}): + os.environ.pop("DD_DESKTOP_GPU", None) + os.environ.pop("DD_DESKTOP_GPU_CHILD", None) self.assertEqual(BNET["desktop_gpu"](), gpu) for choice in ("off", "0", "No", "false"): - os.environ["BL_DESKTOP_GPU"] = choice + os.environ["DD_DESKTOP_GPU"] = choice self.assertIsNone(BNET["desktop_gpu"]()) - os.environ["BL_DESKTOP_GPU"] = "on" - os.environ["BL_DESKTOP_GPU_CHILD"] = "1" + os.environ["DD_DESKTOP_GPU"] = "on" + os.environ["DD_DESKTOP_GPU_CHILD"] = "1" self.assertIsNone(BNET["desktop_gpu"]()) - os.environ.pop("BL_DESKTOP_GPU_CHILD") - os.environ["BL_DESKTOP"] = "0" + os.environ.pop("DD_DESKTOP_GPU_CHILD") + os.environ["DD_DESKTOP"] = "0" self.assertIsNone(BNET["desktop_gpu"]()) - os.environ["BL_DESKTOP"] = "1" + os.environ["DD_DESKTOP"] = "1" os.chmod(gpu, 0o644) self.assertIsNone(BNET["desktop_gpu"]()) def test_on_the_gpu_battle_net_fills_the_screen_instead_of_a_window(self): - with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "BL_DESKTOP_GPU_CHILD": "1", "BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): + with mock.patch.dict(os.environ, {"DD_DESKTOP": "1", "DD_DESKTOP_GPU_CHILD": "1", "DD_WIDTH": "1280", "DD_HEIGHT": "720", "SteamGameId": "0"}): self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) def test_under_gamescope_battle_net_gets_a_desktop_of_the_screens_size(self): - with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): - os.environ.pop("BL_DESKTOP", None) + with mock.patch.dict(os.environ, {"DD_WIDTH": "1280", "DD_HEIGHT": "720", "SteamGameId": "0"}): + os.environ.pop("DD_DESKTOP", None) self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) - os.environ["BL_DESKTOP"] = "1" + os.environ["DD_DESKTOP"] = "1" self.assertEqual(BNET["proton_options"](), ["--window"]) def test_the_library_comes_before_the_action(self): @@ -1263,7 +1263,7 @@ class LaunchTest(Harness): self.assertEqual(BNET["main"](argv), 2) self.assertEqual(BNET["main"](["launch", "Fen"]), 0) self.assertEqual(self.calls, [("launch", "Fen")]) - self.assertEqual(os.environ.get("BL_BATTLENET"), "1") + self.assertEqual(os.environ.get("DD_BATTLENET"), "1") class InstallGameTest(Harness): diff --git a/tools/tests/test_binfmt_preload.py b/tools/tests/test_binfmt_preload.py index 9966b28505..e207b5c9ca 100644 --- a/tools/tests/test_binfmt_preload.py +++ b/tools/tests/test_binfmt_preload.py @@ -107,7 +107,7 @@ class BinfmtPreloadTest(unittest.TestCase): def environment(self, desktop=True, **extra): env = {"PATH": "%s:/usr/bin:/bin" % self.dir, "LD_PRELOAD": str(self.library), "HANDLER_LOG": str(self.log)} if desktop: - env["BL_DESKTOP"] = "1" + env["DD_DESKTOP"] = "1" env.update(extra) return env @@ -192,21 +192,21 @@ class BinfmtPreloadTest(unittest.TestCase): tool = self.x86() for how in ("execve", "execvp"): self.log.unlink(missing_ok=True) - self.assertEqual(self.run_program(how, tool, "a", desktop=False, BL_BINFMT="1"), (7, "", ["--exec", str(tool), "a"])) + self.assertEqual(self.run_program(how, tool, "a", desktop=False, DD_BINFMT="1"), (7, "", ["--exec", str(tool), "a"])) self.log.unlink() - self.assertEqual(self.run_program("spawnp", "tool", "b", desktop=False, BL_BINFMT="1"), (0, "exit 7", ["--exec", str(tool), "b"])) + self.assertEqual(self.run_program("spawnp", "tool", "b", desktop=False, DD_BINFMT="1"), (0, "exit 7", ["--exec", str(tool), "b"])) def test_only_the_value_one_switches_the_hand_off_on(self): for value in ("0", "", "11", "yes"): with self.subTest(value=value): - self.assertEqual(self.run_program("execve", self.x86(), desktop=False, BL_BINFMT=value), (0, "", None)) + self.assertEqual(self.run_program("execve", self.x86(), desktop=False, DD_BINFMT=value), (0, "", None)) def test_the_desktop_hands_off_whatever_the_switch_says(self): tool = self.x86() for value in ("0", ""): with self.subTest(value=value): self.log.unlink(missing_ok=True) - self.assertEqual(self.run_program("execve", tool, BL_BINFMT=value), (7, "", ["--exec", str(tool)])) + self.assertEqual(self.run_program("execve", tool, DD_BINFMT=value), (7, "", ["--exec", str(tool)])) def script_child(self, *lines, **extra): script = self.file("start.sh", ("#!/bin/bash\ncd \"${0%%/*}\"\n%s\n" % "\n".join(lines)).encode()) @@ -216,15 +216,15 @@ class BinfmtPreloadTest(unittest.TestCase): @unittest.skipUnless(os.path.exists("/bin/bash"), "needs bash") def test_an_x86_program_a_native_script_runs_goes_to_the_handler(self): tool = self.x86() - self.assertEqual(self.script_child("./tool one", "echo after $?", desktop=False, BL_BINFMT="1"), + self.assertEqual(self.script_child("./tool one", "echo after $?", desktop=False, DD_BINFMT="1"), (0, "after 7", ["--exec", "./tool", "one"])) self.log.unlink() - self.assertEqual(self.script_child("exec ./tool two", desktop=False, BL_BINFMT="1"), (7, "", ["--exec", str(tool), "two"])) + self.assertEqual(self.script_child("exec ./tool two", desktop=False, DD_BINFMT="1"), (7, "", ["--exec", str(tool), "two"])) @unittest.skipUnless(os.path.exists("/bin/bash"), "needs bash") def test_native_children_of_a_script_run_as_themselves(self): self.file("child.sh", b"#!/bin/sh\nexit 5\n") - self.assertEqual(self.script_child("./child.sh", "echo $?", desktop=False, BL_BINFMT="1"), (0, "5", None)) + self.assertEqual(self.script_child("./child.sh", "echo $?", desktop=False, DD_BINFMT="1"), (0, "5", None)) @unittest.skipUnless(os.path.exists("/bin/bash"), "needs bash") def test_outside_the_desktop_and_script_runs_a_scripts_children_are_untouched(self): @@ -242,7 +242,7 @@ class ScriptRunTest(unittest.TestCase): (tmp / "app/entry").write_text("go.sh") if fex: (tmp / "app/fex").write_text(fex) - (tmp / "app/files/go.sh").write_text("#!/bin/bash\necho \"${BL_BINFMT-unset} ${BL_DESKTOP-unset}\"\n") + (tmp / "app/files/go.sh").write_text("#!/bin/bash\necho \"${DD_BINFMT-unset} ${DD_DESKTOP-unset}\"\n") runner = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-script-run" base = {"PATH": "/usr/bin:/bin", "DBUS_SESSION_BUS_ADDRESS": "unix:path=/nonexistent"} done = subprocess.run(["/bin/bash", str(runner), str(tmp / "app")], stdout=subprocess.PIPE, text=True, timeout=60, @@ -251,12 +251,12 @@ class ScriptRunTest(unittest.TestCase): def test_a_script_run_switches_the_hand_off_on_for_its_children_only(self): self.assertEqual(self.run_app({}), (0, "1 unset")) - self.assertEqual(self.run_app({"BL_BINFMT": "0", "BL_DESKTOP": "1"}), (0, "1 1")) + self.assertEqual(self.run_app({"DD_BINFMT": "0", "DD_DESKTOP": "1"}), (0, "1 1")) self.assertEqual(self.run_app({}, fex="on"), (0, "1 unset")) def test_fex_off_keeps_x86_children_away_from_the_hand_off(self): self.assertEqual(self.run_app({}, fex="off"), (0, "unset unset")) - self.assertEqual(self.run_app({"BL_BINFMT": "1"}, fex="off"), (0, "unset unset")) + self.assertEqual(self.run_app({"DD_BINFMT": "1"}, fex="off"), (0, "unset unset")) if __name__ == "__main__": diff --git a/tools/tests/test_cdp_guard.py b/tools/tests/test_cdp_guard.py index 8185abed8a..9dc5891f36 100644 --- a/tools/tests/test_cdp_guard.py +++ b/tools/tests/test_cdp_guard.py @@ -19,7 +19,7 @@ class CdpGuardTest(unittest.TestCase): subprocess.run(["cc", "-shared", "-fPIC", "-O2", str(SOURCE), str(SOURCE.parent / "binfmt.c"), str(SOURCE.parent / "webhelper.c"), str(Path(__file__).with_name("netlink_stubs.c")), "-x", "c", "-", "-ldl", "-o", str(cls.library)], - input=b"int bl_udevmon_stand_in(int fd) { return 0; }", check=True, capture_output=True) + input=b"int dd_udevmon_stand_in(int fd) { return 0; }", check=True, capture_output=True) @classmethod def tearDownClass(cls): @@ -37,7 +37,7 @@ class CdpGuardTest(unittest.TestCase): return s.getsockname()[1] def env(self, port): - return dict(os.environ, LD_PRELOAD=str(self.library), BL_CDP_GUARD=str(port), BL_SYSV_DIR=self.temp.name) + return dict(os.environ, LD_PRELOAD=str(self.library), DD_CDP_GUARD=str(port), DD_SYSV_DIR=self.temp.name) def test_guarded_ipv4_bind_is_loopback_only(self): port = self.port() diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index bcc5e4768b..4a69f47ed7 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -37,8 +37,8 @@ class ClientZramFocusTest(unittest.TestCase): task(5000014, ['/e/WebKitWebProcess', '4'], ['DROIDDECK_EPIC_HIDDEN=1']) task(5000015, [fex, '/e/usr/bin/EpicGamesLauncher'], ['DROIDDECK_EPIC_HIDDEN=10']) task(5000016, ['/s/reaper', 'SteamLaunch', 'AppId=413150', '--', 'game']) - source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') - result = run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game|$_bl_apps"') + source = function_source('dd_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + result = run_bash(source + '\ndd_zram_scan\necho "${_dd_pids[*]}|${_dd_others[*]}|$_dd_game|$_dd_apps"') self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) self.assertEqual('5000010 5000011 5000012|5000013 5000014 5000015|1| 413150', result.stdout.strip()) @@ -47,8 +47,8 @@ class ClientZramFocusTest(unittest.TestCase): 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"') + source = function_source('dd_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + return run_bash(source + '\ndd_zram_scan\necho "${_dd_pids[*]}|${_dd_others[*]}|$_dd_game"') def test_battlenet_is_compressed_with_the_client_while_one_of_its_games_runs(self): launcher = [ @@ -80,25 +80,25 @@ class ClientZramFocusTest(unittest.TestCase): def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): source = SCRIPT.read_text() - start = source.index(' _bl_focus=1\n') - stop = source.index(' bl_watch_nap\n', start) + start = source.index(' _dd_focus=1\n') + stop = source.index(' dd_watch_nap\n', start) body = source[start:stop] harness = ''' -_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_unpack=0 _bl_apps=" 413150" -_bl_pids=(123) -bl_game_focused() { [ "$focused" = 1 ]; } -bl_over_cap() { return 1; } -bl_client_can_pageout() { return 0; } -bl_client_can_readback() { return 0; } -bl_zram_send() { echo "send:$1"; } +_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 _bl_game=$2 focused=$3 + SECONDS=$1 _dd_game=$2 focused=$3 ''' + body + ''' } tick 0 1 1 tick 5 1 0 tick 30 1 1 -echo "refocus:$_bl_packed" +echo "refocus:$_dd_packed" tick 49 1 1 tick 50 1 1 tick 55 1 0 @@ -111,31 +111,31 @@ tick 60 0 0 def monitor_harness(self): source = SCRIPT.read_text() - start = source.index(' bl_zram_scan\n bl_memory_read\n') - stop = source.index(' bl_watch_nap\n', start) + start = source.index(' dd_zram_scan\n dd_memory_read\n') + stop = source.index(' dd_watch_nap\n', start) return ''' -_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 -_bl_apps=" 413150" -_bl_pids=(123) +_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) step() { :; } -bl_zram_scan() { :; } -bl_memory_read() { :; } -bl_client_pressure() { :; } -bl_client_pressure_finish() { :; } -bl_session_pressure() { :; } -bl_client_can_pageout() { return 0; } -bl_client_can_readback() { [ "${readback:-1}" = 1 ]; } -bl_game_focused() { [ "$focused" = 1 ] && return 0; [ "$focused" = 2 ] && return 2; return 1; } -bl_cap_due() { [ "$cap_due" = 1 ]; } -bl_over_cap() { [ "$over_cap" = 1 ]; } -bl_zram_send() { echo "send:$1:$3"; } +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 _bl_game=$2 focused=$3 over_cap=$4 cap_due=$5 + SECONDS=$1 _dd_game=$2 focused=$3 over_cap=$4 cap_due=$5 ''' + source[start:stop] + '\n}\n' def test_client_toggle_still_disables_automatic_compression(self): result = run_bash(self.monitor_harness() + ''' -BL_ZRAM_CLIENT=0 +DD_ZRAM_CLIENT=0 tick 0 1 1 0 0 tick 25 1 1 0 0 tick 30 0 0 0 0 @@ -147,10 +147,10 @@ tick 30 0 0 0 0 def test_a_new_game_restarts_the_compression_delay(self): result = run_bash(self.monitor_harness() + ''' tick 0 1 1 0 0 -_bl_apps=" 413150 1245620" +_dd_apps=" 413150 1245620" tick 15 1 1 0 0 tick 20 1 1 0 0 -echo "starting:$_bl_packed" +echo "starting:$_dd_packed" tick 34 1 1 0 0 tick 35 1 1 0 0 ''') @@ -160,10 +160,10 @@ tick 35 1 1 0 0 def test_ram_cap_can_still_compress_an_unfocused_client(self): result = run_bash(self.monitor_harness() + ''' -BL_ZRAM_CLIENT=0 BL_RAM_CAP_MB=1024 -bl_zram_usage() { _bl_rss=$((768 * 1024)); } +DD_ZRAM_CLIENT=0 DD_RAM_CAP_MB=1024 +dd_zram_usage() { _dd_rss=$((768 * 1024)); } tick 0 1 0 1 1 -echo "cap:$_bl_packed:$_bl_since:$_bl_backoff" +echo "cap:$_dd_packed:$_dd_since:$_dd_backoff" tick 5 0 0 0 0 ''') self.assertEqual(0, result.returncode, result.stderr) @@ -176,9 +176,9 @@ 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:$_bl_unpack:$_bl_packed" +echo "deferred:$_dd_unpack:$_dd_packed" tick 35 0 0 0 0 -echo "restored:$_bl_unpack" +echo "restored:$_dd_unpack" ''') self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) @@ -190,10 +190,10 @@ tick 0 1 1 0 0 tick 20 1 1 0 0 readback=0 tick 25 0 0 0 0 -echo "deferred:$_bl_unpack" +echo "deferred:$_dd_unpack" readback=1 tick 30 0 0 0 0 -echo "restored:$_bl_unpack" +echo "restored:$_dd_unpack" """) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) @@ -204,14 +204,14 @@ echo "restored:$_bl_unpack" tick 0 1 1 0 0 tick 20 1 1 0 0 tick 25 1 0 0 0 -echo "away:$_bl_packed" +echo "away:$_dd_packed" tick 30 1 0 0 0 -echo "read:$_bl_packed:$_bl_unpack" +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:$_bl_packed" +echo "again:$_dd_packed" tick 65 0 0 0 0 ''') self.assertEqual(0, result.returncode, result.stderr) @@ -225,14 +225,14 @@ 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:$_bl_packed:$_bl_unpack" +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:$_bl_packed" +echo "flicker:$_dd_packed" tick 57 1 0 0 0 -echo "read:$_bl_packed" +echo "read:$_dd_packed" tick 60 0 2 0 0 ''') self.assertEqual(0, result.returncode, result.stderr) @@ -248,7 +248,7 @@ 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:$_bl_packed" +echo "packed:$_dd_packed" ''') self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) @@ -261,16 +261,16 @@ tick 20 1 1 0 0 readback=0 tick 25 1 0 0 0 tick 35 1 0 0 0 -echo "tight:$_bl_packed" +echo "tight:$_dd_packed" readback=1 tick 40 1 0 0 0 -echo "eased:$_bl_packed" -_bl_ram_cap=1048576 +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:$_bl_packed" +echo "capped:$_dd_packed" tick 105 0 0 0 0 ''') self.assertEqual(0, result.returncode, result.stderr) @@ -280,7 +280,7 @@ tick 105 0 0 0 0 def test_client_in_front_without_compression_reads_nothing_back(self): result = run_bash(self.monitor_harness() + ''' -BL_ZRAM_CLIENT=0 +DD_ZRAM_CLIENT=0 tick 0 1 1 0 0 tick 25 1 0 0 0 tick 40 1 0 0 0 @@ -299,18 +299,18 @@ tick 45 0 0 0 0 self.write_cmd(root, 30, ['/home/deck/.local/share/Steam/steamrtarm64/steam']) self.write_cmd(root, 40, ['/usr/bin/wine', 'game.exe']) self.write_cmd(root, 50, ['/usr/bin/FEXInterpreter', '/usr/bin/steamwebhelper']) - 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[*]}"\necho "others=${_bl_others[*]}"' % (root, scan)) + scan = function_source('dd_zram_scan').replace('for _d in /proc/[0-9]*', 'for _d in "$FAKE"/[0-9]*') + result = run_bash('FAKE=%s\n%s\ndd_zram_scan\necho "game=$_dd_game"\necho "apps=${_dd_apps# }"\necho "pids=${_dd_pids[*]}"\necho "others=${_dd_others[*]}"' % (root, scan)) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual(['game=1', 'apps=1245620', 'pids=30 50', 'others=40'], result.stdout.splitlines()) def test_focus_must_be_the_running_game(self): - focus = function_source('bl_game_focused') + focus = function_source('dd_game_focused') script = ''' %s check() { - BL_DESKTOP=$1 BL_LAUNCH_DIR=$2 _bl_apps=$3 - bl_game_focused + DD_DESKTOP=$1 DD_LAUNCH_DIR=$2 _dd_apps=$3 + dd_game_focused echo $? } check "" "$dir" " 413150" diff --git a/tools/tests/test_clock_pause_preload.py b/tools/tests/test_clock_pause_preload.py index 06ddd65a49..3d3f0dd76b 100644 --- a/tools/tests/test_clock_pause_preload.py +++ b/tools/tests/test_clock_pause_preload.py @@ -15,12 +15,12 @@ PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" def clock_reset_command(control): script = (PRELOAD.parent / "overlay/usr/local/bin/droiddeck-session").read_text() - start = script.index('if [ -z "${BL_INSIDE:-}" ]; then\n if [ "${BL_ZRAM:-0}"') + start = script.index('if [ -z "${DD_INSIDE:-}" ]; then\n if [ "${DD_ZRAM:-0}"') end = script.index("\nfi", start) + len("\nfi") - paths = {"/tmp/.bl-clock": shlex.quote(str(control)), - "/tmp/.bl-zram": shlex.quote(str(control.parent / "zram"))} + paths = {"/tmp/.dd-clock": shlex.quote(str(control)), + "/tmp/.dd-zram": shlex.quote(str(control.parent / "zram"))} pattern = "|".join(re.escape(token) for token in paths) - return 'BL_INSIDE=; BL_ZRAM=0; ' + re.sub(pattern, lambda match: paths[match.group(0)], script[start:end]) + return 'DD_INSIDE=; DD_ZRAM=0; ' + re.sub(pattern, lambda match: paths[match.group(0)], script[start:end]) PROGRAM = r""" #define _GNU_SOURCE @@ -120,8 +120,8 @@ class ClockPausePreloadTest(unittest.TestCase): build = cls.dir / "build" build.mkdir() (build / "program.c").write_text(PROGRAM) - cls.preload = build / "libblsession.so" - subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DBL_CLOCK_ANY_ARCH", + cls.preload = build / "libddsession.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DDD_CLOCK_ANY_ARCH", '-DCP_CTL="%s"' % cls.control, "-o", str(cls.preload), *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) cls.shell = build / "plasmashell" @@ -259,7 +259,7 @@ class ClockResetCommandTest(unittest.TestCase): def test_reset_does_not_rewrite_placeholders_inside_substituted_paths(self): with tempfile.TemporaryDirectory() as directory: root = Path(directory) - folder = root / "tmp/.bl-zram/$(touch injected)" + folder = root / "tmp/.dd-zram/$(touch injected)" folder.mkdir(parents=True) control = folder / "clock" control.write_bytes(struct.pack(" /dev/null; echo "$_bl_rss:$_bl_anon:$_bl_swap"') + 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()) diff --git a/tools/tests/test_netlink_preload.py b/tools/tests/test_netlink_preload.py index aedbdbd733..7c47c971f9 100644 --- a/tools/tests/test_netlink_preload.py +++ b/tools/tests/test_netlink_preload.py @@ -1107,7 +1107,7 @@ class NetlinkPreloadTest(unittest.TestCase): def setUpClass(cls): cls.temp = tempfile.TemporaryDirectory() cls.directory = Path(cls.temp.name) - cls.preload = cls.directory / "libblsession.so" + cls.preload = cls.directory / "libddsession.so" cls.shim = cls.directory / "libshim.so" cls.program = cls.directory / "program" (cls.directory / "shim.c").write_text(SHIM) @@ -1132,7 +1132,7 @@ class NetlinkPreloadTest(unittest.TestCase): def run_program(self, mode, *arguments, snapshot=None): env = dict(os.environ, LD_PRELOAD=f"{self.preload}:{self.shim}", NETLINK_TEST_SNAPSHOT=str(snapshot or self.snapshot), - BL_SYSV_DIR=str(self.directory / "sysv")) + DD_SYSV_DIR=str(self.directory / "sysv")) result = subprocess.run([str(self.program), mode, *arguments], env=env, capture_output=True, text=True, timeout=5) self.assertEqual(0, result.returncode, result.stdout + result.stderr) @@ -1280,7 +1280,7 @@ class NetlinkPreloadTest(unittest.TestCase): def test_iproute2_dumps_and_lookups_accept_the_replies(self): env = dict(os.environ, LD_PRELOAD=f"{self.preload}:{self.shim}", NETLINK_TEST_SNAPSHOT=str(self.snapshot), - BL_SYSV_DIR=str(self.directory / "sysv")) + DD_SYSV_DIR=str(self.directory / "sysv")) queries = ((["link", "show"], "wlan0"), (["link", "show", "wlan0"], "wlan0"), (["-d", "link", "show", "dev", "wlan0"], "wlan0"), diff --git a/tools/tests/test_ntsync_preload.py b/tools/tests/test_ntsync_preload.py index a2c50a7d68..52d7666a64 100644 --- a/tools/tests/test_ntsync_preload.py +++ b/tools/tests/test_ntsync_preload.py @@ -549,20 +549,20 @@ class NtsyncPreloadTest(unittest.TestCase): (tmp / "ntdll.c").write_text(NTDLL) (tmp / "prog.c").write_text(PROGRAM) sources = sorted(str(p) for p in PRELOAD.glob("*.c")) - subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libblsession.so"), *sources, "-ldl"], + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libddsession.so"), *sources, "-ldl"], check=True) subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(tmp / "ntdll.so"), str(tmp / "ntdll.c")], check=True) subprocess.run(["cc", "-O1", "-pthread", "-o", str(tmp / "prog"), str(tmp / "prog.c"), str(tmp / "ntdll.so"), "-Wl,-rpath," + str(tmp)], check=True) cls.program = tmp / "prog" - cls.preload = tmp / "libblsession.so" + cls.preload = tmp / "libddsession.so" @classmethod def tearDownClass(cls): cls.tmp.cleanup() def run_program(self): - env = dict(os.environ, LD_PRELOAD=str(self.preload), BL_SYNC="1") + env = dict(os.environ, LD_PRELOAD=str(self.preload), DD_SYNC="1") return subprocess.run([str(self.program)], env=env, capture_output=True, text=True, timeout=90) def test_emulation_matches_the_ntsync_driver(self): diff --git a/tools/tests/test_oom_adj_preload.py b/tools/tests/test_oom_adj_preload.py index f6fc25ce16..896c87b274 100644 --- a/tools/tests/test_oom_adj_preload.py +++ b/tools/tests/test_oom_adj_preload.py @@ -8,9 +8,9 @@ SOURCE = Path(__file__).resolve().parents[1] / "linuxfs/preload/oomadj.c" PROGRAM = r""" #include -const char *bl_oom_adj_redirect(const char *path, int writing); +const char *dd_oom_adj_redirect(const char *path, int writing); int main(int argc, char **argv) { - for (int i = 1; i + 1 < argc; i += 2) printf("%s\n", bl_oom_adj_redirect(argv[i + 1], argv[i][0] == 'w')); + for (int i = 1; i + 1 < argc; i += 2) printf("%s\n", dd_oom_adj_redirect(argv[i + 1], argv[i][0] == 'w')); return 0; } """ diff --git a/tools/tests/test_openat2_preload.py b/tools/tests/test_openat2_preload.py index cbaefaab24..81b18da8ba 100644 --- a/tools/tests/test_openat2_preload.py +++ b/tools/tests/test_openat2_preload.py @@ -329,12 +329,12 @@ class Openat2PreloadTest(unittest.TestCase): counter = cls.tmp / "counter.c" counter.write_text(COUNTER) (cls.tmp / "fp").mkdir() - subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-o", str(cls.tmp / "fp/libblfastpath.so"), + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-o", str(cls.tmp / "fp/libddfastpath.so"), str(counter), "-ldl"], check=True) tree = cls.tmp / "counted" make_tree(tree, cls.outside) counted = subprocess.run([str(cls.tmp / "openat2"), str(tree), str(tree)], input=cases, capture_output=True, - text=True, env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libblfastpath.so")), + text=True, env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libddfastpath.so")), timeout=60) if counted.returncode != 0: raise AssertionError(counted.stdout + counted.stderr) @@ -345,7 +345,7 @@ class Openat2PreloadTest(unittest.TestCase): subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "raw_open"), str(raw)], check=True) cls.raw = subprocess.run([str(cls.tmp / "raw_open"), str(tree / "etc/hostname"), str(tree / "missing")], capture_output=True, text=True, timeout=60, - env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libblfastpath.so"))) + env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libddfastpath.so"))) lookup = cls.tmp / "raw_lookup.c" lookup.write_text(RAW_LOOKUP) subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "raw_lookup"), str(lookup)], check=True) @@ -353,16 +353,16 @@ class Openat2PreloadTest(unittest.TestCase): cls.lookup_plain = subprocess.run([str(cls.tmp / "raw_lookup"), *cls.lookup_args], capture_output=True, text=True, timeout=60, env=dict(os.environ, LD_PRELOAD=str(cls.lib))) cls.lookup = subprocess.run([str(cls.tmp / "raw_lookup"), *cls.lookup_args], capture_output=True, text=True, timeout=60, - env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libblfastpath.so"))) + env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libddfastpath.so"))) (cls.tmp / "real").mkdir() subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-o", - str(cls.tmp / "real/libblfastpath.so"), str(FASTPATH), "-ldl"], check=True) + str(cls.tmp / "real/libddfastpath.so"), str(FASTPATH), "-ldl"], check=True) shutil.copy(cls.tmp / "raw_open", cls.tmp / "FEX") try: cls.fex = subprocess.run([str(cls.tmp / "FEX"), str(tree / "etc/hostname"), str(tree / "missing")], capture_output=True, text=True, timeout=20, env=dict(os.environ, PROOT_FP_ROOT="/", PROOT_FP_KEY="test", - LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libblfastpath.so"))) + LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libddfastpath.so"))) except subprocess.TimeoutExpired: cls.fex = None wrapper = cls.tmp / "wrapper.c" @@ -376,7 +376,7 @@ class Openat2PreloadTest(unittest.TestCase): try: cls.fex_lookup = subprocess.run([str(cls.tmp / "fex-lookup/FEX"), *cls.lookup_args], capture_output=True, text=True, timeout=20, env=dict(os.environ, PROOT_FP_ROOT="/", PROOT_FP_KEY="test", - LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libblfastpath.so"))) + LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libddfastpath.so"))) except subprocess.TimeoutExpired: cls.fex_lookup = None diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py index 2d0ee01642..41c8dd8327 100644 --- a/tools/tests/test_preload_snapshots.py +++ b/tools/tests/test_preload_snapshots.py @@ -123,7 +123,7 @@ class PreloadSnapshotTest(unittest.TestCase): def test_forged_binary_hash_cannot_prove_main_origin(self): data = copy.deepcopy(self.data) - data['outputs']['libblsession.so'] = 'f' * 64 + data['outputs']['libddsession.so'] = 'f' * 64 with patch.object(snapshots, 'artifact_bytes', return_value=self.binaries): with self.assertRaisesRegex(ValueError, 'original main APK'): snapshots.prove_origin(data, self.root / 'cache', self.root) @@ -179,7 +179,7 @@ class PreloadSnapshotTest(unittest.TestCase): snapshots.unpack(self.content + b'tampered', self.data) def test_missing_duplicate_or_traversal_entries_are_rejected(self): - for files in ({}, {'../escaped': b'bad'}, {'libblsession.so': b'wrong'}): + for files in ({}, {'../escaped': b'bad'}, {'libddsession.so': b'wrong'}): content = archive(files) data = dict(self.data, archive_sha256=snapshots.sha(content)) with self.subTest(names=list(files)), self.assertRaises(ValueError): diff --git a/tools/tests/test_session_cpu.py b/tools/tests/test_session_cpu.py index a5d741d16e..30bbea60a7 100644 --- a/tools/tests/test_session_cpu.py +++ b/tools/tests/test_session_cpu.py @@ -24,7 +24,7 @@ cat() { ''' paths = ' '.join(f'/sys/devices/system/cpu/cpu{i}/cpufreq/cpuinfo_max_freq' for i in range(8)) function = function.replace('/sys/devices/system/cpu/cpu[0-9]*/cpufreq/cpuinfo_max_freq', paths) - env = dict(os.environ, mode=mode, BL_GAME_CPUS=cpus, BL_PIN_CORES=pin) + env = dict(os.environ, mode=mode, DD_GAME_CPUS=cpus, DD_PIN_CORES=pin) result = subprocess.run(['bash', '-c', script + function + '\nprogram_cores\n'], env=env, capture_output=True, text=True, timeout=10) self.assertEqual(0, result.returncode, result.stderr) diff --git a/tools/tests/test_session_cursor_routing.py b/tools/tests/test_session_cursor_routing.py index dd2c77d944..05974b0cc2 100644 --- a/tools/tests/test_session_cursor_routing.py +++ b/tools/tests/test_session_cursor_routing.py @@ -7,7 +7,7 @@ import unittest SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' SOURCE = SESSION.read_text() MATCH = re.search( - r'^ if \[ "\$mode" = steam \] && \[ "\$\{BL_CURSOR_COMPOSITE:-0\}" = 1 \]; then\n.*?^ fi\n', + r'^ if \[ "\$mode" = steam \] && \[ "\$\{DD_CURSOR_COMPOSITE:-0\}" = 1 \]; then\n.*?^ fi\n', SOURCE, re.M | re.S) assert MATCH is not None CURSOR_SETUP = MATCH.group(0) @@ -21,9 +21,9 @@ class SessionCursorRoutingTest(unittest.TestCase): else: env.pop('gamescope_cursor_composite', None) if composite is not None: - env['BL_CURSOR_COMPOSITE'] = composite + env['DD_CURSOR_COMPOSITE'] = composite else: - env.pop('BL_CURSOR_COMPOSITE', None) + env.pop('DD_CURSOR_COMPOSITE', None) result = subprocess.run( ['bash', '-c', CURSOR_SETUP + 'printf "%s\n" "${gamescope_cursor_composite-}"'], env=env, text=True, capture_output=True, check=True) diff --git a/tools/tests/test_session_log.py b/tools/tests/test_session_log.py index 19dbb27165..1bfe0409e6 100644 --- a/tools/tests/test_session_log.py +++ b/tools/tests/test_session_log.py @@ -20,7 +20,7 @@ class SessionLogTest(unittest.TestCase): self.log = self.tmp / "session.log" def run_session(self, body, cap=None): - script = "BL_LOG=%s\n%s%s\n%s\n" % (self.log, "BL_LOG_CAP=%d\n" % cap if cap else "", log_redirect(), body) + script = "DD_LOG=%s\n%s%s\n%s\n" % (self.log, "DD_LOG_CAP=%d\n" % cap if cap else "", log_redirect(), body) subprocess.run(["bash", "-c", script], timeout=30, check=False) def test_the_last_lines_survive_the_writer_being_killed(self): diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py index 67b616669c..6b64810340 100644 --- a/tools/tests/test_session_pacing.py +++ b/tools/tests/test_session_pacing.py @@ -11,12 +11,12 @@ SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/d class SessionPacingTest(unittest.TestCase): def launch(self, refresh, **overrides): source = SESSION.read_text() - start = source.index(' width=${BL_WIDTH:-1280}') - end = source.index('\nfi\n\nbl_displays()', start) + start = source.index(' width=${DD_WIDTH:-1280}') + end = source.index('\nfi\n\ndd_displays()', start) block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub') with tempfile.TemporaryDirectory() as directory: - env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH=str(refresh), - BL_MANGOAPP='0', BL_FPS='0', DROIDDECK_GAME_FRAME_LIMIT='0') + env = dict(os.environ, XDG_RUNTIME_DIR=directory, DD_REFRESH=str(refresh), + DD_MANGOAPP='0', DD_FPS='0', DROIDDECK_GAME_FRAME_LIMIT='0') env.pop('GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST', None) env.update(overrides) script = ''' @@ -49,12 +49,12 @@ run_gamescope() { printf 'ARG:%s\\n' "$@"; printf 'FOLLOW:%s\\n' "${GAMESCOPE_NE def test_retired_cap_variables_do_not_override_the_display_rate(self): for performance in ('0', '1'): with self.subTest(performance=performance): - args = self.launch(120, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT=performance) + args = self.launch(120, DD_FPS='30', DROIDDECK_GAME_FRAME_LIMIT=performance) self.assertEqual('120', args[args.index('-r') + 1]) self.assertNotIn('--framerate-limit', args) def test_retired_cap_cannot_set_the_rate_when_the_display_rate_is_unknown(self): - args = self.launch(0, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT='1') + args = self.launch(0, DD_FPS='30', DROIDDECK_GAME_FRAME_LIMIT='1') self.assertNotIn('-r', args) self.assertNotIn('--framerate-limit', args) diff --git a/tools/tests/test_session_run_display.py b/tools/tests/test_session_run_display.py index 430a6a1373..d5e4e0d657 100644 --- a/tools/tests/test_session_run_display.py +++ b/tools/tests/test_session_run_display.py @@ -28,7 +28,7 @@ class SessionRunDisplayTest(unittest.TestCase): def display(self, **env): base = {k: v for k, v in os.environ.items() if k not in ("GAMESCOPE_WAYLAND_DISPLAY", "WAYLAND_DISPLAY", "XDG_SESSION_TYPE", - "BL_LAUNCH_DIR")} + "DD_LAUNCH_DIR")} seen = self.dir / "seen" script = ("program_cores() { :; }\nmode=run\ncase $mode in\n" + run_case() + "esac\n" + "echo unreachable\n") diff --git a/tools/tests/test_session_run_status.py b/tools/tests/test_session_run_status.py index b4c1914b7a..7080b81f2b 100644 --- a/tools/tests/test_session_run_status.py +++ b/tools/tests/test_session_run_status.py @@ -23,9 +23,9 @@ class RunStatusTest(unittest.TestCase): def run_with(self, command, launch_dir=True): env = dict(os.environ) - env.pop("BL_LAUNCH_DIR", None) + env.pop("DD_LAUNCH_DIR", None) if launch_dir: - env["BL_LAUNCH_DIR"] = str(self.dir) + env["DD_LAUNCH_DIR"] = str(self.dir) return subprocess.run(["bash", "-c", run_program_function() + "run_program " + command + "; echo unreachable"], env=env, capture_output=True, text=True, timeout=30) @@ -45,7 +45,7 @@ class RunStatusTest(unittest.TestCase): self.assertEqual([], os.listdir(self.dir)) def signalled(self, sig, program): - env = dict(os.environ, BL_LAUNCH_DIR=str(self.dir)) + env = dict(os.environ, DD_LAUNCH_DIR=str(self.dir)) ready = self.dir / "ready" proc = subprocess.Popen(["bash", "-c", run_program_function() + "run_program " + program], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) diff --git a/tools/tests/test_session_vkbridge_wait.py b/tools/tests/test_session_vkbridge_wait.py index bbd4fdb264..24ae01d89e 100644 --- a/tools/tests/test_session_vkbridge_wait.py +++ b/tools/tests/test_session_vkbridge_wait.py @@ -15,7 +15,7 @@ SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/d def wait_functions(): text = SESSION.read_text() found = [] - for name in ("bl_now_ms", "vkbridge_wait_socket"): + for name in ("dd_now_ms", "vkbridge_wait_socket"): match = re.search(r"^%s\(\) \{\n.*?^\}\n" % name, text, re.M | re.S) if match: found.append(match.group(0)) @@ -44,7 +44,7 @@ class VkBridgeSocketWaitTest(unittest.TestCase): def run_wait(self, limit_ms, prelude=""): functions = wait_functions() - self.assertEqual(2, len(functions), "droiddeck-session lacks bl_now_ms() or vkbridge_wait_socket()") + self.assertEqual(2, len(functions), "droiddeck-session lacks dd_now_ms() or vkbridge_wait_socket()") script = "set -u\n" + "".join(functions) + prelude script += 'if vkbridge_wait_socket "$1" "$2"; then echo USABLE; else echo FALLBACK; fi\n' started = time.monotonic() @@ -88,7 +88,7 @@ class VkBridgeSocketWaitTest(unittest.TestCase): self.assertTrue(out.endswith("FALLBACK\n"), out) def test_a_stopping_session_does_not_wait(self): - out, elapsed = self.run_wait(10000, prelude="bl_stopping=1\n") + out, elapsed = self.run_wait(10000, prelude="dd_stopping=1\n") self.assertTrue(out.endswith("FALLBACK\n"), out) self.assertIn("the session is stopping", out) self.assertLess(elapsed, 2) @@ -105,7 +105,7 @@ class VkBridgeSessionCheckTest(unittest.TestCase): def setUp(self): self.text = SESSION.read_text() - match = re.search(r'^if \[ "\$\{BL_VKBRIDGE:-0\}" = 1 \]; then\n.*?^fi\n', self.text, re.M | re.S) + match = re.search(r'^if \[ "\$\{DD_VKBRIDGE:-0\}" = 1 \]; then\n.*?^fi\n', self.text, re.M | re.S) self.assertIsNotNone(match) self.block = match.group(0) @@ -113,14 +113,14 @@ class VkBridgeSessionCheckTest(unittest.TestCase): wait = self.block.index("vkbridge_wait_socket") check = self.block.index('[ -S "${VKBRIDGE_SOCKET:-}" ]') self.assertLess(wait, check) - self.assertIn('[ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket', self.block) + self.assertIn('[ -z "${DD_INSIDE:-}" ] && vkbridge_wait_socket', self.block) def test_the_fallback_message_names_what_is_missing(self): self.assertIn("Mali bridge requested but NOT usable", self.block) - self.assertIn("missing:$bl_vkb_missing", self.block) + self.assertIn("missing:$dd_vkb_missing", self.block) def test_a_stop_ends_the_wait(self): - self.assertRegex(self.text, r"trap '[^']*bl_stopping=1[^']*' TERM INT HUP") + self.assertRegex(self.text, r"trap '[^']*dd_stopping=1[^']*' TERM INT HUP") if __name__ == "__main__": diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py index 0a6ba0b27f..fe7b71105c 100644 --- a/tools/tests/test_session_webhelper_layout.py +++ b/tools/tests/test_session_webhelper_layout.py @@ -5,70 +5,70 @@ import unittest from pathlib import Path SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" -KEYS = ("BL_VKBRIDGE_WEBHELPER_ARGS", "BL_VKBRIDGE_CEF_ANGLE", "BL_VKBRIDGE_CEF_VULKAN") +KEYS = ("DD_VKBRIDGE_WEBHELPER_ARGS", "DD_VKBRIDGE_CEF_ANGLE", "DD_VKBRIDGE_CEF_VULKAN") def layout_function(): - match = re.search(r"^bl_webhelper_layout\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S) + match = re.search(r"^dd_webhelper_layout\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S) return match.group(0) if match else None class WebhelperLayoutTest(unittest.TestCase): def layout(self, **settings): function = layout_function() - self.assertIsNotNone(function, "droiddeck-session lacks bl_webhelper_layout()") + self.assertIsNotNone(function, "droiddeck-session lacks dd_webhelper_layout()") env = {k: v for k, v in os.environ.items() if k not in KEYS} env.update(settings) - return subprocess.run(["bash", "-c", "set -u\n" + function + "bl_webhelper_layout\n"], env=env, + return subprocess.run(["bash", "-c", "set -u\n" + function + "dd_webhelper_layout\n"], env=env, capture_output=True, text=True, check=True).stdout.strip() def test_unset_keeps_steams_own_layout(self): self.assertEqual(self.layout(), "stock") def test_angle_on_vulkan_brings_chromiums_vulkan_compositing(self): - self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan"), + self.assertEqual(self.layout(DD_VKBRIDGE_CEF_ANGLE="vulkan"), "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") def test_vulkan_compositing_can_be_left_off(self): - self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_CEF_VULKAN="0"), + self.assertEqual(self.layout(DD_VKBRIDGE_CEF_ANGLE="vulkan", DD_VKBRIDGE_CEF_VULKAN="0"), "--use-gl=angle --use-angle=vulkan") def test_other_angle_backends_get_only_the_angle_switches(self): - self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + self.assertEqual(self.layout(DD_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") def test_explicit_layout_wins(self): - self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_WEBHELPER_ARGS="--x +Y"), + self.assertEqual(self.layout(DD_VKBRIDGE_CEF_ANGLE="vulkan", DD_VKBRIDGE_WEBHELPER_ARGS="--x +Y"), "--x +Y") def test_the_steam_block_uses_it(self): - self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + self.assertIn("DD_WEBHELPER_ARGS=$(dd_webhelper_layout)", SESSION.read_text()) def test_the_gpu_ui_on_the_bridge_defaults_to_angle_on_vulkan_without_vulkan_compositing(self): text = SESSION.read_text() - gpu = text.index('elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then') - software = text.rindex('_bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing)', 0, gpu) - defaults = text.index(': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"', gpu) + gpu = text.index('elif [ "${_dd_cef[0]}" = -cef-force-gpu ]; then') + software = text.rindex('_dd_cef=(-cef-disable-gpu -cef-disable-gpu-compositing)', 0, gpu) + defaults = text.index(': "${DD_VKBRIDGE_CEF_ANGLE=vulkan}" "${DD_VKBRIDGE_CEF_VULKAN=0}"', gpu) self.assertLess(software, gpu) - self.assertLess(defaults, text.index("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", gpu)) + self.assertLess(defaults, text.index("DD_WEBHELPER_ARGS=$(dd_webhelper_layout)", gpu)) self.assertLess(defaults, text.index("\n fi\n", gpu)) def test_the_defaults_give_way_to_settings(self): - script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + script = ': "${DD_VKBRIDGE_CEF_ANGLE=vulkan}" "${DD_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "dd_webhelper_layout\n" env = {k: v for k, v in os.environ.items() if k not in KEYS} run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, capture_output=True, text=True, check=True).stdout.strip() self.assertEqual(run(), "--use-gl=angle --use-angle=vulkan") - self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN="1"), + self.assertEqual(run(DD_VKBRIDGE_CEF_VULKAN="1"), "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") - self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + self.assertEqual(run(DD_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") def test_empty_settings_are_kept_as_set(self): - script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + script = ': "${DD_VKBRIDGE_CEF_ANGLE=vulkan}" "${DD_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "dd_webhelper_layout\n" env = {k: v for k, v in os.environ.items() if k not in KEYS} run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, capture_output=True, text=True, check=True).stdout.strip() - self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE=""), "stock") - self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN=""), + self.assertEqual(run(DD_VKBRIDGE_CEF_ANGLE=""), "stock") + self.assertEqual(run(DD_VKBRIDGE_CEF_VULKAN=""), "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") diff --git a/tools/tests/test_steam_adopt.py b/tools/tests/test_steam_adopt.py index 71f1ead653..50db1827c1 100644 --- a/tools/tests/test_steam_adopt.py +++ b/tools/tests/test_steam_adopt.py @@ -135,7 +135,7 @@ class AdoptTest(unittest.TestCase): self.folder("Beta") listing = self.steam.parent / "libraries.json" listing.write_text('[{"path": "%s", "label": "SD Card"}]' % self.card) - with patch.dict("os.environ", {"BL_STEAM_LIBRARIES": str(listing)}), \ + with patch.dict("os.environ", {"DD_STEAM_LIBRARIES": str(listing)}), \ patch("sys.argv", ["droiddeck-steam-library", str(self.steam)]): library.main() self.assertTrue(self.manifest(20).exists()) diff --git a/tools/tests/test_steam_client_setup_failure.py b/tools/tests/test_steam_client_setup_failure.py index 774e14aa4a..4ce8087f6a 100644 --- a/tools/tests/test_steam_client_setup_failure.py +++ b/tools/tests/test_steam_client_setup_failure.py @@ -32,13 +32,13 @@ class SteamClientSetupFailureTest(unittest.TestCase): script.chmod(0o755) def env(self, **extra): - base = {k: v for k, v in os.environ.items() if k != 'BL_STEAM_EXIT_FILE'} + base = {k: v for k, v in os.environ.items() if k != 'DD_STEAM_EXIT_FILE'} return dict(base, PATH=str(self.root) + os.pathsep + os.environ['PATH'], XDG_RUNTIME_DIR=str(self.root), **extra) def run_block(self, status, exit_file=None): self.installer(status) - extra = {'BL_STEAM_EXIT_FILE': str(exit_file)} if exit_file else {} + extra = {'DD_STEAM_EXIT_FILE': str(exit_file)} if exit_file else {} return subprocess.run(['bash', '-c', INSTALL_BLOCK + 'echo continued\n'], env=self.env(**extra), capture_output=True, text=True, timeout=10) diff --git a/tools/tests/test_steam_cold_launch.py b/tools/tests/test_steam_cold_launch.py index 0fe085ff9e..dc94b025b4 100644 --- a/tools/tests/test_steam_cold_launch.py +++ b/tools/tests/test_steam_cold_launch.py @@ -8,7 +8,7 @@ import unittest SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" SOURCE = SESSION.read_text() START = SOURCE.index(" steam_hold_launch() {") -END = SOURCE.index(' if [ -s "$HOME/.bl-autolaunch" ]; then', START) +END = SOURCE.index(' if [ -s "$HOME/.dd-autolaunch" ]; then', START) assert START >= 0 LAUNCH_BLOCK = textwrap.dedent(SOURCE[START:END]) SHORTCUT = str((3551182975 << 32) | 0x02000000) @@ -57,7 +57,7 @@ class SteamColdLaunchTest(unittest.TestCase): self.block = LAUNCH_BLOCK.replace("/usr/local/bin/droiddeck-agent", str(agent)) def run_launch(self, target, focus="769", helper_status=0, running_after=999, ready_status=0): - env = dict(os.environ, HOME=str(self.root), BL_LAUNCH_DIR=str(self.launch_dir), + env = dict(os.environ, HOME=str(self.root), DD_LAUNCH_DIR=str(self.launch_dir), PATH=str(self.bin) + os.pathsep + os.environ["PATH"], AGENT_ARGS=str(self.agent_args), SLEEP_ARGS=str(self.sleep_args), AGENT_COUNT=str(self.agent_count), AGENT_STATUS=str(helper_status), @@ -133,11 +133,11 @@ class SteamColdLaunchTest(unittest.TestCase): self.assertIn("--steam-ready", self.agent_args.read_text()) def test_a_restart_for_a_game_uses_the_same_hand_off(self): - loop = SOURCE[SOURCE.index(' if [ -s "$HOME/.bl-restart-game" ]; then'):SOURCE.index(' if [ -f "$HOME/.bl-restart-once" ]; then')] - self.assertIn('steam_hold_launch "$_bl_again" &', loop) + loop = SOURCE[SOURCE.index(' if [ -s "$HOME/.dd-restart-game" ]; then'):SOURCE.index(' if [ -f "$HOME/.dd-restart-once" ]; then')] + self.assertIn('steam_hold_launch "$_dd_again" &', loop) self.assertNotIn("set -- \"steam://rungameid/", loop) script = self.block + '\nsteam_hold_launch "%s"\n' % SHORTCUT - env = dict(os.environ, HOME=str(self.root), BL_LAUNCH_DIR=str(self.launch_dir), + env = dict(os.environ, HOME=str(self.root), DD_LAUNCH_DIR=str(self.launch_dir), PATH=str(self.bin) + os.pathsep + os.environ["PATH"], AGENT_ARGS=str(self.agent_args), SLEEP_ARGS=str(self.sleep_args), AGENT_COUNT=str(self.agent_count), AGENT_STATUS="1", diff --git a/tools/tests/test_steam_compat_environment.py b/tools/tests/test_steam_compat_environment.py index 5ecaba1772..f03b006939 100644 --- a/tools/tests/test_steam_compat_environment.py +++ b/tools/tests/test_steam_compat_environment.py @@ -12,7 +12,7 @@ BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' class SteamCompatEnvironmentTest(unittest.TestCase): def test_library_launch_preserves_guest_environment_without_steam_client_libraries(self): source = (BIN / 'droiddeck-session').read_text() - setup = source[source.index(' _bl_compat_env='):source.index(' export SDL_VIDEO_X11_DGAMOUSE=')] + setup = source[source.index(' _dd_compat_env='):source.index(' export SDL_VIDEO_X11_DGAMOUSE=')] launch = next(line for line in source.splitlines() if 'droiddeck-steam-compat "$steam_root"' in line) with tempfile.TemporaryDirectory() as directory: @@ -57,7 +57,7 @@ class SteamCompatEnvironmentTest(unittest.TestCase): helper.chmod(0o755) env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], PID_FILE=str(pid), steam_root='/steam', steam_x64='0') - subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + launch + '\n' + subprocess.run(['bash', '-c', '_dd_compat_env=(env)\n' + launch + '\n' 'until [ -s "$PID_FILE" ]; do sleep 0.05; done\n' 'kill $(jobs -p)\nwait'], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=10) @@ -83,7 +83,7 @@ class SteamCompatEnvironmentTest(unittest.TestCase): args = root / ('args-' + x64) env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], ARGS_FILE=str(args), steam_root='/steam', steam_x64=x64) - subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + block + 'wait\n'], env=env, timeout=10, check=True) + subprocess.run(['bash', '-c', '_dd_compat_env=(env)\n' + block + 'wait\n'], env=env, timeout=10, check=True) self.assertEqual(args.read_text().split('\n')[0], expected) def test_files_only_mode_installs_only_the_file_dialog_hook(self): diff --git a/tools/tests/test_steam_compat_mapping.py b/tools/tests/test_steam_compat_mapping.py index dd9ba22196..7c03b24de6 100644 --- a/tools/tests/test_steam_compat_mapping.py +++ b/tools/tests/test_steam_compat_mapping.py @@ -210,7 +210,7 @@ class MappingBatchIntegrationTest(unittest.TestCase): config = steam / "config/config.vdf" config.parent.mkdir(parents=True) config.write_text(config_text("".join('"%s" { "name" "proton_experimental" }' % app for app in apps))) - pending = Path(tmp) / ".bl-compat-pending" + pending = Path(tmp) / ".dd-compat-pending" pending.write_text("before\n") globals_ = COMPAT["x64_repoint"].__globals__ single = mock.Mock(wraps=COMPAT["set_mapping"]) diff --git a/tools/tests/test_steam_compat_x64.py b/tools/tests/test_steam_compat_x64.py index 9d9bf109e0..72b894dbac 100644 --- a/tools/tests/test_steam_compat_x64.py +++ b/tools/tests/test_steam_compat_x64.py @@ -92,7 +92,7 @@ class X64RepointTest(unittest.TestCase): def test_live_notes_pending_restart(self): COMPAT["x64_repoint"](str(self.root), "GE-Proton11-7-a64", live=True) - self.assertEqual((Path(self.home.name) / ".bl-compat-pending").read_text(), "550\n880\n") + self.assertEqual((Path(self.home.name) / ".dd-compat-pending").read_text(), "550\n880\n") def test_no_tool_changes_nothing(self): before = (self.root / "config" / "config.vdf").read_text() diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 7d50640878..4d49c9dd47 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -17,10 +17,10 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.session = self.root / 'session' self.session.mkdir() self.env = dict(os.environ, HOME=str(self.root), XDG_DATA_HOME=str(self.root / 'data'), - XDG_CACHE_HOME=str(self.root / 'cache'), BL_DESKTOP='1', - BL_LAUNCH_DIR=str(self.session)) + XDG_CACHE_HOME=str(self.root / 'cache'), DD_DESKTOP='1', + DD_LAUNCH_DIR=str(self.session)) supervisor = self.root / 'supervisor' - supervisor.write_text('#!/bin/bash\nprintf "%s\\n" "$BL_INSIDE" "$BL_STEAM_UI" "$DISPLAY" "$@"\n') + supervisor.write_text('#!/bin/bash\nprintf "%s\\n" "$DD_INSIDE" "$DD_STEAM_UI" "$DISPLAY" "$@"\n') supervisor.chmod(0o755) x64 = self.root / 'steam-x64' x64.write_text('#!/bin/bash\nprintf "%s\\n" x64 "$@"\n') @@ -102,7 +102,7 @@ class DesktopSteamLaunchTest(unittest.TestCase): def test_bottom_screen_desktop_hands_games_to_the_running_client(self): self._running_client() - self.env['BL_BOTTOM_DESKTOP'] = '1' + self.env['DD_BOTTOM_DESKTOP'] = '1' result = self.launch('desktop', '501590') self.assertEqual(result.returncode, 0, result.stderr) self.assertEqual(result.stdout.splitlines(), ['-nobigpicture', '-no-cef-sandbox', '-cef-ozone-platform=x11', @@ -110,7 +110,7 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.assertFalse((self.root / 'cache/droiddeck/steam-desktop.lock').exists()) def test_bottom_screen_desktop_starts_its_own_client_when_none_runs(self): - self.env.update(BL_BOTTOM_DESKTOP='1', DISPLAY=':7') + self.env.update(DD_BOTTOM_DESKTOP='1', DISPLAY=':7') result = self.launch('desktop') self.assertEqual(result.returncode, 0, result.stderr) self.assertEqual(result.stdout.splitlines(), ['1', 'desktop', ':7', 'steam', 'steam://open/library']) @@ -122,7 +122,7 @@ class DesktopSteamLaunchTest(unittest.TestCase): (x64_home / '.steam').mkdir(parents=True) os.mkfifo(x64_home / '.steam/steam.pipe') (x64_home / '.steam/steam.pid').write_text(str(os.getpid())) - self.env.update(BL_STEAM_CLIENT_ARCH='x86_64', BL_X64_HOME=str(x64_home)) + self.env.update(DD_STEAM_CLIENT_ARCH='x86_64', DD_X64_HOME=str(x64_home)) with lock.open('w') as handle: fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB) result = self.launch('desktop', '501590') @@ -164,7 +164,7 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.assertEqual((self.session / 'steam-launch').read_text(), 'ui=bigpicture\nurl=\n') def test_outside_desktop_preserves_session_request(self): - self.env.pop('BL_DESKTOP') + self.env.pop('DD_DESKTOP') result = self.launch('desktop', 'steam://open/settings') self.assertEqual(result.returncode, 0, result.stderr) self.assertEqual((self.session / 'steam-launch').read_text(), @@ -176,11 +176,11 @@ class DesktopSteamLaunchTest(unittest.TestCase): def test_cef_software_is_scoped_to_the_kde_client(self): source = (BIN / 'droiddeck-session').read_text() - setup = source[source.index(' _bl_ui=(-gamepadui)'):source.index(' if [ "${BL_STEAM_UI:-}" != desktop ]; then')] + setup = source[source.index(' _dd_ui=(-gamepadui)'):source.index(' if [ "${DD_STEAM_UI:-}" != desktop ]; then')] for desktop, ui, software in [('1', 'desktop', True), ('1', 'bigpicture', False), ('', 'desktop', False)]: with self.subTest(desktop=desktop, ui=ui): - env = dict(self.env, BL_DESKTOP=desktop, BL_STEAM_UI=ui) - result = subprocess.check_output(['bash', '-c', setup + '\nprintf "%s\\n" "${_bl_cef[@]}"'], + env = dict(self.env, DD_DESKTOP=desktop, DD_STEAM_UI=ui) + result = subprocess.check_output(['bash', '-c', setup + '\nprintf "%s\\n" "${_dd_cef[@]}"'], env=env, text=True) self.assertEqual('-cef-disable-gpu' in result, software) self.assertEqual('-cef-use-angle=vulkan' in result, not software) diff --git a/tools/tests/test_steam_devtools_port.py b/tools/tests/test_steam_devtools_port.py index 8015ba260d..3932486e42 100644 --- a/tools/tests/test_steam_devtools_port.py +++ b/tools/tests/test_steam_devtools_port.py @@ -29,7 +29,7 @@ class SteamDevtoolsPortTest(unittest.TestCase): function = devtools_function() self.assertIsNotNone(function, "droiddeck-session has no steam_devtools()") script = function + "steam_root=%s\nsteam_devtools %d\n" % (shlex.quote(str(self.root)), port) - script += 'echo "port=$BL_CDP_PORT"\necho "args=${_bl_cdp[*]}"\n' + script += 'echo "port=$DD_CDP_PORT"\necho "args=${_dd_cdp[*]}"\n' out = subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, check=True).stdout lines = out.splitlines() port_line = next(l for l in lines if l.startswith("port=")) @@ -71,7 +71,7 @@ class SteamDevtoolsPortTest(unittest.TestCase): def test_the_x86_64_decky_exemption_only_covers_the_fixed_port(self): text = SESSION.read_text() - self.assertIn('[ "${decky_arch:-}" = x86_64 ] && [ ${#_bl_cdp[@]} = 0 ]', text) + self.assertIn('[ "${decky_arch:-}" = x86_64 ] && [ ${#_dd_cdp[@]} = 0 ]', text) if __name__ == "__main__": diff --git a/tools/tests/test_steam_exit_status.py b/tools/tests/test_steam_exit_status.py index 8cfc218ab3..580ee66a39 100644 --- a/tools/tests/test_steam_exit_status.py +++ b/tools/tests/test_steam_exit_status.py @@ -25,7 +25,7 @@ class SteamExitStatusTest(unittest.TestCase): compositor.chmod(0o755) child = root / 'steam' report_arg = '"$1"' if report_value is None else '"$2"' - report_line = ('printf "%s\\n" ' + report_arg + ' > "$BL_STEAM_EXIT_FILE"\n' + report_line = ('printf "%s\\n" ' + report_arg + ' > "$DD_STEAM_EXIT_FILE"\n' if report else '') child.write_text('#!/bin/bash\n' + report_line + 'exit "$1"\n') child.chmod(0o755) diff --git a/tools/tests/test_steam_helper_affinity.py b/tools/tests/test_steam_helper_affinity.py index 97549ac05d..acdac3d51a 100644 --- a/tools/tests/test_steam_helper_affinity.py +++ b/tools/tests/test_steam_helper_affinity.py @@ -45,9 +45,9 @@ class SteamHelperAffinityTest(unittest.TestCase): elif form == "empty": args = [] env = dict(os.environ, TRACE=str(root / "trace"), STARTS=str(root / "starts")) - env.pop("BL_STEAM_WEBHELPER", None) + env.pop("DD_STEAM_WEBHELPER", None) if configured: - env["BL_STEAM_WEBHELPER"] = str(helper) + env["DD_STEAM_WEBHELPER"] = str(helper) result = subprocess.run(["bash", str(wrapper), *args], env=env, capture_output=True, text=True, timeout=5) trace = [json.loads(x) for x in (root / "trace").read_text().splitlines()] diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 81e2724cbb..f888b7ed13 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -79,7 +79,7 @@ done(28 if end < len(data) else 0) self.env = dict(os.environ, HOME=str(self.home), XDG_DATA_HOME=str(self.data), PATH=str(self.bin) + os.pathsep + os.environ['PATH'], TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests), - TEST_PLAN=str(self.plan), BL_STEAM_RETRY_DELAYS='0 0 0') + TEST_PLAN=str(self.plan), DD_STEAM_RETRY_DELAYS='0 0 0') for channel in ('steamdeck_publicbeta', 'steamdeck_stable'): archive = self.cdn / (channel + '.zip') with zipfile.ZipFile(archive, 'w') as package: @@ -185,7 +185,7 @@ done(28 if end < len(data) else 0) self.requests.unlink() with (package / 'droiddeck-unconfirmed').open('a') as marker: marker.write('start\nstart\nstart\n') - self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertEqual(0, self.install(DD_STEAM_CHANNEL='beta').returncode) self.assertFalse(self.requests.exists()) def test_the_default_channel_is_the_deck_beta(self): @@ -226,8 +226,8 @@ done(28 if end < len(data) else 0) self.assertEqual(0, self.install().returncode) with (package / 'droiddeck-unconfirmed').open('a') as marker: marker.write('start\nstart\n') - self.assertEqual('steamdeck_publicbeta', self.channel(BL_STEAM_CHANNEL='beta')) - self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertEqual('steamdeck_publicbeta', self.channel(DD_STEAM_CHANNEL='beta')) + self.assertEqual(0, self.install(DD_STEAM_CHANNEL='beta').returncode) self.assertFalse((package / 'droiddeck-channel').exists()) def test_the_channel_setting_selects_stable(self): @@ -255,7 +255,7 @@ done(28 if end < len(data) else 0) def test_a_pinned_beta_manifest_without_an_arm64_client_fails_and_names_its_blocks(self): self.empty_beta_manifest() - result = self.install(BL_STEAM_CHANNEL='beta') + result = self.install(DD_STEAM_CHANNEL='beta') self.assertNotEqual(0, result.returncode) self.assertIn('client_steamrtarm64_linuxarm64', result.stderr) self.assertFalse((self.steam / 'package/droiddeck-installed').exists()) @@ -263,7 +263,7 @@ done(28 if end < len(data) else 0) def test_requested_repair_runs_once_and_is_retried_until_it_completes(self): package = self.break_client(0) (package / 'droiddeck-unconfirmed').unlink() - request = self.home / '.bl-steam-repair' + request = self.home / '.dd-steam-repair' request.write_text('1\n') archive = self.cdn / 'steamdeck_publicbeta.zip' original = archive.read_bytes() @@ -402,7 +402,7 @@ done(28 if end < len(data) else 0) def test_a_repair_unpacks_every_part_again_once(self): files = self.two_parts() self.assertEqual(0, self.install().returncode) - (self.home / '.bl-steam-repair').write_text('1\n') + (self.home / '.dd-steam-repair').write_text('1\n') self.requests.unlink() self.plan_for(files['client_linuxarm64_linuxarm64'], *['fail 7'] * 12) self.assertNotEqual(0, self.install().returncode) @@ -411,7 +411,7 @@ done(28 if end < len(data) else 0) self.assertEqual(0, self.install().returncode) self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', files['client_linuxarm64_linuxarm64']], self.requested()) - self.assertFalse((self.home / '.bl-steam-repair').exists()) + self.assertFalse((self.home / '.dd-steam-repair').exists()) self.assertFalse(self.download.exists()) diff --git a/tools/tests/test_steam_libraries.py b/tools/tests/test_steam_libraries.py index 18c477a78a..22955661d2 100644 --- a/tools/tests/test_steam_libraries.py +++ b/tools/tests/test_steam_libraries.py @@ -63,9 +63,9 @@ class LibraryListTest(unittest.TestCase): def run_main(self, listing=True): with patch.dict(os.environ), patch("sys.argv", ["droiddeck-steam-library", str(self.steam)]): - os.environ.pop("BL_STEAM_LIBRARIES", None) + os.environ.pop("DD_STEAM_LIBRARIES", None) if listing: - os.environ["BL_STEAM_LIBRARIES"] = str(self.listing) + os.environ["DD_STEAM_LIBRARIES"] = str(self.listing) library.main() return self.vdf.read_text() diff --git a/tools/tests/test_steam_presentation.py b/tools/tests/test_steam_presentation.py index 476b90779c..801c1d4688 100644 --- a/tools/tests/test_steam_presentation.py +++ b/tools/tests/test_steam_presentation.py @@ -12,19 +12,19 @@ SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/d class SteamPresentationTest(unittest.TestCase): def launch(self, enabled=None, inherited=None): source = SESSION.read_text() - begin = source.index(" bl_steam_path=$PATH") + begin = source.index(" dd_steam_path=$PATH") end = source.index("\n decky_loader=", begin) - command = source.index(' PATH="$bl_steam_path"') + command = source.index(' PATH="$dd_steam_path"') command_end = source.index("\n rc=$?", command) - script = (source[begin:end] + '\n_bl_ui=(-gamepadui); _bl_cdp=(); _bl_lang=()\n' + script = (source[begin:end] + '\n_dd_ui=(-gamepadui); _dd_cdp=(); _dd_lang=()\n' # 0.5.0 launches through steam_client (the arm64 client, or the x86-64 one under FEX). + 'steam_client=("$steam_root/steamrtarm64/steam")\n' + source[command:command_end]) env = dict(os.environ) - for key in ("BL_STEAM_GL_PRESENT", "BL_STEAM_SOFT_COMPOSITING", "DISABLE_GAMESCOPE_WSI", "LIBGL_KOPPER_DISABLE"): + for key in ("DD_STEAM_GL_PRESENT", "DD_STEAM_SOFT_COMPOSITING", "DISABLE_GAMESCOPE_WSI", "LIBGL_KOPPER_DISABLE"): env.pop(key, None) if enabled is not None: - env["BL_STEAM_GL_PRESENT"] = enabled + env["DD_STEAM_GL_PRESENT"] = enabled env.update(inherited or {}) with tempfile.TemporaryDirectory(prefix="droiddeck-steam-gl-") as tmp: program = Path(tmp) / "steamrtarm64/steam" @@ -34,7 +34,7 @@ class SteamPresentationTest(unittest.TestCase): '"disable":os.getenv("DISABLE_GAMESCOPE_WSI"),' '"kopper":os.getenv("LIBGL_KOPPER_DISABLE"),' '"path":os.getenv("PATH"),' - '"helper":os.getenv("BL_STEAM_WEBHELPER")}))\n') + '"helper":os.getenv("DD_STEAM_WEBHELPER")}))\n') program.chmod(0o755) env.update(steam_root=tmp, steam_channel="steamdeck_publicbeta") result = subprocess.run(["bash", "-c", script, "test", "steam://open/main"], @@ -64,20 +64,20 @@ class SteamPresentationTest(unittest.TestCase): self.assertEqual(result["args"][-1], "steam://open/main") def test_explicit_software_compositing_keeps_gpu_raster(self): - result = self.launch(inherited={"BL_STEAM_SOFT_COMPOSITING": "1"}) + result = self.launch(inherited={"DD_STEAM_SOFT_COMPOSITING": "1"}) self.assertIn("-cef-disable-gpu-compositing", result["args"]) self.assertIn("-cef-force-gpu", result["args"]) self.assertIn("-cef-use-angle=vulkan", result["args"]) self.assertNotIn("-cef-disable-gpu", result["args"]) def test_explicit_gpu_compositing_preserves_vulkan(self): - result = self.launch(inherited={"BL_STEAM_SOFT_COMPOSITING": "0"}) + result = self.launch(inherited={"DD_STEAM_SOFT_COMPOSITING": "0"}) self.assertNotIn("-cef-disable-gpu-compositing", result["args"]) self.assertIn("-cef-force-gpu", result["args"]) self.assertIn("-cef-use-angle=vulkan", result["args"]) def test_powervr_presentation_keeps_its_software_fallback(self): - result = self.launch("1", {"BL_STEAM_SOFT_COMPOSITING": "0"}) + result = self.launch("1", {"DD_STEAM_SOFT_COMPOSITING": "0"}) self.assertIn("-cef-disable-gpu-compositing", result["args"]) self.assertIn("-cef-use-angle=gl", result["args"]) diff --git a/tools/tests/test_steam_shortcut_recovery.py b/tools/tests/test_steam_shortcut_recovery.py index fc196e94f1..3b77c4207f 100644 --- a/tools/tests/test_steam_shortcut_recovery.py +++ b/tools/tests/test_steam_shortcut_recovery.py @@ -43,13 +43,13 @@ class SteamShortcutRecoveryTest(unittest.TestCase): script = "nap() { :; }\nsteam_root=%s\n%s%s\nsteam_launch_game %s\n" % ( self.root / "steam", "steam_client=(%s --exec)\n" % client if client else "", FUNCTIONS.replace("/usr/local/bin/droiddeck-agent", str(self.agent)), GAME) - env = dict(os.environ, HOME=str(self.root), BL_LAUNCH_DIR=str(self.launch), + env = dict(os.environ, HOME=str(self.root), DD_LAUNCH_DIR=str(self.launch), PATH=str(self.bin) + os.pathsep + os.environ["PATH"], STEAM_LOG=str(self.steam_log), AGENT_COUNT=str(self.root / "agent-count"), AGENT_STATES=states, **(extra or {})) result = subprocess.run(["bash", "-c", script], env=env, text=True, capture_output=True, timeout=10) self.assertEqual(0, result.returncode, result.stderr) steam = self.steam_log.read_text().splitlines() if self.steam_log.exists() else [] - restart = self.root / ".bl-restart-game" + restart = self.root / ".dd-restart-game" return steam, restart.read_text().strip() if restart.exists() else None, result.stdout def test_a_shortcut_that_stays_known_launches_once(self): @@ -83,7 +83,7 @@ class SteamShortcutRecoveryTest(unittest.TestCase): def test_steam_is_restarted_only_once_for_the_same_game(self): steam, restart, _ = self.launch_game("4") self.assertEqual(GAME, restart) - (self.root / ".bl-restart-game").unlink() + (self.root / ".dd-restart-game").unlink() self.steam_log.unlink() (self.root / "agent-count").unlink() steam, restart, out = self.launch_game("4") @@ -93,10 +93,10 @@ class SteamShortcutRecoveryTest(unittest.TestCase): def test_a_ready_shortcut_allows_a_later_restart_again(self): self.launch_game("4") - (self.root / ".bl-restart-game").unlink() + (self.root / ".dd-restart-game").unlink() (self.root / "agent-count").unlink() self.launch_game("0") - self.assertFalse((self.root / ".bl-restarted-for").exists()) + self.assertFalse((self.root / ".dd-restarted-for").exists()) def test_a_running_game_is_never_cut_off_by_a_restart(self): steam, restart, _ = self.launch_game("0 4", focusable="769,3703311242") @@ -112,10 +112,10 @@ class SteamShortcutRecoveryTest(unittest.TestCase): def test_the_launcher_without_its_steam_id_still_does_not_count_as_a_running_game(self): (self.launch / "epic-open").write_text("1\n") - launcher = {"BL_EPIC_APP_ID": "2702387189"} + launcher = {"DD_EPIC_APP_ID": "2702387189"} steam, restart, _ = self.launch_game("0 4", focusable="769,2702387189", extra=launcher) self.assertEqual(GAME, restart) - for marker in (".bl-restart-game", ".bl-restarted-for", "agent-count"): + for marker in (".dd-restart-game", ".dd-restarted-for", "agent-count"): (self.root / marker).unlink(missing_ok=True) steam, restart, _ = self.launch_game("4", focusable="769,2702387189,3703311242", extra=launcher) self.assertIsNone(restart) @@ -136,10 +136,10 @@ class SteamShortcutRecoveryTest(unittest.TestCase): "[ -n \"$line\" ] || exit 1\n" "printf '%s\\n' \"$line\"\n") pgrep.chmod(0o755) - script = "steam_root=%s\n%s\ndeclare -A _bl_ran=()\n_bl_exited=\n%s" % ( + script = "steam_root=%s\n%s\ndeclare -A _dd_ran=()\n_dd_exited=\n%s" % ( self.root / "steam", FUNCTIONS.replace("/usr/local/bin/droiddeck-agent", str(self.agent)), "steam_check_exits\n" * beats) - env = dict(os.environ, HOME=str(self.root), BL_LAUNCH_DIR=str(self.launch), + env = dict(os.environ, HOME=str(self.root), DD_LAUNCH_DIR=str(self.launch), PATH=str(self.bin) + os.pathsep + os.environ["PATH"], STEAM_LOG=str(self.steam_log), AGENT_COUNT=str(self.root / "agent-count"), AGENT_STATES=states, PGREP_COUNT=str(self.root / "pgrep-count"), PGREP_RUNS="|".join(listings)) @@ -147,7 +147,7 @@ class SteamShortcutRecoveryTest(unittest.TestCase): self.assertEqual(0, result.returncode, result.stderr) steam = self.steam_log.read_text().splitlines() if self.steam_log.exists() else [] agent = self.root / "agent-count" - return steam, (self.root / ".bl-restart-lost").exists(), int(agent.read_text()) if agent.exists() else 0, result.stdout + return steam, (self.root / ".dd-restart-lost").exists(), int(agent.read_text()) if agent.exists() else 0, result.stdout RUNNING = "41 /root/.local/share/Steam/steamrtarm64/reaper SteamLaunch AppId=3333273269 -- /x/.droiddeck-launch.bat" diff --git a/tools/tests/test_steam_tool_platforms.py b/tools/tests/test_steam_tool_platforms.py index 899b0b07e9..5eddeb3cee 100644 --- a/tools/tests/test_steam_tool_platforms.py +++ b/tools/tests/test_steam_tool_platforms.py @@ -104,7 +104,7 @@ class ToolPlatformsTest(unittest.TestCase): raise StopWatching() namespace = live.LIVE["main"].__globals__ - with mock.patch.dict(namespace, Watcher=capture), mock.patch.dict(os.environ, BL_CDP_PORT="1"), \ + with mock.patch.dict(namespace, Watcher=capture), mock.patch.dict(os.environ, DD_CDP_PORT="1"), \ mock.patch.object(live.LIVE["sys"], "argv", ["compat", str(self.steam)]): with self.assertRaises(StopWatching): live.LIVE["main"]() diff --git a/tools/tests/test_steam_x64_cpu.py b/tools/tests/test_steam_x64_cpu.py index ad8e2dc271..3bbd3cbbc8 100644 --- a/tools/tests/test_steam_x64_cpu.py +++ b/tools/tests/test_steam_x64_cpu.py @@ -29,11 +29,11 @@ class SteamX64CpuTest(unittest.TestCase): start = text.find('x64_arm_webhelper_cpu_supported() {') helper = text[start:text.index('x64_exec() {')] if start >= 0 else '' selection = text.split('x64_exec() {', 1)[1].split(' mkdir -p "$STEAM_X64/logs"', 1)[0] - shell = helper + '\nx64_env() { :; }\nx64_webhelper_gpu() { return 1; }\nselect_helper() {' + selection + '\nprintf "%s|%s\\n" "${BL_X64_ARM_WEBHELPER:-x86}" "${BL_WEBHELPER_ARGS:-}";\n}\nselect_helper\n' + shell = helper + '\nx64_env() { :; }\nx64_webhelper_gpu() { return 1; }\nselect_helper() {' + selection + '\nprintf "%s|%s\\n" "${DD_X64_ARM_WEBHELPER:-x86}" "${DD_WEBHELPER_ARGS:-}";\n}\nselect_helper\n' shell = shell.replace('/proc/cpuinfo', str(cpuinfo)).replace('/usr/local/bin/droiddeck-x64-arm-webhelper', str(shim)) - env = dict(os.environ, STEAM_X64=str(x64), ARM_STEAM=str(arm), X64_CHANNEL='publicbeta', BL_X64_X86_WEBHELPER='1' if forced else '0') - env.pop('BL_X64_ARM_WEBHELPER', None) - env.pop('BL_WEBHELPER_ARGS', None) + env = dict(os.environ, STEAM_X64=str(x64), ARM_STEAM=str(arm), X64_CHANNEL='publicbeta', DD_X64_X86_WEBHELPER='1' if forced else '0') + env.pop('DD_X64_ARM_WEBHELPER', None) + env.pop('DD_WEBHELPER_ARGS', None) result = subprocess.run(['bash', '-eu', '-c', shell], env=env, capture_output=True, text=True) self.assertEqual(result.returncode, 0, result.stderr) return result.stdout.strip(), str(shim) diff --git a/tools/tests/test_steam_x64_signin.py b/tools/tests/test_steam_x64_signin.py index ea761c68c8..3c8eff8c8f 100644 --- a/tools/tests/test_steam_x64_signin.py +++ b/tools/tests/test_steam_x64_signin.py @@ -50,7 +50,7 @@ class X64SignInTest(unittest.TestCase): def sync(self): env = dict(os.environ, HOME=str(self.home), PATH='%s:%s' % (self.bin, os.environ['PATH'])) env.pop('XDG_DATA_HOME', None) - env.pop('BL_X64_HOME', None) + env.pop('DD_X64_HOME', None) return subprocess.run(['bash', str(SCRIPT), '--sync-login'], env=env, capture_output=True, text=True, check=True) def test_a_refused_x64_sign_in_gets_the_token_account_and_auto_login(self): diff --git a/tools/tests/test_steamrt_shim.py b/tools/tests/test_steamrt_shim.py index 05f7345fe1..04f2a7fe06 100644 --- a/tools/tests/test_steamrt_shim.py +++ b/tools/tests/test_steamrt_shim.py @@ -43,11 +43,11 @@ class SteamrtShimTest(unittest.TestCase): self.assertEqual(0, self.sh(self.shim / 'bin/steam-runtime-check-requirements').returncode) self.assertEqual('info\n', self.sh(self.shim / 'bin/steam-runtime-system-info').stdout) self.assertEqual('runtime files', (self.shim / 'files/marker').read_text()) - launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=BL_SHIM_TEST=yes', - f'--directory={self.root}', '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=DD_SHIM_TEST=yes', + f'--directory={self.root}', '--', 'sh', '-c', 'echo "$DD_SHIM_TEST $(basename "$PWD")"') self.assertEqual(f'yes {self.root.name}\n', launched.stdout) - launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env', 'BL_SHIM_TEST=split', - '--directory', self.root, '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env', 'DD_SHIM_TEST=split', + '--directory', self.root, '--', 'sh', '-c', 'echo "$DD_SHIM_TEST $(basename "$PWD")"') self.assertEqual(f'split {self.root.name}\n', launched.stdout) missing = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--directory', self.root / 'missing', '--', 'true') @@ -85,7 +85,7 @@ class SteamrtShimTest(unittest.TestCase): def test_both_clients_are_told_they_already_run_inside_the_container(self): guard = SESSION.index('export STEAM_STEAMRT_RECURSION_GUARD=1') - self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_bl_ui[@]}"')) + self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_dd_ui[@]}"')) self.assertIn('-u STEAM_STEAMRT_RECURSION_GUARD', SESSION[:guard]) self.assertIn('export STEAM_STEAMRT_RECURSION_GUARD=1', X64) self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim"', X64) diff --git a/tools/tests/test_storage_owner_preload.py b/tools/tests/test_storage_owner_preload.py index 42f66c61eb..83ac7872a8 100644 --- a/tools/tests/test_storage_owner_preload.py +++ b/tools/tests/test_storage_owner_preload.py @@ -85,7 +85,7 @@ class StorageOwnerPreloadTest(unittest.TestCase): build.mkdir() (build / "fake.c").write_text(FAKE) (build / "program.c").write_text(PROGRAM) - cls.preload = build / "libblsession.so" + cls.preload = build / "libddsession.so" cls.fake = build / "fake.so" subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) @@ -104,7 +104,7 @@ class StorageOwnerPreloadTest(unittest.TestCase): def owners(self, program, *kinds): env = dict(os.environ, LD_PRELOAD="%s:%s" % (self.preload, self.fake)) - env.pop("BL_STORAGE_DIAGNOSTICS", None) + env.pop("DD_STORAGE_DIAGNOSTICS", None) paths = [str(self.dir / kind / "file") for kind in kinds] result = subprocess.run([str(program)] + paths, env=env, capture_output=True, text=True, check=True) return result.stdout.split() diff --git a/tools/tests/test_storage_preload.py b/tools/tests/test_storage_preload.py index f2408fd1e3..0279551039 100644 --- a/tools/tests/test_storage_preload.py +++ b/tools/tests/test_storage_preload.py @@ -104,7 +104,7 @@ class StoragePreloadTest(unittest.TestCase): def run_program(self, *steps, program=None): env = dict(os.environ, LD_PRELOAD="%s:%s" % (self.storage, self.fake), FAKE_LOG=str(self.log)) - env.pop("BL_STORAGE_DIAGNOSTICS", None) + env.pop("DD_STORAGE_DIAGNOSTICS", None) args = [str(program or self.steam)] for call, path, length in steps: args += [call, str(path), str(length)] diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index ce7c33e305..1ce1659ea7 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -65,13 +65,13 @@ class Detection(unittest.TestCase): folder = game(root, store_id='gog') sc = json.loads((folder / '.droiddeck-store.json').read_text()); sc['cloud'] = False (folder / '.droiddeck-store.json').write_text(json.dumps(sc)) - os.environ['BL_LAUNCH_DIR'] = str(Path(root) / 'session') + os.environ['DD_LAUNCH_DIR'] = str(Path(root) / 'session') try: with patch.object(store, 'ask', return_value={'ready': False, 'reason': 'off'}) as ask: self.assertEqual(0, store.main([str(folder / '.droiddeck-launch.bat')])) self.assertEqual('gog-achievements', ask.call_args.args[1]['op']) finally: - del os.environ['BL_LAUNCH_DIR'] + del os.environ['DD_LAUNCH_DIR'] @@ -163,12 +163,12 @@ class Choices(unittest.TestCase): (compat / 'pfx').mkdir(parents=True) reg = compat / 'pfx/user.reg' reg.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Epic Games\\\\EOS] 1\n"OverlayPath"="Z:\\\\x"\n"Other"="kept"\n') - os.environ['BL_LAUNCH_DIR'] = str(Path(root) / 'session') + os.environ['DD_LAUNCH_DIR'] = str(Path(root) / 'session') os.environ['STEAM_COMPAT_DATA_PATH'] = str(compat) try: self.assertEqual(0, store.main([str(folder / '.droiddeck-launch.bat')])) finally: - del os.environ['BL_LAUNCH_DIR'] + del os.environ['DD_LAUNCH_DIR'] del os.environ['STEAM_COMPAT_DATA_PATH'] self.assertFalse((Path(root) / 'session/stores/req').exists()) self.assertFalse((folder / '.droiddeck-epic-code').exists()) @@ -181,11 +181,11 @@ class Browser(unittest.TestCase): def test_a_web_address_is_handed_to_the_app(self): xdg = load_path(BIN / 'droiddeck-open-url', 'open_url') with tempfile.TemporaryDirectory() as root: - os.environ['BL_LAUNCH_DIR'] = root + os.environ['DD_LAUNCH_DIR'] = root try: self.assertEqual(0, xdg.main(['https://www.epicgames.com/activate'])) finally: - del os.environ['BL_LAUNCH_DIR'] + del os.environ['DD_LAUNCH_DIR'] reqs = list((Path(root) / 'stores/req').glob('*.json')) self.assertEqual(1, len(reqs)) self.assertEqual({'op': 'open-url', 'url': 'https://www.epicgames.com/activate'}, json.loads(reqs[0].read_text())) @@ -210,7 +210,7 @@ class CloudHooks(unittest.TestCase): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog', ident='1207664643') bat = str(folder / '.droiddeck-launch.bat') - os.environ['BL_LAUNCH_DIR'] = str(Path(root) / 'session') + os.environ['DD_LAUNCH_DIR'] = str(Path(root) / 'session') try: original = store.ask asked = [] @@ -219,7 +219,7 @@ class CloudHooks(unittest.TestCase): self.assertEqual(0, store.main(['--exited', bat])) finally: store.ask = original - del os.environ['BL_LAUNCH_DIR'] + del os.environ['DD_LAUNCH_DIR'] self.assertEqual('gog-achievements', asked[0][0]['op']) self.assertEqual({'op': 'cloud-down', 'store': 'gog', 'id': '1207664643'}, asked[1][0]) self.assertEqual(store.CLOUD_TIMEOUT, asked[1][1]) @@ -242,7 +242,7 @@ class CloudHooks(unittest.TestCase): (compat / 'pfx/user.reg').write_text('WINE REGISTRY Version 2\n') return __import__('subprocess').CompletedProcess(argv, 0) - env = {'BL_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': str(compat), 'BL_STORE_PROTON': str(proton)} + env = {'DD_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': str(compat), 'DD_STORE_PROTON': str(proton)} with patch.dict(os.environ, env), patch.object(store.subprocess, 'run', side_effect=run), \ patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0: order.append(request) or {'result': 'ok'}): self.assertEqual(store.STORE_GAME, store.main([str(folder / store.LAUNCHER)])) @@ -274,11 +274,11 @@ class CloudHooks(unittest.TestCase): def test_both_launchers_wait_for_proton_only_for_a_store_game(self): for sh in (compat.LAUNCHER_SH, compat.EXTRA_WRAPPER_SH): - self.assertIn('bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) - self.assertNotIn('exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) - self.assertIn('[ $rc -eq 10 ] && BL_STORE_EXIT=1', compat.BL_STORE_SETUP) - self.assertIn('droiddeck-store-launch --exited --code "$rc" "${BL_STORE_ARGS[@]}"', compat.BL_STORE_SETUP) - self.assertIn('exec "$@"', compat.BL_STORE_SETUP) + self.assertIn('dd_run ${DD_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) + self.assertNotIn('exec ${DD_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) + self.assertIn('[ $rc -eq 10 ] && DD_STORE_EXIT=1', compat.DD_STORE_SETUP) + self.assertIn('droiddeck-store-launch --exited --code "$rc" "${DD_STORE_ARGS[@]}"', compat.DD_STORE_SETUP) + self.assertIn('exec "$@"', compat.DD_STORE_SETUP) BNET_EXE = '/root/.local/share/Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe' @@ -294,30 +294,30 @@ class BattleNet(unittest.TestCase): other = BNET_EXE.replace('2596113170', '123') self.assertIsNone(store.battlenet([other, '--exec=launch Fen'], env={})) self.assertIsNone(store.battlenet(['/x/Diablo IV/Diablo IV.exe'], env={})) - self.assertIsNone(store.battlenet([BNET_EXE, '--exec=launch Fen'], env={'BL_BATTLENET': '1'})) + self.assertIsNone(store.battlenet([BNET_EXE, '--exec=launch Fen'], env={'DD_BATTLENET': '1'})) self.assertEqual([store.BATTLENET, 'open'], store.battlenet([BNET_EXE, '--exec=launch Fen;rm'], env={})) def test_the_launch_runs_there_and_the_wrapper_ends_with_it(self): with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=0) as call: - os.environ.pop('BL_BATTLENET', None) + os.environ.pop('DD_BATTLENET', None) self.assertEqual(store.RAN, store.main([BNET_EXE, '--exec=launch Pro'])) call.assert_called_once_with([store.BATTLENET, 'launch', 'Pro']) with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=1): - os.environ.pop('BL_BATTLENET', None) + os.environ.pop('DD_BATTLENET', None) self.assertEqual(store.RAN_FAILED, store.main([BNET_EXE, '--exec=launch Pro'])) - self.assertIn('[ $rc -eq 11 ] && exit 0', compat.BL_STORE_SETUP) - self.assertIn('[ $rc -eq 12 ] && exit 1', compat.BL_STORE_SETUP) - self.assertLess(compat.BL_STORE_SETUP.index('droiddeck-store-launch "$@"'), compat.BL_STORE_SETUP.index('[ $rc -eq 11 ] && exit 0')) + self.assertIn('[ $rc -eq 11 ] && exit 0', compat.DD_STORE_SETUP) + self.assertIn('[ $rc -eq 12 ] && exit 1', compat.DD_STORE_SETUP) + self.assertLess(compat.DD_STORE_SETUP.index('droiddeck-store-launch "$@"'), compat.DD_STORE_SETUP.index('[ $rc -eq 11 ] && exit 0')) class Launchers(unittest.TestCase): def test_both_proton_launchers_ask_before_proton_starts(self): sh = compat.LAUNCHER_SH - self.assertIn('bl_store_launch() {', sh) - self.assertLess(sh.index('bl_store_launch "$@"'), sh.index('droiddeck-game-env "$depot/proton"')) - self.assertIn('bl_store_launch "$@"', compat.EXTRA_WRAPPER_SH) - self.assertIn('bl_store_launch() {', compat.BL_STORE_SETUP) - self.assertIn('waitforexitandrun', compat.BL_STORE_SETUP) + self.assertIn('dd_store_launch() {', sh) + self.assertLess(sh.index('dd_store_launch "$@"'), sh.index('droiddeck-game-env "$depot/proton"')) + self.assertIn('dd_store_launch "$@"', compat.EXTRA_WRAPPER_SH) + self.assertIn('dd_store_launch() {', compat.DD_STORE_SETUP) + self.assertIn('waitforexitandrun', compat.DD_STORE_SETUP) def run_store_game(self, game, store_exit=True): with tempfile.TemporaryDirectory() as root: @@ -325,9 +325,9 @@ class Launchers(unittest.TestCase): record = Path(root) / 'exited' hook.write_text('#!/bin/sh\necho "$@" > "%s"\n' % record) hook.chmod(0o755) - setup = compat.BL_STORE_SETUP.replace('/usr/local/bin/droiddeck-store-launch --exited', str(hook) + ' --exited') - script = setup + '\nBL_STORE_ARGS=(game.bat)\n%sbl_run sh -c %s\nexit 99\n' % ( - 'BL_STORE_EXIT=1\n' if store_exit else '', shlex.quote(game)) + setup = compat.DD_STORE_SETUP.replace('/usr/local/bin/droiddeck-store-launch --exited', str(hook) + ' --exited') + script = setup + '\nDD_STORE_ARGS=(game.bat)\n%sdd_run sh -c %s\nexit 99\n' % ( + 'DD_STORE_EXIT=1\n' if store_exit else '', shlex.quote(game)) done = subprocess.run(['bash', '-c', script], start_new_session=True, timeout=20) return done.returncode, record.read_text().split() if record.exists() else None @@ -358,7 +358,7 @@ class GogAchievements(unittest.TestCase): sidecar = json.loads((folder / store.SIDECAR).read_text()) sidecar['cloud'] = False (folder / store.SIDECAR).write_text(json.dumps(sidecar)) - with patch.dict(os.environ, {'BL_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': root + '/compat', 'BL_STORE_PROTON': '/chosen/proton'}), patch.object(store, 'ask', return_value={'ready': True}) as ask, patch.object(store, 'provision_galaxy', return_value='ready') as provision: + with patch.dict(os.environ, {'DD_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': root + '/compat', 'DD_STORE_PROTON': '/chosen/proton'}), patch.object(store, 'ask', return_value={'ready': True}) as ask, patch.object(store, 'provision_galaxy', return_value='ready') as provision: self.assertEqual(0, store.main([str(folder / store.LAUNCHER)])) ask.assert_called_once() provision.assert_called_once_with(root + '/compat', '/chosen/proton') @@ -819,7 +819,7 @@ class GogRegistry(unittest.TestCase): def test_every_gog_launch_brings_the_registry_in(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog') - with patch.dict(os.environ, {'BL_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': root + '/compat/', 'BL_STORE_PROTON': '/chosen/proton'}), \ + with patch.dict(os.environ, {'DD_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': root + '/compat/', 'DD_STORE_PROTON': '/chosen/proton'}), \ patch.object(store, 'prepare_gog', return_value=False), patch.object(store, 'ask', return_value=None), \ patch.object(store, 'apply_gog_registry', return_value='ready') as apply, \ patch.object(store, 'gog_support_data', return_value='ready') as support: diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py index 9096d2d3c8..0f73f92f8a 100644 --- a/tools/tests/test_store_launch_ea.py +++ b/tools/tests/test_store_launch_ea.py @@ -152,7 +152,7 @@ class EaHook(unittest.TestCase): return {'ok': True, 'lsx': True, 'license': 'ok v4', 'licenses': [{'path': 'ProgramData/L/x.dlf', 'data': base64.b64encode(b'z').decode()}]} with patch.object(store, 'ask', fake_ask), patch.object(store, 'ea_registry', lambda *a, **k: 'ready'), \ - patch.object(store, 'ea_touchup', lambda *a, **k: 'none'), patch.dict('os.environ', {'BL_STORE_PROTON': ''}): + patch.object(store, 'ea_touchup', lambda *a, **k: 'none'), patch.dict('os.environ', {'DD_STORE_PROTON': ''}): store.prepare_ea(folder, {'id': 'Origin.OFR.1'}, str(compat), str(Path(tmp) / 'launch')) self.assertEqual(asked['op'], 'ea-prepare') self.assertEqual(asked['hardware'], probe) diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py index e17fa7b30b..277d2a9f2b 100644 --- a/tools/tests/test_store_launch_rockstar.py +++ b/tools/tests/test_store_launch_rockstar.py @@ -244,7 +244,7 @@ class RockstarLaunch(unittest.TestCase): if link is not None: (target / 'launcher.log').symlink_to(link) lines = [] - with patch.dict(os.environ, {'BL_LAUNCH_DIR': str(Path(root) / 'session'), 'STEAM_COMPAT_DATA_PATH': str(prefix)}), \ + with patch.dict(os.environ, {'DD_LAUNCH_DIR': str(Path(root) / 'session'), 'STEAM_COMPAT_DATA_PATH': str(prefix)}), \ patch.object(store, 'ask', return_value={'ok': True}), patch.object(store, 'log', lines.append): self.assertEqual(0, store.main(['--exited', str(folder / '.droiddeck-launch.bat')])) return lines, target / 'launcher.log' diff --git a/tools/tests/test_sysv_preload.py b/tools/tests/test_sysv_preload.py index fc8b8cead8..f39a9daccd 100644 --- a/tools/tests/test_sysv_preload.py +++ b/tools/tests/test_sysv_preload.py @@ -16,7 +16,7 @@ class SysvPreloadTest(unittest.TestCase): binary = str(Path(folder) / 'test-sysv') subprocess.run(['gcc', '-Wall', '-Wextra', '-O2', '-pthread', '-o', binary, str(Path(__file__).resolve().parent / 'sysv_otime_harness.c'), str(PRELOAD / 'sysv.c')], check=True) - env = dict(os.environ, BL_SYSV_DIR=folder) + env = dict(os.environ, DD_SYSV_DIR=folder) result = subprocess.run([binary], capture_output=True, text=True, timeout=10, env=env) self.assertIn('PASS: sysv otime', result.stdout, result.stdout + result.stderr) @@ -25,7 +25,7 @@ class SysvPreloadTest(unittest.TestCase): binary = str(Path(folder) / 'test-sysv-msg') subprocess.run(['gcc', '-Wall', '-Wextra', '-O2', '-pthread', '-o', binary, str(Path(__file__).resolve().parent / 'sysv_msg_harness.c'), str(PRELOAD / 'sysv.c')], check=True) - env = dict(os.environ, BL_SYSV_DIR=folder) + env = dict(os.environ, DD_SYSV_DIR=folder) result = subprocess.run([binary], capture_output=True, text=True, timeout=20, env=env) self.assertIn('PASS: sysv msg', result.stdout, result.stdout + result.stderr) diff --git a/tools/tests/test_tracer_preload.py b/tools/tests/test_tracer_preload.py index 90a4442248..82ae9072ec 100644 --- a/tools/tests/test_tracer_preload.py +++ b/tools/tests/test_tracer_preload.py @@ -122,12 +122,12 @@ class TracerPreloadTest(unittest.TestCase): (tmp / "ntdll.c").write_text(NTDLL) (tmp / "prog.c").write_text(PROGRAM) sources = sorted(str(p) for p in PRELOAD.glob("*.c")) - subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libblsession.so"), *sources, "-ldl"], + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libddsession.so"), *sources, "-ldl"], check=True) subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(tmp / "ntdll.so"), str(tmp / "ntdll.c")], check=True) subprocess.run(["cc", "-O1", "-o", str(tmp / "prog"), str(tmp / "prog.c"), str(tmp / "ntdll.so"), "-Wl,-rpath," + str(tmp)], check=True) - env = dict(os.environ, LD_PRELOAD=str(tmp / "libblsession.so")) + env = dict(os.environ, LD_PRELOAD=str(tmp / "libddsession.so")) out = subprocess.run([str(tmp / "prog")], env=env, capture_output=True, text=True, timeout=60) if out.returncode != 0: raise AssertionError(out.stdout + out.stderr) diff --git a/tools/tests/test_usr2_preload.py b/tools/tests/test_usr2_preload.py index 4a180df393..796c2390c9 100644 --- a/tools/tests/test_usr2_preload.py +++ b/tools/tests/test_usr2_preload.py @@ -251,13 +251,13 @@ class Usr2PreloadTest(unittest.TestCase): (tmp / "ntdll.c").write_text(NTDLL) (tmp / "prog.c").write_text(PROGRAM) sources = sorted(str(p) for p in PRELOAD.glob("*.c")) - subprocess.run([cls.cc, "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libblsession.so"), + subprocess.run([cls.cc, "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libddsession.so"), *sources, "-ldl"], check=True) subprocess.run([cls.cc, "-shared", "-fPIC", "-O2", "-o", str(tmp / "ntdll.so"), str(tmp / "ntdll.c")], check=True) subprocess.run([cls.cc, "-O1", "-U_FORTIFY_SOURCE", "-pthread", "-o", str(tmp / "prog"), str(tmp / "prog.c"), str(tmp / "ntdll.so"), "-Wl,-rpath," + str(tmp)], check=True) cls.program = tmp / "prog" - cls.preload = tmp / "libblsession.so" + cls.preload = tmp / "libddsession.so" @classmethod def tearDownClass(cls): diff --git a/tools/tests/test_vdec_emulator.py b/tools/tests/test_vdec_emulator.py index 8f9fbd6445..bf16a3fc39 100644 --- a/tools/tests/test_vdec_emulator.py +++ b/tools/tests/test_vdec_emulator.py @@ -28,9 +28,9 @@ DRIVER = r''' #include #include -int bl_vdec_open(const char *path, int flags); -int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc); -void bl_vdec_closed(int fd); +int dd_vdec_open(const char *path, int flags); +int dd_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc); +void dd_vdec_closed(int fd); void *SDL_LoadObject(const char *name); void *SDL_LoadFunction(void *handle, const char *name); @@ -74,12 +74,12 @@ int ioctl(int fd, unsigned long req, ...) { static int vfd; static int call(unsigned long req, void *arg) { int rc; - if (!bl_vdec_ioctl(vfd, req, arg, &rc)) return -100; + if (!dd_vdec_ioctl(vfd, req, arg, &rc)) return -100; return rc < 0 ? -errno : 0; } int main(void) { - if (bl_vdec_open("/dev/video0", O_RDWR) != -2) return 2; + if (dd_vdec_open("/dev/video0", O_RDWR) != -2) return 2; void *drm = SDL_LoadObject("libdrm.so.2"); if (!drm) return 3; int (*devices)(uint32_t, struct drm_device **, int) = SDL_LoadFunction(drm, "drmGetDevices2"); @@ -90,7 +90,7 @@ int main(void) { int card = open(dev[0]->nodes[0], O_RDWR | O_CLOEXEC); if (card < 0) return 6; - vfd = bl_vdec_open("/dev/video-dec0", O_RDWR); + vfd = dd_vdec_open("/dev/video-dec0", O_RDWR); if (vfd < 0) return 7; struct v4l2_capability cap; if (call(VIDIOC_QUERYCAP, &cap) || (cap.capabilities & 0x04004000) != 0x04004000) return 8; @@ -184,7 +184,7 @@ int main(void) { if (call(VIDIOC_DQBUF, &db)) return 37; unsigned char *m = mmap(NULL, size, PROT_READ, MAP_SHARED, bh.fd, 0); printf("%ld %u %c%c\n", (long)db.timestamp.tv_usec, db.index, m[0], m[(size_t)1920 * 1088]); - bl_vdec_closed(vfd); + dd_vdec_closed(vfd); return 0; } ''' @@ -249,13 +249,13 @@ class VdecEmulatorTest(unittest.TestCase): driver = tmp / 'driver.c' driver.write_text(DRIVER) binary = tmp / 'streaming_client' - subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(driver), str(VDEC), + subprocess.run(['cc', '-O1', '-pthread', '-DDD_VDEC_ANY_ARCH', '-o', str(binary), str(driver), str(VDEC), str(VENC), '-ldl'], check=True) sock = tmp / 'venc.sock' server = FakeDecoder(str(sock)) self.addCleanup(server.listener.close) server.start() - done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock)), + done = subprocess.run([str(binary)], env=dict(os.environ, DD_VENC_SOCKET=str(sock)), capture_output=True, text=True, timeout=20) self.assertEqual(done.returncode, 0, done.stdout + done.stderr) self.assertEqual(done.stdout.split('\n')[:6], @@ -272,7 +272,7 @@ class VdecEmulatorTest(unittest.TestCase): 'void *SDL_LoadObject(const char *);\n' 'int main(void) { return SDL_LoadObject("libdrm.so.2") != 0; }\n') binary = tmp / 'steam' - subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(tmp / 'main.c'), + subprocess.run(['cc', '-O1', '-pthread', '-DDD_VDEC_ANY_ARCH', '-o', str(binary), str(tmp / 'main.c'), str(VDEC), str(VENC), '-ldl'], check=True) done = subprocess.run([str(binary)], capture_output=True, text=True, timeout=20) self.assertEqual(done.returncode, 0, done.stderr) diff --git a/tools/tests/test_venc_emulator.py b/tools/tests/test_venc_emulator.py index 416f6b61b0..c601a3b2ee 100644 --- a/tools/tests/test_venc_emulator.py +++ b/tools/tests/test_venc_emulator.py @@ -21,22 +21,22 @@ DRIVER = r''' #include #include -int bl_venc_open(const char *path, int flags); -int bl_venc_ioctl(int fd, unsigned long req, void *arg, int *rc); -int bl_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, +int dd_venc_open(const char *path, int flags); +int dd_venc_ioctl(int fd, unsigned long req, void *arg, int *rc); +int dd_venc_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off, void *(*real)(void *, size_t, int, int, int, off_t), void **out); -void bl_venc_closed(int fd); +void dd_venc_closed(int fd); static int fd; static int call(unsigned long req, void *arg) { int rc; - if (!bl_venc_ioctl(fd, req, arg, &rc)) return -100; + if (!dd_venc_ioctl(fd, req, arg, &rc)) return -100; return rc < 0 ? -errno : 0; } int main(void) { - if (bl_venc_open("/dev/video0", 0) != -2) return 2; - fd = bl_venc_open("/dev/video-enc0", 0); + if (dd_venc_open("/dev/video0", 0) != -2) return 2; + fd = dd_venc_open("/dev/video-enc0", 0); if (fd < 0) return 3; struct v4l2_capability cap; if (call(VIDIOC_QUERYCAP, &cap) || !(cap.device_caps & V4L2_CAP_VIDEO_M2M_MPLANE)) return 4; @@ -58,7 +58,7 @@ int main(void) { struct v4l2_buffer b = { .index = i, .type = types[t], .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &p }; if (call(VIDIOC_QUERYBUF, &b)) return 9; void *m; - if (!bl_venc_mmap(NULL, p.length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, p.m.mem_offset, mmap, &m) || + if (!dd_venc_mmap(NULL, p.length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, p.m.mem_offset, mmap, &m) || m == MAP_FAILED) return 10; maps[t][i] = m; if (t == 1 && call(VIDIOC_QBUF, &b)) return 11; @@ -84,7 +84,7 @@ int main(void) { if (call(VIDIOC_DQBUF, &b)) return 16; if (call(VIDIOC_QBUF, &cb)) return 17; } - bl_venc_closed(fd); + dd_venc_closed(fd); return 0; } ''' @@ -95,8 +95,8 @@ TOUCH_DRIVER = r''' #include #include -int bl_venc_open(const char *path, int flags); -void bl_venc_closed(int fd); +int dd_venc_open(const char *path, int flags); +void dd_venc_closed(int fd); int XTestFakeMotionEvent(void *dpy, int screen, int x, int y, unsigned long delay); int XTestFakeButtonEvent(void *dpy, unsigned int button, int press, unsigned long delay); int XDisplayWidth(void *dpy, int screen) { return 1281; } @@ -105,7 +105,7 @@ int XDisplayHeight(void *dpy, int screen) { return 721; } int main(void) { XTestFakeButtonEvent(NULL, 1, 1, 0); XTestFakeButtonEvent(NULL, 1, 0, 0); - int fd = bl_venc_open("/dev/video-enc0", 0); + int fd = dd_venc_open("/dev/video-enc0", 0); if (fd < 0) return 3; XTestFakeMotionEvent(NULL, 0, 1280, 360, 0); XTestFakeButtonEvent(NULL, 1, 1, 0); @@ -116,11 +116,11 @@ int main(void) { snprintf(marker, sizeof marker, "%s/droiddeck-remote-play", getenv("XDG_RUNTIME_DIR")); if (access(marker, F_OK) != 0) return 4; pid_t child = fork(); - if (child == 0) { bl_venc_closed(fd); _exit(access(marker, F_OK) == 0 ? 0 : 1); } + if (child == 0) { dd_venc_closed(fd); _exit(access(marker, F_OK) == 0 ? 0 : 1); } int status; waitpid(child, &status, 0); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) return 5; - bl_venc_closed(fd); + dd_venc_closed(fd); if (access(marker, F_OK) == 0) return 6; XTestFakeButtonEvent(NULL, 1, 1, 0); usleep(200000); @@ -191,7 +191,7 @@ class VencEmulatorTest(unittest.TestCase): server = FakeEncoder(str(sock)) self.addCleanup(server.listener.close) server.start() - done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock)), + done = subprocess.run([str(binary)], env=dict(os.environ, DD_VENC_SOCKET=str(sock)), capture_output=True, text=True, timeout=20) self.assertEqual(done.returncode, 0, done.stdout + done.stderr) self.assertEqual(done.stdout.split('\n')[:3], @@ -217,7 +217,7 @@ class VencEmulatorTest(unittest.TestCase): server = FakeEncoder(str(sock)) self.addCleanup(server.listener.close) server.start() - done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock), XDG_RUNTIME_DIR=str(tmp)), + done = subprocess.run([str(binary)], env=dict(os.environ, DD_VENC_SOCKET=str(sock), XDG_RUNTIME_DIR=str(tmp)), capture_output=True, text=True, timeout=20) self.assertEqual(done.returncode, 0, done.stderr) self.assertEqual(server.touches, [(0, 65535, 32767), (1, 32767, 0), (2, 32767, 0)]) diff --git a/tools/tests/test_vrclient_loader.py b/tools/tests/test_vrclient_loader.py index d3b41e5636..805ad6d3a8 100644 --- a/tools/tests/test_vrclient_loader.py +++ b/tools/tests/test_vrclient_loader.py @@ -31,9 +31,9 @@ int probe(void) { #define _GNU_SOURCE #include #include -int bl_fsync_syscall(long n, const long *a, long *r) { (void)n; (void)a; (void)r; return 0; } -int bl_writewatch_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } -int bl_clock_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } +int dd_fsync_syscall(long n, const long *a, long *r) { (void)n; (void)a; (void)r; return 0; } +int dd_writewatch_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } +int dd_clock_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } #include """ + '"' + robust.as_posix() + '"' + r""" int main(int argc, char **argv) { assert(argc == 3); diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py index a7476945ce..3847e9988f 100644 --- a/tools/tests/test_webhelper_preload.py +++ b/tools/tests/test_webhelper_preload.py @@ -10,7 +10,7 @@ PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" PROGRAM = r""" #include #include -char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); +char *const *dd_webhelper_argv(const char *path, char *const argv[], char *const envp[]); int main(int argc, char **argv) { const char *mode = getenv("TEST_NODE_MODE_CHILD"); static char node[64]; @@ -18,7 +18,7 @@ int main(int argc, char **argv) { char *node_env[] = {node, NULL}; char *plain_env[] = {"PATH=/usr/bin", NULL}; char *const *envp = mode ? node_env : plain_env; - char *const *out = bl_webhelper_argv(argv[1], argv + 1, (char *const *)envp); + char *const *out = dd_webhelper_argv(argv[1], argv + 1, (char *const *)envp); for (int i = 0; out[i]; i++) printf("%s\n", out[i]); return 0; } @@ -43,10 +43,10 @@ class WebhelperPreloadTest(unittest.TestCase): shutil.rmtree(cls.tmp, ignore_errors=True) def argv(self, *args, spec=None, node_child=False, parent_node=False): - env = {k: v for k, v in os.environ.items() if k != "BL_WEBHELPER_ARGS"} + env = {k: v for k, v in os.environ.items() if k != "DD_WEBHELPER_ARGS"} env.pop("ELECTRON_RUN_AS_NODE", None) if spec is not None: - env["BL_WEBHELPER_ARGS"] = spec + env["DD_WEBHELPER_ARGS"] = spec if node_child is not False: env["TEST_NODE_MODE_CHILD"] = "1" if node_child is True else node_child else: diff --git a/tools/tests/test_winebus_rumble_preload.py b/tools/tests/test_winebus_rumble_preload.py index abd60c2743..a18f541e7a 100644 --- a/tools/tests/test_winebus_rumble_preload.py +++ b/tools/tests/test_winebus_rumble_preload.py @@ -67,7 +67,7 @@ class WinebusRumblePreloadTest(unittest.TestCase): build.mkdir() for name, text in (("shim.c", SHIM), ("upload.c", UPLOAD), ("program.c", PROGRAM)): (build / name).write_text(text) - cls.lib = cls.dir / "libblsession.so" + cls.lib = cls.dir / "libddsession.so" subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.lib), *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) cls.shim = cls.dir / "libshim.so" diff --git a/tools/tests/test_writable_preload.py b/tools/tests/test_writable_preload.py index dd18f63650..8a38926d7b 100644 --- a/tools/tests/test_writable_preload.py +++ b/tools/tests/test_writable_preload.py @@ -49,7 +49,7 @@ class WritablePreloadTest(unittest.TestCase): build = cls.dir / "build" build.mkdir() (build / "program.c").write_text(PROGRAM) - cls.preload = build / "libblsession.so" + cls.preload = build / "libddsession.so" subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) cls.editor = build / "kate" diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index 0e3fd2eca7..f082ba9a91 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -57,7 +57,7 @@ class XboxLaunchTest(unittest.TestCase): patch.dict(xbox['launch'].__globals__, wine=unittest.mock.Mock(return_value=7)): launch = xbox['launch'] self.assertEqual(launch(['/proton', 'waitforexitandrun', '/encrypted/Game.exe'], - {'BL_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale', + {'DD_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale', 'DROIDDECK_XBOX_CREDENTIAL_PORT': '4100', 'DROIDDECK_XBOX_CREDENTIAL_KEY': 'stale-key'}), 7) wine = launch.__globals__['wine'] self.assertEqual(wine.call_args.args[0], ['/private/Game.exe']) @@ -80,7 +80,7 @@ class XboxLaunchTest(unittest.TestCase): with patch('runpy.run_path', return_value={'find_store_game': lambda argv: (root, {'store': 'xbox', 'id': 'GAME'}), 'ask': ask}), \ patch.dict(xbox['launch'].__globals__, RUNTIME=root, bridge=unittest.mock.Mock(side_effect=OSError('bind failed'))): with self.assertRaises(OSError): - xbox['launch'](['/proton', 'waitforexitandrun', '/Game.exe'], {'BL_LAUNCH_DIR': '/launch'}) + xbox['launch'](['/proton', 'waitforexitandrun', '/Game.exe'], {'DD_LAUNCH_DIR': '/launch'}) self.assertEqual(ask.call_args.args[1], {'op': 'xbox-released', 'lease': 'lease-1'}) def test_bridge_authenticates_before_forwarding(self): @@ -391,6 +391,6 @@ class PlayFabProxyTest(unittest.TestCase): patch.dict(xbox['launch'].__globals__, RUNTIME=root, bridge=lambda path: (1, 'key', lambda: None), wine=wine, stage_playfab_proxy=stage): self.assertEqual(xbox['launch'](['/proton', 'waitforexitandrun', '/Game.exe'], - {'BL_LAUNCH_DIR': '/launch', 'WINEDLLOVERRIDES': 'd3d11=n'}), 0) + {'DD_LAUNCH_DIR': '/launch', 'WINEDLLOVERRIDES': 'd3d11=n'}), 0) self.assertEqual(wine.call_args.args[1]['WINEDLLOVERRIDES'], 'd3d11=n') self.assertEqual(staged, [root]) diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index 59bc500ee4..f518c3b367 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -266,7 +266,7 @@ class ZramPreloadTest(unittest.TestCase): build = cls.dir / "build" build.mkdir() (build / "program.c").write_text(PROGRAM) - cls.lib = build / "libblsession.so" + cls.lib = build / "libddsession.so" subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DZR_CTL=\"%s\"" % cls.ctl, "-o", str(cls.lib), *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) cls.steam = cls.dir / "steam" diff --git a/tools/ubuntu/proc/version b/tools/ubuntu/proc/version index 5e6716a598..4a0c36fa35 100644 --- a/tools/ubuntu/proc/version +++ b/tools/ubuntu/proc/version @@ -1 +1 @@ -Linux version 6.1.0 (bannerlator@android) (gcc version 12.0) #1 SMP PREEMPT +Linux version 6.1.0 (droiddeck@android) (gcc version 12.0) #1 SMP PREEMPT diff --git a/tools/vr/src/driver_droiddeck.cpp b/tools/vr/src/driver_droiddeck.cpp index 2535e04cc2..05f3aec58b 100644 --- a/tools/vr/src/driver_droiddeck.cpp +++ b/tools/vr/src/driver_droiddeck.cpp @@ -438,7 +438,7 @@ private: if (paths && !strncmp(paths, "0=", 2)) path.assign(paths + 2, strcspn(paths + 2, ";")); } if (path.empty()) { - if (const char *dir = getenv("BL_LAUNCH_DIR")) path = std::string(dir) + "/dev/fakeinput-rings/ring0"; + if (const char *dir = getenv("DD_LAUNCH_DIR")) path = std::string(dir) + "/dev/fakeinput-rings/ring0"; } if (path.empty()) return false; int fd = open(path.c_str(), O_RDONLY | O_CLOEXEC);