From c1224c3e2301bb4dd43c3f8366c39621c84b0f4d Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 24 Mar 2018 15:47:32 +0100 Subject: [PATCH 1/2] Sandbox: Use isolate with --cg-timing if cgroup are enabled --- cms/grading/Sandbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/grading/Sandbox.py b/cms/grading/Sandbox.py index ed4c044e33..9d2687b5d5 100644 --- a/cms/grading/Sandbox.py +++ b/cms/grading/Sandbox.py @@ -1038,7 +1038,7 @@ def build_box_options(self): if self.box_id is not None: res += ["--box-id=%d" % self.box_id] if self.cgroup: - res += ["--cg"] + res += ["--cg", "--cg-timing"] if self.chdir is not None: res += ["--chdir=%s" % self.chdir] for in_name, out_name, options in self.dirs: From fff8912e0cf364ff88d4b9e2481584a65a88bfee Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 24 Mar 2018 15:47:54 +0100 Subject: [PATCH 2/2] Sandbox: Isolate requires --mem if cgroups are disabled, --cg-mem if enabled --- cms/grading/Sandbox.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cms/grading/Sandbox.py b/cms/grading/Sandbox.py index 9d2687b5d5..f65487fe97 100644 --- a/cms/grading/Sandbox.py +++ b/cms/grading/Sandbox.py @@ -1061,7 +1061,10 @@ def build_box_options(self): if self.stack_space is not None: res += ["--stack=%d" % self.stack_space] if self.address_space is not None: - res += ["--cg-mem=%d" % self.address_space] + if self.cgroup: + res += ["--cg-mem=%d" % self.address_space] + else: + res += ["--mem=%d" % self.address_space] if self.stdout_file is not None: res += ["--stdout=%s" % self.inner_absolute_path(self.stdout_file)] if self.max_processes is not None: