X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=9597572cbbdb8cd31bc33ecde60d7ad07dc5be97;hp=ad4e727e774d5e704cb6431e73952f7efef256fa;hb=HEAD;hpb=fb85e61f17db54c31c74fbafea6258e5c582efec

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index ad4e727..9597572 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,12 +8,12 @@ our $VERSION = '5999.000_005';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
+use Gruntmaster::SendResults qw/send_results_request/;
 
 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,16 +21,22 @@ use constant FORMAT_EXTENSION => {
 	BRAINFUCK => 'bf',
 	C => 'c',
 	CPP => 'cpp',
+	D => 'd',
 	GCCGO => 'go',
 	GOLANG => 'go',
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	JAVA => 'java',
+	JAVASCRIPT => 'js',
 	JULIA => 'jl',
 	MONO => 'cs',
+	OBERON => 'm',
+	OCAML => 'ml',
 	PASCAL => 'pas',
 	PERL => 'pl',
+	PHP => 'php',
 	PYTHON => 'py',
+	PYTHON3 => 'py',
 	RUBY => 'rb',
 	RUST => 'rs',
 	SBCL => 'l',
@@ -64,7 +70,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 +83,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
@@ -104,6 +112,7 @@ sub process{
 	$meta->{errors} = $errors;
 
 	get_logger->info('Job result: ' . $meta->{result_text});
+	send_results_request($meta->{job_id}, $meta->{result}, $meta->{result_text});
 }
 
 sub process_job {
@@ -123,8 +132,8 @@ sub process_job {
 	my $timeout_override = db()->query('SELECT timeout FROM limits WHERE problem=? AND format=?', $job->{problem}, $job->{format})->list;
 	$meta->{timeout} = $timeout_override if defined $timeout_override;
 	$meta->{tests} = decode_json $pb->{tests} if $meta->{runner} eq 'File';
-	$job->{contest} &&= contest_entry($job->{contest});
-	delete $meta->{precnt} unless $job->{contest} && $job->{contest}{started} && !$job->{contest}{finished}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
+	my $contest = $job->{contest} && contest_entry($job->{contest});
+	delete $meta->{precnt} unless $contest && $contest->{started} && !$contest->{finished}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
 	$meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
 	$meta->{files}{ver} = {
@@ -132,6 +141,7 @@ sub process_job {
 		format => $pb->{verformat},
 		content => $pb->{versource},
 	} if $pb->{verformat};
+	$meta->{job_id} = $job->{id};
 
 	process $meta;