use strict;
use warnings;
-our $VERSION = '5999.000_003';
+our $VERSION = '5999.000_004';
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 => {
C => 'c',
CPP => 'cpp',
+ GCCGO => 'go',
+ GOLANG => 'go',
+ HASKELL => 'hs',
MONO => 'cs',
JAVA => 'java',
PASCAL => 'pas',
PERL => 'pl',
PYTHON => 'py',
+ RUBY => 'rb',
+ SBCL => 'l',
};
##################################################
my $db;
-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 {
- 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;
- 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;
for my $test (1 .. $testcnt) {
my $start_time = time;
my $result;
+ unlink 'result';
try {
$generator->($test, $meta);
$result = $runner->($test, $meta);
};
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}
$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});
+}
+
+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;
- get_logger->info("Job result: " . $meta->{result_text});
- return unless $jobr;
- $jobr->update({
+ process $meta;
+
+ $meta->{result_text} .= ' (pretests)' if $meta->{precnt};
+ $job->update({
result => $meta->{result},
result_text => $meta->{result_text},
- results => encode_json $meta->{results},
- $errors ? (errors => $errors) : ()
+ ($meta->{results} ? (results => encode_json $meta->{results}) : ()),
+ $meta->{errors} ? (errors => $meta->{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/page/$_" for $page - 1, $page, $page + 1;
+ 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;
}
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);
}
}
sub run{
- $db = Gruntmaster::Data->connect('dbi:Pg:');
+ require Gruntmaster::Data;
+ $db = Gruntmaster::Data->connect($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;
+ 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;
got_job $job if defined $job;
projects / gruntmaster-daemon.git / blobdiff