X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=2af9b5306a78229d334deaa819bd2b0fd30ece26;hp=b6d3a522f5935d6585dc612901b1d51634724648;hb=34cc90c9aa31c1cad1fcef0684e940407426ad1d;hpb=8473542d42779eebcd7b0dd45dcf5183d112252c

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index b6d3a52..2af9b53 100644
--- 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,6 +28,8 @@ use constant FORMAT_EXTENSION => {
 	JAVA => 'java',
 	JULIA => 'jl',
 	MONO => 'cs',
+	OBERON => 'm',
+	OCAML => 'ml',
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PHP => 'php',
@@ -65,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 {
@@ -79,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