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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 7b41f8c..b6d3a52 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,84 +4,61 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '5999.000_002';
+our $VERSION = '5999.000_005';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Format qw/prepare_files/;
-use Gruntmaster::Data;
+use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 
-use File::Basename qw/fileparse/;
+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 LWP::UserAgent;
 
-use constant PAGE_SIZE => 10;
+use constant FORMAT_EXTENSION => {
+	BRAINFUCK => 'bf',
+	C => 'c',
+	CPP => 'cpp',
+	GCCGO => 'go',
+	GOLANG => 'go',
+	GOLFSCRIPT => 'gs',
+	HASKELL => 'hs',
+	JAVA => 'java',
+	JULIA => 'jl',
+	MONO => 'cs',
+	PASCAL => 'pas',
+	PERL => 'pl',
+	PHP => 'php',
+	PYTHON => 'py',
+	RUBY => 'rb',
+	RUST => 'rs',
+	SBCL => 'l',
+};
 
 ##################################################
 
-my $db = Gruntmaster::Data->connect('dbi:Pg:');
-my $ua = LWP::UserAgent->new;
-my @purge_hosts = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
-
-sub safe_can_nodie {
+sub safe_can {
 	my ($type, $sub, $name) = @_;
 
-	return unless $name =~ /^\w+$/;
-	no strict 'refs';
+	get_logger->logdie("Invalid \l$type: '$name'") unless $name =~ /^\w+$/s;
 	my $pkg = __PACKAGE__ . "::${type}::${name}";
 	eval "require $pkg" or get_logger->warn("Error while requiring $pkg: $@");
-	$pkg->can($sub);
-}
-
-sub safe_can {
-	my ($type, $sub, $name) = @_;
-
-	safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
-}
-
-sub purge {
-	get_logger->trace("Purging $_[0]");
-	for my $host (@purge_hosts) {
-		my $req = HTTP::Request->new(PURGE => "http://$host$_[0]");
-		$ua->request($req)
-	}
+	$pkg->can($sub) or get_logger->logdie("No such \l$type: '$name'");
 }
 
 sub process{
-	my ($job, $jobr) = @_;
+	my ($meta) = @_;
 
 	my @results;
 	my @full_results = ();
-	my $meta;
 	our $errors = '';
 	try {
-		$meta = {
-			problem => $jobr->problem->id,
-			files => {
-				prog => {
-					name => 'prog.' . $jobr->extension,
-					format => $jobr->format,
-					content => $jobr->source,
-				},
-			},
-			map { $_ => $jobr->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
-		};
-		$meta->{tests} = decode_json $jobr->problem->tests if $meta->{runner} eq 'File';
-
-		$meta->{files}{ver} = {
-			name => 'ver.cpp',
-			format => $jobr->problem->verformat,
-			content => $jobr->problem->versource,
-		} if $jobr->problem->verformat;
-
 		prepare_files $meta;
 		chomp $errors;
 
-		my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
+		my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_\n"} qw/files generator runner judge testcnt/;
 
 		$generator = safe_can Generator => generate => $generator;
 		$runner = safe_can Runner => run => $runner;
@@ -90,6 +67,7 @@ sub process{
 		for my $test (1 .. $testcnt) {
 			my $start_time = time;
 			my $result;
+			unlink 'result';
 			try {
 				$generator->($test, $meta);
 				$result = $runner->($test, $meta);
@@ -102,8 +80,10 @@ sub process{
 			};
 
 			if (ref $result) {
-				get_logger->trace("Test $test result is " . $result->[1]);
-				push @full_results, {id => $test, result => $result->[0], result_text => $result->[1], time => time - $start_time}
+				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}
 			} else {
 				get_logger->trace("Test $test result is $result");
 				push @full_results, {id => $test, result => 0, result_text => $result, time => time - $start_time}
@@ -114,52 +94,77 @@ sub process{
 
 		my %results = $judge->(@results);
 		$meta->{$_} = $results{$_} for keys %results;
+		$meta->{results} = \@full_results
 	} catch {
-		s,(.*) at .*,$1,;
+		s/(.*) at .*/$1/s;
 		chomp;
 		$meta->{result} = -1;
 		$meta->{result_text} = $_;
 	};
+	stopvms;
+	$meta->{errors} = $errors;
 
-	get_logger->info("Job result: " . $meta->{result_text});
-	$jobr->update({
-		result => $meta->{result},
-		result_text => $meta->{result_text},
-		results => encode_json \@full_results,
-		$errors ? (errors => $errors) : ()
-	});
-
-	my $log = $jobr->contest ? 'ct/' . $jobr->contest . '/log' : 'log';
-	my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
-
-	purge "/$log/$job";
-	purge "/$log/";
-	purge "/$log/st";
-	purge "/$log/page/$_" for $page - 1, $page, $page + 1;
+	get_logger->info('Job result: ' . $meta->{result_text});
+}
+
+sub process_job {
+	my ($job) = @_;
+	my $pb = db()->select('problems', '*', {id => $job->{problem}})->hash;
+	my $meta = {
+		problem => $job->{problem},
+		files => {
+			prog => {
+				name => 'prog.' . $job->{extension},
+				format => $job->{format},
+				content => $job->{source},
+			},
+		},
+		map { $_ => $pb->{$_} } qw/generator runner judge precnt testcnt timeout olimit/
+	};
+	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)
+	$meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
+
+	$meta->{files}{ver} = {
+		name => 'ver.' . FORMAT_EXTENSION->{$pb->{verformat}},
+		format => $pb->{verformat},
+		content => $pb->{versource},
+	} if $pb->{verformat};
+
+	process $meta;
+
+	$meta->{result_text} .= ' (pretests)' if $meta->{precnt};
+	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});
-	#if (set_job_daemon $job, hostname . ":$$") {
-	if (1) {
-		get_logger->debug("Succesfully taken job $id");
-		process $id, $job;
-		get_logger->debug("Job $id done");
-	} else {
-		get_logger->debug("Job $id already taken");
-	}
+	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;
+	Gruntmaster::Data->import;
+	dbinit($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
-	get_logger->info("gruntmasterd $VERSION started");
-	chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
+	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;
 	}