Include verifier stdout in non-Accepted results

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 3a836924afebea26ff627c55c4fa342365332fcd..31e03984c4f370ab1f951508a89bcee2f963e4b6 100644 (file)
--- 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 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/;
 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 Try::Tiny;
 use Log::Log4perl qw/get_logger/;
 

-use constant PAGE_SIZE => 10;

 use constant FORMAT_EXTENSION => {
        C => 'c',
        CPP => 'cpp',
 use constant FORMAT_EXTENSION => {
        C => 'c',
        CPP => 'cpp',


@@ -29,6 +28,8 @@ use constant FORMAT_EXTENSION => {
        PASCAL => 'pas',
        PERL => 'pl',
        PYTHON => 'py',
        PASCAL => 'pas',
        PERL => 'pl',
        PYTHON => 'py',

+       RUBY => 'rb',
+       SBCL => 'l',

 };
 
 ##################################################
 };
 
 ##################################################


@@ -63,6 +64,7 @@ sub process{
                for my $test (1 .. $testcnt) {
                        my $start_time = time;
                        my $result;
                for my $test (1 .. $testcnt) {
                        my $start_time = time;
                        my $result;

+                       unlink 'result';

                        try {
                                $generator->($test, $meta);
                                $result = $runner->($test, $meta);
                        try {
                                $generator->($test, $meta);
                                $result = $runner->($test, $meta);


@@ -75,8 +77,10 @@ sub process{
                        };
 
                        if (ref $result) {
                        };
 
                        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}
                        } else {
                                get_logger->trace("Test $test result is $result");
                                push @full_results, {id => $test, result => 0, result_text => $result, time => time - $start_time}


@@ -111,9 +115,11 @@ sub process_job {
                                content => $job->source,
                        },
                },
                                content => $job->source,
                        },
                },

-               map { $_ => $job->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
+               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';
        };
        $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},
 
        $meta->{files}{ver} = {
                name => 'ver.' . FORMAT_EXTENSION->{$job->problem->verformat},


@@ -123,6 +129,7 @@ sub process_job {
 
        process $meta;
 
 
        process $meta;
 

+       $meta->{result_text} .= ' (pretests)' if $meta->{precnt};

        $job->update({
                result => $meta->{result},
                result_text => $meta->{result_text},
        $job->update({
                result => $meta->{result},
                result_text => $meta->{result_text},


@@ -136,7 +143,7 @@ sub process_job {
                problem => $job->problem,
                owner   => $job->owner,
                job     => $job->id,
                problem => $job->problem,
                owner   => $job->owner,
                job     => $job->id,

-               solved  => $solved}) if !$job->problem->is_private;
+               solved  => $solved}) if !$job->problem->private;

 }
 
 sub got_job{
 }
 
 sub got_job{


@@ -144,14 +151,13 @@ sub got_job{
        my $id = $job->id;
        get_logger->debug("Taking job $id...");
        my $daemon = hostname . ":$$";
        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_job $job;
                get_logger->debug("Job $id done");
        } else {
                get_logger->debug("Succesfully taken job $id");
                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);

        }
 }
 
        }
 }