Compute user program executon time instead of full test running time

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index ad4e727e774d5e704cb6431e73952f7efef256fa..2af9b5306a78229d334deaa819bd2b0fd30ece26 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -13,7 +13,6 @@ use File::Slurp qw/read_file/;
 use File::Temp qw/tempdir/;
 use JSON qw/decode_json encode_json/;
 use Sys::Hostname qw/hostname/;
-use Time::HiRes qw/time/;
 use Try::Tiny;
 use Log::Log4perl qw/get_logger/;
 
@@ -21,6 +20,7 @@ use constant FORMAT_EXTENSION => {
        BRAINFUCK => 'bf',
        C => 'c',
        CPP => 'cpp',
+       D => 'd',
        GCCGO => 'go',
        GOLANG => 'go',
        GOLFSCRIPT => 'gs',
@@ -28,8 +28,11 @@ use constant FORMAT_EXTENSION => {
        JAVA => 'java',
        JULIA => 'jl',
        MONO => 'cs',
+       OBERON => 'm',
+       OCAML => 'ml',
        PASCAL => 'pas',
        PERL => 'pl',
+       PHP => 'php',
        PYTHON => 'py',
        RUBY => 'rb',
        RUST => 'rs',
@@ -64,7 +67,6 @@ sub process{
                $judge = safe_can Judge => judge => $judge;
 
                for my $test (1 .. $testcnt) {
-                       my $start_time = time;
                        my $result;
                        unlink 'result';
                        try {
@@ -78,14 +80,17 @@ sub process{
                                }
                        };
 
+                       my $time = '?';
+                       $time = (read_file 'time-stop-prog') - (read_file 'time-start-prog') if -f 'time-stop-prog' && -f 'time-start-prog';
+                       unlink 'time-start-prog', 'time-stop-prog';
                        if (ref $result) {
                                my $result_text = $result->[1];
                                $result_text .= ': ' . read_file 'result' if -s 'result';
                                get_logger->trace("Test $test result is " . $result_text);
-                               push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => time - $start_time}
+                               push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => $time}
                        } else {
                                get_logger->trace("Test $test result is $result");
-                               push @full_results, {id => $test, result => 0, result_text => $result, time => time - $start_time}
+                               push @full_results, {id => $test, result => 0, result_text => $result, time => $time}
                        }
                        push @results, $result;
                        last if $meta->{judge} eq 'Absolute' && ref $result