X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=b7b6e0616a5192b7076412bed2c54f17da547d53;hp=f2c4a116c0dbcd4d13e47a61be09ee17aef48c60;hb=6555bf80813ccd73357cbd9efa06cbef33230189;hpb=a722431b0f35babda9d7da134824caf76ad75458

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index f2c4a11..b7b6e06 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,7 +4,7 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '5999.000_002';
+our $VERSION = '5999.000_003';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/prepare_files/;
@@ -12,6 +12,7 @@ use Gruntmaster::Data;
 
 use File::Basename qw/fileparse/;
 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;
@@ -19,9 +20,19 @@ use Log::Log4perl qw/get_logger/;
 use LWP::UserAgent;
 
 use constant PAGE_SIZE => 10;
+use constant FORMAT_EXTENSION => {
+	C => 'c',
+	CPP => 'cpp',
+	MONO => 'cs',
+	JAVA => 'java',
+	PASCAL => 'pas',
+	PERL => 'pl',
+	PYTHON => 'py',
+};
 
 ##################################################
 
+my $db;
 my $ua = LWP::UserAgent->new;
 my @purge_hosts = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
 
@@ -42,6 +53,7 @@ sub safe_can {
 }
 
 sub purge {
+	get_logger->trace("Purging $_[0]");
 	for my $host (@purge_hosts) {
 		my $req = HTTP::Request->new(PURGE => "http://$host$_[0]");
 		$ua->request($req)
@@ -49,30 +61,34 @@ sub purge {
 }
 
 sub process{
-	my $job = shift;
+	my ($job, $jobr) = @_;
 
 	my @results;
 	my @full_results = ();
-	my $meta = {};
+	my $meta;
 	our $errors = '';
 	try {
-		$meta = job_inmeta $job;
-		if (job_problem $job) {
-			local $_ = job_problem $job;
-			my $pbmeta = problem_meta;
-			my %files = exists $meta->{files} ? %{$meta->{files}} : ();
+		if (ref $job) {
+			$meta = $job;
+		} else {
 			$meta = {
-				%$meta,
-				problem => $_,
-				(defined problem_generator() ? (generator => problem_generator) : ()),
-				(defined problem_runner()    ? (runner    => problem_runner)    : ()),
-				(defined problem_judge()     ? (judge     => problem_judge)     : ()),
-				(defined problem_testcnt()   ? (testcnt   => problem_testcnt)   : ()),
-				(defined problem_timeout()   ? (timeout   => problem_timeout)   : ()),
-				(defined problem_olimit()    ? (olimit    => problem_olimit)    : ()),
-				%$pbmeta
+				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->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
+			$meta->{tests} = decode_json $jobr->problem->tests if $meta->{runner} eq 'File';
+
+			$meta->{files}{ver} = {
+				name => 'ver.' . FORMAT_EXTENSION->{$jobr->problem->verformat},
+				format => $jobr->problem->verformat,
+				content => $jobr->problem->versource,
+			} if $jobr->problem->verformat;
 		}
 
 		prepare_files $meta;
@@ -111,6 +127,7 @@ sub process{
 
 		my %results = $judge->(@results);
 		$meta->{$_} = $results{$_} for keys %results;
+		$meta->{results} = \@full_results
 	} catch {
 		s,(.*) at .*,$1,;
 		chomp;
@@ -119,48 +136,49 @@ sub process{
 	};
 
 	get_logger->info("Job result: " . $meta->{result_text});
-	set_job_result $job, $meta->{result};
-	set_job_result_text $job, $meta->{result_text};
-	set_job_results $job, \@full_results if scalar @full_results;
-	set_job_errors $job, $errors;
-
-	my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
-
-	PUBLISH gensrc => ($Gruntmaster::Data::contest // '') . ".$job";
-	PUBLISH genpage => "$log/job/$job.html";
-	PUBLISH genpage => "$log/index.html";
-	PUBLISH genpage => "$log/st.html";
-	my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
-	PUBLISH genpage => "$log/@{[$page - 1]}.html";
-	PUBLISH genpage => "$log/$page.html";
-	PUBLISH genpage => "$log/@{[$page + 1]}.html";
-
-	purge "/$log/job/$job";
+	return unless $jobr;
+	$jobr->update({
+		result => $meta->{result},
+		result_text => $meta->{result_text},
+		($meta->{results} ? (results => encode_json $meta->{results}) : ()),
+		$errors ? (errors => $errors) : ()
+	});
+
+	my $log = $jobr->contest ? 'ct/' . $jobr->contest->id . '/log' : 'log';
+	my $page = int (($job + PAGE_SIZE - 1) / PAGE_SIZE);
+
+	purge "/$log/$job";
 	purge "/$log/";
 	purge "/$log/st";
-	purge "/$log/$_" for $page - 1, $page, $page + 1;
+	purge "/$log/page/$_" for $page - 1, $page, $page + 1;
 }
 
 sub got_job{
-	$_[0] =~ /^(\w*)\.(\d+)$/;
-	my $job = $2;
-	local $Gruntmaster::Data::contest = $1 if $1;
-	get_logger->debug("Taking job $job@{[defined $1 ? \" of contest $1\" : '']}...");
-	if (set_job_daemon $job, hostname . ":$$") {
-		get_logger->debug("Succesfully taken job $job");
-		process $job;
-		get_logger->debug("Job $job done");
+	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 $job already taken");
+		get_logger->debug("Job $id already taken");
 	}
 }
 
 sub run{
+	$db = Gruntmaster::Data->connect('dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started");
 	chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
-	SUBSCRIBE jobs => \&got_job;
-	WAIT_FOR_MESSAGES 86400 while 1
+	while (1) {
+		my $job = $db->jobs->search({daemon => undef}, {rows => 1})->first;
+		got_job $job if defined $job;
+		sleep 2 unless defined $job;
+	}
 }
 
 1;