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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index cc4a129..9597572 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,32 +4,41 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '5999.000_004';
+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/;
 
 use constant FORMAT_EXTENSION => {
+	BRAINFUCK => 'bf',
 	C => 'c',
 	CPP => 'cpp',
+	D => 'd',
 	GCCGO => 'go',
 	GOLANG => 'go',
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
-	MONO => 'cs',
 	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',
 };
 
@@ -61,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 {
@@ -75,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
@@ -101,11 +112,12 @@ 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 {
 	my ($job) = @_;
-	my $pb = problem_full($job->{problem});
+	my $pb = db()->select('problems', '*', {id => $job->{problem}})->hash;
 	my $meta = {
 		problem => $job->{problem},
 		files => {
@@ -120,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};
+	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} = {
@@ -129,6 +141,7 @@ sub process_job {
 		format => $pb->{verformat},
 		content => $pb->{versource},
 	} if $pb->{verformat};
+	$meta->{job_id} = $job->{id};
 
 	process $meta;
 
@@ -153,7 +166,7 @@ my $daemon = hostname . ":$$";
 sub run{
 	require Gruntmaster::Data;
 	Gruntmaster::Data->import;
-	Gruntmaster::Data::init($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+	dbinit($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started ($daemon)");
 	my $dir = tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;