Changeset 233979 in webkit

Timestamp:

Jul 19, 2018 1:24:27 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak] Let flatpak process handle SIGINT
​https://bugs.webkit.org/show_bug.cgi?id=187521

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-07-19
Reviewed by Philippe Normand.

Ensuring that flatpak process ends properly and that the sandbox is teard down.
It also avoids showing usless backtrace to the end user and makes gdb
much more usable.

Also make flatpakutils not verbose by default

• flatpak/flatpakutils.py:

(disable_signals):
(WebkitFlatpak.run_in_sandbox):
(WebkitFlatpak.run_gdb):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-07-19  Thibault Saunier  <tsaunier@igalia.com>
+
+        [Flatpak] Let flatpak process handle SIGINT
+        https://bugs.webkit.org/show_bug.cgi?id=187521
+
+        Reviewed by Philippe Normand.
+
+        Ensuring that flatpak process ends properly and that the sandbox is teard down.
+        It also avoids showing usless backtrace to the end user and makes gdb
+        much more usable.
+
+        Also make flatpakutils not verbose by default
+
+        * flatpak/flatpakutils.py:
+        (disable_signals):
+        (WebkitFlatpak.run_in_sandbox):
+        (WebkitFlatpak.run_gdb):
+
 2018-07-18  Stephan Szabo  <stephan.szabo@sony.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -21 +21 @@
 except ImportError:
     import ConfigParser as configparser
+from contextlib import contextmanager
 import errno
 import json
@@ -26 +27 @@
 import shlex
 import shutil
+import signal
 import subprocess
 import sys
@@ -443 +445 @@
         self.flatpak("update", self.name, self.branch, show_output=True,
                     *extra_args, comment=comment)
+
+
+@contextmanager
+def disable_signals(signals=[signal.SIGINT]):
+    old_signal_handlers = []
+
+    for disabled_signal in signals:
+        old_signal_handlers.append((disabled_signal, signal.getsignal(disabled_signal)))
+        signal.signal(disabled_signal, signal.SIG_IGN)
+
+    yield
+
+    for disabled_signal, previous_handler in old_signal_handlers:
+        signal.signal(disabled_signal, previous_handler)
 
 
@@ -518 +534 @@
         self.app = None
 
-        self.verbose = True
+        self.verbose = False
         self.quiet = False
         self.packs = []
@@ -705 +721 @@
             flatpak_command.extend(['sh', "/run/host/" + tmpscript.name])
 
-            try:
-                subprocess.check_call(flatpak_command, stdout=stdout)
-            except subprocess.CalledProcessError as e:
-                sys.stderr.write(str(e) + "\n")
-                return e.returncode
+            with disable_signals():
+                try:
+                    subprocess.check_call(flatpak_command, stdout=stdout)
+                except subprocess.CalledProcessError as e:
+                    sys.stderr.write(str(e) + "\n")
+                    return e.returncode
 
         return 0
@@ -795 +812 @@
 
     def run_gdb(self):
-        try:
-            subprocess.check_output(['which', 'coredumpctl'])
-        except subprocess.CalledProcessError as e:
-            sys.stderr.write("'coredumpctl' not present on the system, can't run. (%s)\n" % e)
-            return e.returncode
+        with disable_signals():
+            try:
+                subprocess.check_output(['which', 'coredumpctl'])
+            except subprocess.CalledProcessError as e:
+                sys.stderr.write("'coredumpctl' not present on the system, can't run. (%s)\n" % e)
+                return e.returncode
 
         # We need access to the host from the sandbox to run.