Changeset 295349 in webkit

Timestamp:

Jun 7, 2022, 9:13:20 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[WPE][GTK] xdg-dbus-proxy process sometimes go zombie
​https://bugs.webkit.org/show_bug.cgi?id=241317

Patch by Philippe Normand <​philn@igalia.com> on 2022-06-07
Reviewed by Adrian Perez de Castro and Xabier Rodriguez-Calvar.

The atexit hook seems problematic for subprocesses, so try to kill the xdg-dbus-proxy process from
the WebKitFlatpak destructor instead.

• Tools/flatpak/flatpakutils.py:

(WebkitFlatpak.init):
(WebkitFlatpak):
(WebkitFlatpak.del):
(WebkitFlatpak.setup_a11y_proxy):

Canonical link: ​https://commits.webkit.org/251364@main

File:

• trunk/Tools/flatpak/flatpakutils.py (modified) (2 diffs)

trunk/Tools/flatpak/flatpakutils.py

@@ -578 +578 @@
         self.sccache_scheduler = DEFAULT_SCCACHE_SCHEDULER
 
+        self.dbus_proxy_process = None
+
+    def __del__(self):
+        if self.dbus_proxy_process:
+            self.dbus_proxy_process.kill()
+
     def execute_command(self, args, stdout=None, stderr=None, env=None, keep_signals=True):
         if keep_signals:
@@ -756 +762 @@
 
         try:
-            proxy_proc = subprocess.Popen((dbus_proxy_path, a11y_bus_address, self.a11y_socket.name))
-
-            atexit.register(lambda: proxy_proc.terminate())
+            self.dbus_proxy_process = subprocess.Popen((dbus_proxy_path, a11y_bus_address, self.a11y_socket.name, "--talk=org.a11y.Bus"), close_fds=True)
         except (subprocess.CalledProcessError) as e:
             _log.warning("Failed to run xdg-dbus-proxy {}. Can't forward a11y bus.".format(e))