X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=31e03984c4f370ab1f951508a89bcee2f963e4b6;hp=1c58550a7e0a8c584c1f25edbce6b75642807577;hb=ac964998cb64edc36511291d589942870a729a8d;hpb=fcfcfb939965f2536e812d3138a208008b1eb601

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 1c58550..31e0398 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -9,7 +9,7 @@ our $VERSION = '5999.000_004';
 use Gruntmaster::Daemon::Constants qw/ERR/;
 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/;
@@ -17,7 +17,6 @@ use Time::HiRes qw/time/;
 use Try::Tiny;
 use Log::Log4perl qw/get_logger/;
 
-use constant PAGE_SIZE => 10;
 use constant FORMAT_EXTENSION => {
 	C => 'c',
 	CPP => 'cpp',
@@ -29,6 +28,8 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	RUBY => 'rb',
+	SBCL => 'l',
 };
 
 ##################################################
@@ -45,36 +46,12 @@ sub safe_can {
 }
 
 sub process{
-	my ($job, $jobr) = @_;
+	my ($meta) = @_;
 
 	my @results;
 	my @full_results = ();
-	my $meta;
 	our $errors = '';
 	try {
-		if (ref $job) {
-			$meta = $job;
-		} else {
-			$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.' . FORMAT_EXTENSION->{$jobr->problem->verformat},
-				format => $jobr->problem->verformat,
-				content => $jobr->problem->versource,
-			} if $jobr->problem->verformat;
-		}
-
 		prepare_files $meta;
 		chomp $errors;
 
@@ -87,6 +64,7 @@ sub process{
 		for my $test (1 .. $testcnt) {
 			my $start_time = time;
 			my $result;
+			unlink 'result';
 			try {
 				$generator->($test, $meta);
 				$result = $runner->($test, $meta);
@@ -99,8 +77,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}
@@ -119,23 +99,51 @@ sub process{
 		$meta->{result_text} = $_;
 	};
 	stopvms;
+	$meta->{errors} = $errors;
 
 	get_logger->info('Job result: ' . $meta->{result_text});
-	return unless $jobr;
-	$jobr->update({
+}
+
+sub process_job {
+	my ($job) = @_;
+	my $meta = {
+		problem => $job->problem->id,
+		files => {
+			prog => {
+				name => 'prog.' . $job->extension,
+				format => $job->format,
+				content => $job->source,
+			},
+		},
+		map { $_ => $job->problem->get_column($_) } qw/generator runner judge precnt testcnt timeout olimit/
+	};
+	$meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
+	delete $meta->{precnt} unless $job->contest;
+	$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;
+
+	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}) : ()),
-		$errors ? (errors => $errors) : ()
+		$meta->{errors} ? (errors => $meta->{errors}) : ()
 	});
 
 	my $solved = $meta->{result} ? 0 : 1;
-	my $status = $db->problem_statuses->find($jobr->owner, $jobr->problem);
+	my $status = $db->problem_statuses->find($job->owner, $job->problem);
 	$db->problem_statuses->update_or_create({
-		problem => $jobr->problem,
-		owner   => $jobr->owner,
-		job     => $jobr->id,
-		solved  => $solved}) if !$jobr->problem->is_private;
+		problem => $job->problem,
+		owner   => $job->owner,
+		job     => $job->id,
+		solved  => $solved}) if !$job->problem->private;
 }
 
 sub got_job{
@@ -143,14 +151,13 @@ sub got_job{
 	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) {
+	$job->update({daemon => $daemon}, {where => {daemon => undef}})->discard_changes;
+	if ($job->daemon eq $daemon) {
 		get_logger->debug("Succesfully taken job $id");
-		process $id, $job;
+		process_job $job;
 		get_logger->debug("Job $id done");
 	} else {
-		get_logger->debug("Job $id already taken");
+		get_logger->debug("Job $id already taken by " . $job->daemon);
 	}
 }