debian/control: add Depends on pipewire-pulse | pulseaudio

[waydroid.git] / tools / actions / container_manager.py

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index 38b0040b92e07eee15a14b1af18545b1f7173c2f..b14dd63ae46983df9eb70b6c87c64739c0f0bb39 100644 (file)
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -3,11 +3,8 @@
 from shutil import which
 import logging
 import os
 from shutil import which
 import logging
 import os

-import time

 import glob
 import signal
 import glob
 import signal

-import sys
-import uuid

 import tools.config
 from tools import helpers
 from tools import services
 import tools.config
 from tools import helpers
 from tools import services


@@ -24,11 +21,13 @@ class DbusContainerManager(dbus.service.Object):
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='a{ss}', out_signature='', sender_keyword="sender", connection_keyword="conn")
     def Start(self, session, sender, conn):
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='a{ss}', out_signature='', sender_keyword="sender", connection_keyword="conn")
     def Start(self, session, sender, conn):

-        if session["user_id"] != "0":
-            dbus_info = dbus.Interface(conn.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus/Bus", False), "org.freedesktop.DBus")
-            uid = dbus_info.GetConnectionUnixUser(sender)
-            if str(uid) != session["user_id"]:
-                raise RuntimeError("Cannot start a session on behalf of another user")
+        dbus_info = dbus.Interface(conn.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus/Bus", False), "org.freedesktop.DBus")
+        uid = dbus_info.GetConnectionUnixUser(sender)
+        if str(uid) not in ["0", session["user_id"]]:
+            raise RuntimeError("Cannot start a session on behalf of another user")
+        pid = dbus_info.GetConnectionUnixProcessID(sender)
+        if str(uid) != "0" and str(pid) != session["pid"]:
+            raise RuntimeError("Invalid session pid")

         do_start(self.args, session)
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='b', out_signature='')
         do_start(self.args, session)
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='b', out_signature='')


@@ -78,16 +77,19 @@ def set_permissions(args, perm_list=None, mode="777"):
             "/dev/mtk_cmdq",
 
             # Graphics
             "/dev/mtk_cmdq",
 
             # Graphics

-            "/dev/dri",

             "/dev/graphics",
             "/dev/pvr_sync",
             "/dev/ion",
         ]
 
             "/dev/graphics",
             "/dev/pvr_sync",
             "/dev/ion",
         ]
 

+        # DRM render nodes
+        perm_list.extend(glob.glob("/dev/dri/renderD*"))

         # Framebuffers
         perm_list.extend(glob.glob("/dev/fb*"))
         # Videos
         perm_list.extend(glob.glob("/dev/video*"))
         # Framebuffers
         perm_list.extend(glob.glob("/dev/fb*"))
         # Videos
         perm_list.extend(glob.glob("/dev/video*"))

+        # DMA-BUF Heaps
+        perm_list.extend(glob.glob("/dev/dma_heap/*"))

 
     for path in perm_list:
         chmod(path, mode)
 
     for path in perm_list:
         chmod(path, mode)


@@ -130,6 +132,8 @@ def do_start(args, session):
     if "session" in args:
         raise RuntimeError("Already tracking a session")
 
     if "session" in args:
         raise RuntimeError("Already tracking a session")
 

+    logging.info("Starting up container for a new session")
+

     # Networking
     command = [tools.config.tools_src +
                "/data/scripts/waydroid-net.sh", "start"]
     # Networking
     command = [tools.config.tools_src +
                "/data/scripts/waydroid-net.sh", "start"]


@@ -140,38 +144,58 @@ def do_start(args, session):
         tools.helpers.run.user(
             args, ["waydroid-sensord", "/dev/" + args.HWBINDER_DRIVER], output="background")
 
         tools.helpers.run.user(
             args, ["waydroid-sensord", "/dev/" + args.HWBINDER_DRIVER], output="background")
 

-    # Mount rootfs
-    cfg = tools.config.load(args)
-    helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], session)
-
-    helpers.protocol.set_aidl_version(args)
-
-    # Mount data
-    helpers.mount.bind(args, session["waydroid_data"],
-                       tools.config.defaults["data"])
-

     # Cgroup hacks
     if which("start"):
         command = ["start", "cgroup-lite"]
         tools.helpers.run.user(args, command, check=False)
     # Cgroup hacks
     if which("start"):
         command = ["start", "cgroup-lite"]
         tools.helpers.run.user(args, command, check=False)

