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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index fe252f7..9597572 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,39 +4,46 @@ 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',
 };
 
 ##################################################
 
-my $db;
-
 sub safe_can {
 	my ($type, $sub, $name) = @_;
 
@@ -63,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 {
@@ -77,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
@@ -103,77 +112,68 @@ 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 = db()->select('problems', '*', {id => $job->{problem}})->hash;
 	my $meta = {
-		problem => $job->problem->id,
+		problem => $job->{problem},
 		files => {
 			prog => {
-				name => 'prog.' . $job->extension,
-				format => $job->format,
-				content => $job->source,
+				name => 'prog.' . $job->{extension},
+				format => $job->{format},
+				content => $job->{source},
 			},
 		},
-		map { $_ => $job->problem->get_column($_) } qw/generator runner judge precnt testcnt timeout olimit/
+		map { $_ => $pb->{$_} } qw/generator runner judge precnt testcnt timeout olimit/
 	};
-	my $limit_override = $job->result_source->schema->limits->find($meta->{problem}, $job->format);
-	$meta->{timeout} = $limit_override->timeout if $limit_override;
-	$meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
-	delete $meta->{precnt} unless $job->contest;
+	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';
+	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} = {
-		name => 'ver.' . FORMAT_EXTENSION->{$job->problem->verformat},
-		format => $job->problem->verformat,
-		content => $job->problem->versource,
-	} if $job->problem->verformat;
+		name => 'ver.' . FORMAT_EXTENSION->{$pb->{verformat}},
+		format => $pb->{verformat},
+		content => $pb->{versource},
+	} if $pb->{verformat};
+	$meta->{job_id} = $job->{id};
 
 	process $meta;
 
 	$meta->{result_text} .= ' (pretests)' if $meta->{precnt};
-	$job->update({
-		result => $meta->{result},
-		result_text => $meta->{result_text},
-		($meta->{results} ? (results => encode_json $meta->{results}) : ()),
-		$meta->{errors} ? (errors => $meta->{errors}) : ()
-	});
-
-	my $solved = $meta->{result} ? 0 : 1;
-	my $status = $db->problem_statuses->find($job->owner, $job->problem);
-	$db->problem_statuses->update_or_create({
-		problem => $job->problem,
-		owner   => $job->owner,
-		job     => $job->id,
-		solved  => $solved}) if !$job->problem->private;
+	finish_job($job, $job->{private} || $pb->{private},
+	  result => $meta->{result},
+	  result_text => $meta->{result_text},
+	  ($meta->{results} ? (results => encode_json $meta->{results}) : ()),
+	  $meta->{errors} ? (errors => $meta->{errors}) : ());
 }
 
 sub got_job{
 	my $job = $_[0];
-	my $id = $job->id;
-	get_logger->debug("Taking job $id...");
-	my $daemon = hostname . ":$$";
-	$job->update({daemon => $daemon}, {where => {daemon => undef}})->discard_changes;
-	if ($job->daemon eq $daemon) {
-		get_logger->debug("Succesfully taken job $id");
-		process_job $job;
-		get_logger->debug("Job $id done");
-	} else {
-		get_logger->debug("Job $id already taken by " . $job->daemon);
-	}
+	my $id = $job->{id};
+	get_logger->debug("Processing job $id...");
+	process_job $job;
+	get_logger->debug("Job $id done");
 }
 
+my $daemon = hostname . ":$$";
+
 sub run{
 	require Gruntmaster::Data;
-	$db = Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+	Gruntmaster::Data->import;
+	dbinit($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
-	get_logger->info("gruntmasterd $VERSION started");
+	get_logger->info("gruntmasterd $VERSION started ($daemon)");
 	my $dir = tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
 	chmod 0711, $dir;
 	chdir $dir;
 	while (1) {
-		my $job = $db->jobs->search({daemon => undef}, {rows => 1})->first;
+		my $job = take_job($daemon);
 		got_job $job if defined $job;
 		sleep 2 unless defined $job;
 	}