Changeset 264096 in webkit

Timestamp:

Jul 8, 2020, 4:22:43 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak SDK] Pre-start sccache server
​https://bugs.webkit.org/show_bug.cgi?id=213973

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-07-08
Reviewed by Žan Doberšek.

Pre-start the sccache-dist server when the flatpak sandbox is being invoked for a build.
Usually the first sccache client process would do it but it seems to be racy when a large
number of clients is being started simultaneously.

• flatpak/flatpakutils.py:

(WebkitFlatpak.run_in_sandbox):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-08  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Pre-start sccache server
+        https://bugs.webkit.org/show_bug.cgi?id=213973
+
+        Reviewed by Žan Doberšek.
+
+        Pre-start the sccache-dist server when the flatpak sandbox is being invoked for a build.
+        Usually the first sccache client process would do it but it seems to be racy when a large
+        number of clients is being started simultaneously.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-07-08  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -654 +654 @@
     def run_in_sandbox(self, *args, **kwargs):
         self.setup_builddir()
-        cwd = kwargs.pop("cwd", None)
-        extra_env_vars = kwargs.pop("env", {})
-        stdout = kwargs.pop("stdout", sys.stdout)
-        extra_flatpak_args = kwargs.pop("extra_flatpak_args", [])
-        skip_icc = kwargs.pop("skip_icc", False)
+        cwd = kwargs.get("cwd", None)
+        extra_env_vars = kwargs.get("env", {})
+        stdout = kwargs.get("stdout", sys.stdout)
+        extra_flatpak_args = kwargs.get("extra_flatpak_args", [])
+        start_sccache = kwargs.get("start_sccache", True)
+        skip_icc = kwargs.get("skip_icc", False)
 
         if not isinstance(args, list):
@@ -775 +776 @@
                                       "SCCACHE_GCS_BUCKET", "SCCACHE_AZURE_CONNECTION_STRING",
                                       "WEBKIT_USE_SCCACHE"])
-        if remote_sccache_configs.intersection(set(os.environ.keys())):
+        if remote_sccache_configs.intersection(set(os.environ.keys())) and start_sccache:
             _log.debug("Enabling network access for the remote sccache")
             flatpak_command.append(share_network_option)
 
-            if os.path.isfile(self.sccache_config_file) and not self.regenerate_toolchains and "SCCACHE_CONF" not in os.environ.keys():
-                sandbox_environment["SCCACHE_CONF"] = self.host_path_to_sandbox_path(self.sccache_config_file)
-
-        override_sccache_server_port = os.environ.get("WEBKIT_SCCACHE_SERVER_PORT")
-        if override_sccache_server_port:
-            _log.debug("Overriding sccache server port to %s" % override_sccache_server_port)
-            sandbox_environment["SCCACHE_SERVER_PORT"] = override_sccache_server_port
+            sccache_environment = {}
+            if os.path.isfile(self.sccache_config_file) and not self.regenerate_toolchains and \
+               "SCCACHE_CONF" not in os.environ.keys():
+                sccache_environment["SCCACHE_CONF"] = self.host_path_to_sandbox_path(self.sccache_config_file)
+
+            override_sccache_server_port = os.environ.get("WEBKIT_SCCACHE_SERVER_PORT")
+            if override_sccache_server_port:
+                _log.debug("Overriding sccache server port to %s" % override_sccache_server_port)
+                sccache_environment["SCCACHE_SERVER_PORT"] = override_sccache_server_port
+
+            if building:
+                # Spawn the sccache server in background, and avoid recursing here, using a bool keyword.
+                _log.debug("Pre-starting the SCCache dist server")
+                self.run_in_sandbox("sccache", "--start-server", env=sccache_environment,
+                                    extra_flatpak_args=[share_network_option], start_sccache=False)
+
+            # Forward sccache server env vars to sccache clients.
+            sandbox_environment.update(sccache_environment)
 
         if self.use_icecream and not skip_icc: