Make Xvfb more robust when run inside a container

Author: jacob-hughes

alloy_adapter.py

@@ -52,7 +52,6 @@ def setup_stats(self, run_id):
         if "GC_LOG_DIR" in run_id.env:
             logdir = run_id.env["GC_LOG_DIR"]
             run_id.env["GC_LOG_FILE"] = f"{logdir}-{bm}.csv"
-        run_id.env["DISPLAY"] = ":99"
 
     def acquire_command(self, run_id):
         self.setup_stats(run_id)

build.py

@@ -228,16 +228,6 @@ def has_unstaged_changes(c, directory):
         return result.exited != 0
 
 
-@contextmanager
-def xvfb_display(width=1280, height=720, colordepth=24, display=99):
-    xvfb = Xvfb(width=width, height=height, colordepth=colordepth, display=display)
-    try:
-        xvfb.start()
-        yield xvfb
-    finally:
-        xvfb.stop()
-
-
 def patch_repo(c, repo_path, patch_file):
     repo_path = Path(repo_path)
     patch_file = Path(patch_file)
@@ -693,17 +683,13 @@ class Alacritty(BenchmarkSuite):
     )
 
     @property
-    def cfg_args(self):
+    def cmd_args(self):
         return (
             f"-e bash -c \"[ ! -f {self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'setup'} ] || "
             f"{self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'setup'} && "
             f"{self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'benchmark'}\""
         )
 
-    # @property
-    # def cfg_args(self):
-    #     return f"""-e bash -c \"[ ! -f {self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'setup'} ] || {self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'setup'} && {self.VTE_BENCH.src / 'benchmarks' / '%(benchmark)s' / 'benchmark'}\""""
-
     def build(self, c, target_dir, install_dir, bench_cfg_bin, profile, env):
         self.VTE_BENCH.fetch()
         self.ALACRITTY.fetch()
@@ -747,7 +733,7 @@ def run(self, c, pexecs, config):
         ]
 
         if self.suite.name == "alacritty":
-            with Xvfb():
+            with Xvfb(display="99"):
                 c.run(" ".join(rebench_cmd), warn=True, pty=True)
         else:
             c.run(" ".join(rebench_cmd), warn=True, pty=True)
@@ -998,16 +984,13 @@ def config(self) -> Path:
                         "env": {
                             "GC_LOG_DIR": str(cfg.metrics_data),
                             "LD_PRELOAD": libgc,
+                            "DISPLAY": ":99",
                         }
                     }
                 )
             else:
                 exec_part[cfg.name].update(
-                    {
-                        "env": {
-                            "LD_PRELOAD": libgc,
-                        }
-                    }
+                    {"env": {"LD_PRELOAD": libgc, "DISPLAY": ":99"}}
                 )
 
         for e in self.experiments:

patch/alacritty.arc.diff

@@ -1,5 +1,5 @@
 diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs
-index 6bbf8dfd..e80a28fa 100644
+index 6bbf8dfd..3409851b 100644
 --- a/alacritty/src/main.rs
 +++ b/alacritty/src/main.rs
 @@ -1,5 +1,6 @@
@@ -9,17 +9,6 @@ index 6bbf8dfd..e80a28fa 100644
  #![warn(rust_2018_idioms, future_incompatible)]
  #![deny(clippy::all, clippy::if_not_else, clippy::enum_glob_use)]
  #![cfg_attr(clippy, deny(warnings))]
-@@ -18,6 +19,10 @@ use std::io::{self, Write};
- use std::path::PathBuf;
- use std::{env, fs};
- 
-+use std::gc::GcAllocator;
-+#[global_allocator]
-+static A: GcAllocator = GcAllocator;
-+
- use log::info;
- #[cfg(windows)]
- use windows_sys::Win32::System::Console::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS};
 diff --git a/alacritty/src/window_context.rs b/alacritty/src/window_context.rs
 index cfc3cd96..bfca494b 100644
 --- a/alacritty/src/window_context.rs