X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=4adf80178eb93c868d6b92488916de990ccd63e2;hp=e9114c8200496a88d2a91ab05199f7815defdb47;hb=bd084fbe3a4319f35261aec5b783b2be42d01192;hpb=ddceb393c90f620dd194c22e5e85d8c9fe87ee34

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index e9114c8..4adf801 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -7,13 +7,17 @@ use warnings;
 our $VERSION = '0.001';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Base qw/watch/;
 use Gruntmaster::Daemon::Format qw/mkrun/;
-use Gruntmaster::Page qw/generate/;
+use Gruntmaster::Data qw/job_inmeta job_problem problem_meta set_job_daemon set_job_result set_job_result_text set_job_results SUBSCRIBE WAIT_FOR_MESSAGES/;
+use Gruntmaster::Page::Log;
 
-use Fcntl qw/:flock/;
-use File::Copy qw/cp/;
+use File::Basename qw/fileparse/;
+use File::Slurp qw/write_file/;
+use File::Spec::Functions qw/devnull/;
+use File::Temp qw/tempdir/;
 use IO::File;
+use IPC::Open3 qw/open3/;
+use Sys::Hostname qw/hostname/;
 use Time::HiRes qw/time/;
 use Try::Tiny;
 use YAML::Any qw/LoadFile DumpFile/;
@@ -38,13 +42,13 @@ sub safe_can {
 }
 
 sub prepare{
-  my $name = $_[0];
+  my ($name, $format) = @_;
   my $basename = fileparse $name, qr/\.[^.]*/;
   get_logger->trace("Preparing file $name...");
 
   open my $devnull, devnull;
   open my $errors, '>>compile-error';
-  my $ret = open3 $devnull, $errors, undef, 'gruntmaster-compile', CPP => $basename, $name;
+  my $ret = open3 $devnull, $errors, undef, 'gruntmaster-compile', $format => $basename, $name;
   waitpid $ret, 0;
   close $devnull;
   close $errors;
@@ -52,49 +56,40 @@ sub prepare{
 }
 
 sub prepare_files{
-  my ($dir, $meta) = @_;
+  my $meta = shift;
 
   for my $file (values $meta->{files}) {
-	my ($format, $name) = @{$file}{qw/format name/};
+	my ($format, $name, $content) = @{$file}{qw/format name content/};
 
 	$file->{run} = mkrun($format);
-	die "No such file: '$name'" unless -e $name;
-	prepare $name;
+	write_file $name, $content;
+	prepare $name, $format;
   }
 }
 
 sub process{
-  my $dir = $_[0];
-
-  chdir $dir;
-  mkdir "in";
-  for (<*>) {
-	cp $_, "in" unless $_ eq 'in';
-  }
+  my $job = shift;
 
   my @results;
   my @full_results = ();
   my $meta = {};
   try {
-	$meta = LoadFile "meta.yml";
-	if (exists $meta->{problem}) {
-	  my $problem = $meta->{problem};
-	  die "No such problem: $problem" unless -d "../../pb/$problem";
-	  for (<../../pb/$problem/*>) {
-		cp $_, '.' unless $_ eq "../../pb/$problem/meta.yml"
-	  }
-
-	  my $pbmeta = LoadFile "../../pb/$problem/meta.yml";
+	$meta = job_inmeta $job;
+	if (job_problem $job) {
+	  my $pbmeta = problem_meta job_problem $job;
+	  my %files = %{$meta->{files}};
 	  $meta = {%$meta, %$pbmeta};
+	  $meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
 	}
 
+	prepare_files $meta;
+
 	my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
 
 	$generator = safe_can Generator => generate => $generator;
 	$runner = safe_can Runner => run => $runner;
 	$judge = safe_can Judge => judge => $judge;
 
-	prepare_files $dir, $meta;
 	for my $test (1 .. $testcnt) {
 	  my $start_time = time;
 	  my $result;
@@ -129,30 +124,36 @@ sub process{
 	$meta->{result_text} = $_;
   };
 
-  # Clean up
   get_logger->info("Job result: " . $meta->{result_text});
-  $meta->{results} = \@full_results if scalar @full_results;
-  DumpFile "meta.yml", $meta;
-  for (<*>) {
-	unlink $_ unless $_ eq 'in' || $_ eq 'meta.yml' || ($_ eq 'compile-error' && -s);
-  }
-  chdir '../..';
-  my $log = exists $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
-  mkdir $log unless -d $log;
-  IO::File->new(">$log/meta.yml")->close unless -f "$log/meta.yml";
-  flock my $logmetafh = IO::File->new("<$log/meta.yml"), LOCK_EX;
-  my $logmeta = LoadFile "$log/meta.yml";
-  $logmeta->{last}++;
-  rename $dir, "$log/$logmeta->{last}";
-  generate "$log/$logmeta->{last}/index.html";
-  DumpFile "$log/meta.yml", $logmeta;
-  undef $logmetafh;
-  generate "$log/index.html"
+  set_job_result $job, $meta->{result};
+  set_job_result_text $job, $meta->{result_text};
+  set_job_results $job, \@full_results if scalar @full_results;
+
+  my $log = $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
+  PUBLISH gensrc => $job;
+  PUBLISH genpage => "$log/job/$job.html";
+  my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
+  PUBLISH genpage => "$log/$page.html"
+}
+
+sub got_job{
+	my $job = shift;
+	get_logger->debug("Taking job $job...");
+	if (set_job_daemon $job, hostname . ":$$") {
+		get_logger->debug("Succesfully taken job $job");
+		process $job;
+		get_logger->debug("Job $job done");
+	} else {
+		get_logger->debug("Job $job already taken");
+	}
 }
 
 sub run{
-  Log::Log4perl->init('log.conf');
-  watch 'jobs', \&process;
+  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
 }
 
 1;