Implemented --extra-time

edomora97 · edomora97 · commit b2c1cd12e8eb · 2018-08-26T17:25:42.000+02:00
diff --git a/capnp/server.capnp b/capnp/server.capnp
@@ -33,6 +33,7 @@ interface Execution {
   disableCache @5 ();
   makeExclusive @6 ();
   setLimits @7 (limits: Resources);
+  setExtraTime @14 (extraTime: Float32);
 
   # Get file IDs representing outputs
   stdout @8 (isExecutable :Bool = false) -> (file :File);
diff --git a/cpp/frontend/frontend.cpp b/cpp/frontend/frontend.cpp
@@ -227,6 +227,12 @@ void Execution::setLimits(const Resources& limits) {
   my_builder_.AddPromise(req.send().ignoreResult());
 }
 
+void Execution::setExtraTime(float extra_time) {
+  auto req = execution_.setExtraTimeRequest();
+  req.setExtraTime(extra_time);
+  my_builder_.AddPromise(req.send().ignoreResult());
+}
+
 File* Execution::stdout(bool is_executable) {
   auto req = execution_.stdoutRequest();
   req.setIsExecutable(is_executable);
diff --git a/cpp/frontend/frontend.hpp b/cpp/frontend/frontend.hpp
@@ -175,6 +175,7 @@ class Execution {
   void disableCache();
   void makeExclusive();
   void setLimits(const Resources& limits);
+  void setExtraTime(float extra_time);
 
   File* stdout(bool is_executable);
   File* stderr(bool is_executable);
diff --git a/cpp/frontend/python/frontend.cpp b/cpp/frontend/python/frontend.cpp
@@ -117,6 +117,7 @@ PYBIND11_MODULE(task_maker_frontend, m) {
       .def("disableCache", &frontend::Execution::disableCache)
       .def("makeExclusive", &frontend::Execution::makeExclusive)
       .def("setLimits", &frontend::Execution::setLimits)
+      .def("setExtraTime", &frontend::Execution::setExtraTime)
       .def("stdout", &frontend::Execution::stdout,
            pybind11::return_value_policy::reference)
       .def("stderr", &frontend::Execution::stderr,
diff --git a/cpp/server/server.cpp b/cpp/server/server.cpp
@@ -210,6 +210,13 @@ kj::Promise<void> Execution::setLimits(SetLimitsContext context) {
   request_.setLimits(context.getParams().getLimits());
   return kj::READY_NOW;
 }
+kj::Promise<void> Execution::setExtraTime(SetExtraTimeContext context) {
+  KJ_LOG(INFO, "Execution " + description_,
+         kj::str("Setting extra time to ",
+                 std::to_string(context.getParams().getExtraTime())));
+  request_.setExtraTime(context.getParams().getExtraTime());
+  return kj::READY_NOW;
+}
 // TODO: check that this FIFO is from the correct execution group
 kj::Promise<void> Execution::addFifo(AddFifoContext context) {
   KJ_LOG(INFO, "Execution " + description_,
diff --git a/cpp/server/server.hpp b/cpp/server/server.hpp
@@ -42,6 +42,7 @@ class Execution : public capnproto::Execution::Server {
   kj::Promise<void> disableCache(DisableCacheContext context);
   kj::Promise<void> makeExclusive(MakeExclusiveContext context);
   kj::Promise<void> setLimits(SetLimitsContext context);
+  kj::Promise<void> setExtraTime(SetExtraTimeContext context);
   kj::Promise<void> addFifo(AddFifoContext context);
   kj::Promise<void> stdout(StdoutContext context);
   kj::Promise<void> stderr(StderrContext context);
diff --git a/cpp/worker/executor.cpp b/cpp/worker/executor.cpp
@@ -274,9 +274,9 @@ kj::Promise<void> Executor::Execute(capnproto::Request::Reader request_,
     // Scale up time limits to have a good margin for random occurrences.
     auto limits = request.getLimits();
     exec_options.cpu_limit_millis =
-        limits.getCpuTime() * 1200 + request.getExtraTime();
+        limits.getCpuTime() * 1200 + request.getExtraTime() * 1000;
     exec_options.wall_limit_millis =
-        limits.getWallTime() * 1200 + request.getExtraTime();
+        limits.getWallTime() * 1200 + request.getExtraTime() * 1000;
     exec_options.memory_limit_kb = limits.getMemory() * 1.2;
     exec_options.max_files = limits.getNofiles();
     exec_options.max_procs = limits.getNproc();
diff --git a/python/config.py b/python/config.py
@@ -35,7 +35,7 @@ def __init__(self, args):
 
         # execution group
         self.exclusive = args.exclusive  # type: bool
-        # self.extra_time = args.extra_time  # type: float
+        self.extra_time = args.extra_time  # type: float
         self.copy_exe = args.copy_exe  # type: # bool
 
         # terry group
diff --git a/python/formats/ioi_format.py b/python/formats/ioi_format.py
@@ -384,6 +384,8 @@ def add_non_solution(source: SourceFile):
                 output = eval.stdout(False)
             if config.exclusive:
                 eval.makeExclusive()
+            if config.extra_time:
+                eval.setExtraTime(config.extra_time)
 
             interface.add_evaluate_solution(st_num, tc_num, solution.name,
                                             eval)
diff --git a/python/languages/rust.py b/python/languages/rust.py
@@ -27,7 +27,7 @@ def get_compilation_command(self, source_filenames: List[str],
                 % source_filenames[0])
         cmd += ["-O", "-o", exe_name]
         # with rustc you only need to specify the main file
-        cmd += source_filenames[0]
+        cmd += [source_filenames[0]]
         return CommandType.SYSTEM, cmd
 
 
