Skip to content

Fix isolate options #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gollux wants to merge 2 commits into from
Closed

Fix isolate options #913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1224c3
Sandbox: Use isolate with --cg-timing if cgroup are enabled
gollux Mar 24, 2018
fff8912
Sandbox: Isolate requires --mem if cgroups are disabled, --cg-mem if …
gollux Mar 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cms/grading/Sandbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down