+
+    # Keep schedtune around in case nesting is supported

     if os.path.ismount("/sys/fs/cgroup/schedtune"):
     if os.path.ismount("/sys/fs/cgroup/schedtune"):

-        command = ["umount", "-l", "/sys/fs/cgroup/schedtune"]
-        tools.helpers.run.user(args, command, check=False)
+        try:
+            os.mkdir("/sys/fs/cgroup/schedtune/probe0")
+            os.mkdir("/sys/fs/cgroup/schedtune/probe0/probe1")
+        except:
+            command = ["umount", "-l", "/sys/fs/cgroup/schedtune"]
+            tools.helpers.run.user(args, command, check=False)
+        finally:
+            if os.path.exists("/sys/fs/cgroup/schedtune/probe0/probe1"):
+                os.rmdir("/sys/fs/cgroup/schedtune/probe0/probe1")
+            if os.path.exists("/sys/fs/cgroup/schedtune/probe0"):
+                os.rmdir("/sys/fs/cgroup/schedtune/probe0")

 
     #TODO: remove NFC hacks
     if which("stop"):
         command = ["stop", "nfcd"]
         tools.helpers.run.user(args, command, check=False)
 
     #TODO: remove NFC hacks
     if which("stop"):
         command = ["stop", "nfcd"]
         tools.helpers.run.user(args, command, check=False)

+    elif which("systemctl") and (tools.helpers.run.user(args, ["systemctl", "is-active", "-q", "nfcd"], check=False) == 0):
+        command = ["systemctl", "stop", "nfcd"]
+        tools.helpers.run.user(args, command, check=False)

 
     # Set permissions
     set_permissions(args)
 
 
     # Set permissions
     set_permissions(args)
 

+    # Create session-specific LXC config file
+    helpers.lxc.generate_session_lxc_config(args, session)
+    # Backwards compatibility
+    with open(tools.config.defaults["lxc"] + "/waydroid/config") as f:
+        if "config_session" not in f.read():
+            helpers.mount.bind(args, session["waydroid_data"],
+                               tools.config.defaults["data"])
+
+    # Mount rootfs
+    cfg = tools.config.load(args)
+    helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], session)
+
+    helpers.protocol.set_aidl_version(args)
+

     helpers.lxc.start(args)
     services.hardware_manager.start(args)
 
     args.session = session
 
 def stop(args, quit_session=True):
     helpers.lxc.start(args)
     services.hardware_manager.start(args)
 
     args.session = session
 
 def stop(args, quit_session=True):

+    logging.info("Stopping container")
+

     try:
         services.hardware_manager.stop(args)
         status = helpers.lxc.status(args)
     try:
         services.hardware_manager.stop(args)
         status = helpers.lxc.status(args)


@@ -189,6 +213,9 @@ def stop(args, quit_session=True):
         if which("start"):
             command = ["start", "nfcd"]
             tools.helpers.run.user(args, command, check=False)
         if which("start"):
             command = ["start", "nfcd"]
             tools.helpers.run.user(args, command, check=False)

+        elif which("systemctl") and (tools.helpers.run.user(args, ["systemctl", "is-enabled", "-q", "nfcd"], check=False) == 0):
+            command = ["systemctl", "start", "nfcd"]
+            tools.helpers.run.user(args, command, check=False)

 
         # Sensors
         if which("waydroid-sensord"):
 
         # Sensors
         if which("waydroid-sensord"):


@@ -201,11 +228,15 @@ def stop(args, quit_session=True):
         # Umount rootfs
         helpers.images.umount_rootfs(args)
 
         # Umount rootfs
         helpers.images.umount_rootfs(args)
 

-        # Umount data
-        helpers.mount.umount_all(args, tools.config.defaults["data"])
+        # Backwards compatibility
+        try:
+            helpers.mount.umount_all(args, tools.config.defaults["data"])
+        except:
+            pass

 
         if "session" in args:
             if quit_session:
 
         if "session" in args:
             if quit_session:

+                logging.info("Terminating session because the container was stopped")

                 try:
                     os.kill(int(args.session["pid"]), signal.SIGUSR1)
                 except:
                 try:
                     os.kill(int(args.session["pid"]), signal.SIGUSR1)
                 except: