Communicate wall clock timeouts to contestants

Situations where the solution does not use cpu time can be confused,
as the contestant previously would have seen "Timeout - 0.0s". Now it
is a little bit better: "Timeout (wall clock) - 0.0s".

Author: stefano-maggiolo

cms/grading/Sandbox.py

@@ -190,6 +190,7 @@ class SandboxBase(object):
     EXIT_OK = 'ok'
     EXIT_SIGNAL = 'signal'
     EXIT_TIMEOUT = 'timeout'
+    EXIT_TIMEOUT_WALL = 'wall timeout'
     EXIT_FILE_ACCESS = 'file access'
     EXIT_SYSCALL = 'syscall'
     EXIT_NONZERO_RETURN = 'nonzero return'
@@ -1118,7 +1119,10 @@ def get_exit_status(self):
         elif 'FA' in status_list:
             return self.EXIT_FILE_ACCESS
         elif 'TO' in status_list:
-            return self.EXIT_TIMEOUT
+            if 'message' in self.log and 'wall' in self.log['message'][0]:
+                return self.EXIT_TIMEOUT_WALL
+            else:
+                return self.EXIT_TIMEOUT
         elif 'SG' in status_list:
             return self.EXIT_SIGNAL
         elif 'RE' in status_list:
@@ -1147,6 +1151,8 @@ def get_human_exit_description(self):
                 % self.get_forbidden_file_error()
         elif status == self.EXIT_TIMEOUT:
             return "Execution timed out"
+        elif status == self.EXIT_TIMEOUT_WALL:
+            return "Execution timed out (wall clock limit exceeded)"
         elif status == self.EXIT_SIGNAL:
             return "Execution killed with signal %d" % \
                 self.get_killing_signal()

cms/grading/__init__.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2015 Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
-# Copyright © 2010-2014 Stefano Maggiolo <s.maggiolo@gmail.com>
+# Copyright © 2010-2015 Stefano Maggiolo <s.maggiolo@gmail.com>
 # Copyright © 2010-2012 Matteo Boscariol <boscarim@hotmail.com>
 # Copyright © 2013 Bernard Blackham <bernard@largestprime.net>
 # Copyright © 2013-2014 Luca Wehrstedt <luca.wehrstedt@gmail.com>
@@ -284,7 +284,8 @@ def compilation_step(sandbox, commands):
         text = [N_("Compilation failed")]
 
     # Timeout: returning the error to the user
-    elif exit_status == Sandbox.EXIT_TIMEOUT:
+    elif exit_status == Sandbox.EXIT_TIMEOUT or \
+            exit_status == Sandbox.EXIT_TIMEOUT_WALL:
         logger.debug("Compilation timed out.")
         success = True
         compilation_success = False
@@ -438,6 +439,11 @@ def evaluation_step_after_run(sandbox):
         logger.debug("Execution timed out.")
         success = True
 
+    # Wall clock timeout: returning the error to the user.
+    elif exit_status == Sandbox.EXIT_TIMEOUT_WALL:
+        logger.debug("Execution timed out (wall clock limit exceeded).")
+        success = True
+
     # Suicide with signal (memory limit, segfault, abort): returning
     # the error to the user.
     elif exit_status == Sandbox.EXIT_SIGNAL:
@@ -501,6 +507,8 @@ def human_evaluation_message(plus):
     exit_status = plus['exit_status']
     if exit_status == Sandbox.EXIT_TIMEOUT:
         return [N_("Execution timed out")]
+    elif exit_status == Sandbox.EXIT_TIMEOUT_WALL:
+        return [N_("Execution timed out (wall clock limit exceeded)")]
     elif exit_status == Sandbox.EXIT_SIGNAL:
         return [N_("Execution killed with signal %d (could be triggered by "
                    "violating memory limits)"), plus['signal']]

cmstestsuite/Test.py

@@ -3,6 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2012 Bernard Blackham <bernard@largestprime.net>
+# Copyright © 2014-2015 Stefano Maggiolo <s.maggiolo@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -103,6 +104,13 @@ def __init__(self):
             self, "timed out", "Execution timed out")
 
 
+class CheckTimeoutWall(CheckAbstractEvaluationFailure):
+    def __init__(self):
+        CheckAbstractEvaluationFailure.__init__(
+            self, "wall timed out",
+            "Execution timed out (wall clock limit exceeded)")
+
+
 class CheckForbiddenSyscall(CheckAbstractEvaluationFailure):
     def __init__(self, syscall_name=''):
         CheckAbstractEvaluationFailure.__init__(

cmstestsuite/Tests.py

@@ -31,7 +31,7 @@
 from cms import LANGUAGES, LANG_C, LANG_CPP, LANG_PASCAL, LANG_JAVA, \
     LANG_PYTHON
 from cmstestsuite.Test import Test, CheckOverallScore, CheckCompilationFail, \
-    CheckTimeout, CheckNonzeroReturn
+    CheckTimeout, CheckTimeoutWall, CheckNonzeroReturn
 
 
 ALL_LANGUAGES = tuple(LANGUAGES)
@@ -111,7 +111,7 @@
     Test('timeout-pause',
          task=batch_stdio, filename='timeout-pause.%l',
          languages=(LANG_CPP,),
-         checks=[CheckOverallScore(0, 100), CheckTimeout()]),
+         checks=[CheckOverallScore(0, 100), CheckTimeoutWall()]),
 
     Test('timeout-sleep',
          task=batch_stdio, filename='timeout-sleep.%l',