X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=93035ddc9d8c1337d4919578e0b2616f955ae07e;hp=3c0a84ed059ce6d87260a89f013ed80e62137ef6;hb=c40a2dd049e5f8da7bf4f3f48feeab89f16b4176;hpb=ad77b7d3dee6e61405535dd0dabd117398731ad1

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 3c0a84e..93035dd 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -8,81 +8,87 @@ no if $] > 5.017011, warnings => 'experimental::smartmatch';
 
 use POSIX qw//;
 use File::Basename qw/fileparse/;
+use File::Slurp qw/read_file write_file/;
 use Gruntmaster::Daemon::Constants qw/TLE OLE DIED NZX/;
 use Time::HiRes qw/alarm/;
 use List::MoreUtils qw/natatime/;
+use Log::Log4perl qw/get_logger/;
 use IPC::Signal qw/sig_name sig_num/;
+use Try::Tiny;
 
-our $VERSION = '0.001';
+our $VERSION = "5999.000_004";
 our @EXPORT_OK = qw/prepare_files/;
 
 ##################################################
 
+sub execlist {
+	my (@args) = @_;
+	my $ret = fork // die 'Cannot fork';
+	if ($ret) {
+		waitpid $ret, 0;
+		die "gruntmaster-exec died\n" if -z 'exec-result';
+		my ($excode, $exmsg) = read_file 'exec-result';
+		unlink 'exec-result';
+		chomp ($excode, $exmsg);
+		die [$excode, $exmsg] if $excode > 0;
+	} else {
+		open STDOUT, '>exec-result';
+		exec 'gruntmaster-exec', @args;
+	}
+}
+
 sub command_and_args{
 	my ($format, $basename) = @_;
 
 	given($format) {
-		"./$basename" when [qw/C CPP PASCAL/];
+		"./$basename" when [qw/C CPP GCCGO GOLANG HASKELL PASCAL/];
 		"./$basename.exe" when 'MONO';
-		"java $basename" when 'JAVA';
-		"perl $basename" when 'PERL';
-		"python $basename" when 'PYTHON';
-		default { die "Don't know how to execute format $format" }
+		java => $basename when 'JAVA';
+		perl => $basename when 'PERL';
+		python => $basename when 'PYTHON';
+		default { die "Don't know how to execute format $format\n" }
 	}
 }
 
 sub mkrun{
 	my $format = shift;
 	sub{
+		local *__ANON__ = 'mkrun_runner';
 		my ($name, %args) = @_;
+		get_logger->trace("Running $name...");
 		my $basename = fileparse $name, qr/\.[^.]*/;
-		my $ret = fork // die 'Cannot fork';
-		if ($ret) {
-			my $tle;
-			local $SIG{ALRM} = sub { kill KILL => $ret; $tle = 1};
-			alarm $args{timeout} if exists $args{timeout};
-			wait;
-			alarm 0;
-			my $sig = $? & 127;
-			my $signame = sig_name $sig;
-			die [TLE, "Time Limit Exceeded"] if $tle;
-			die [OLE, 'Output Limit Exceeded'] if $sig && $signame eq 'XFSZ';
-			die [DIED, "Crash (SIG$signame)"] if $sig;
-			die [NZX, "Non-zero exit status: " . ($? >> 8)] if $?;
-		} else {
-			my @fds = exists $args{fds} ? @{$args{fds}} : ();
-			$^F = 50;
-			POSIX::close $_ for 0 .. $^F;
-			my $it = natatime 2, @fds;
-			while (my ($fd, $file) = $it->()) {
-				open my $fh, $file or die $!;
-				my $oldfd = fileno $fh;
-				if ($oldfd != $fd) {
-					POSIX::dup2 $oldfd, $fd or die $!;
-					POSIX::close $oldfd or die $!;
-				}
-			}
-			exec 'gruntmaster-exec', $args{mlimit} // 0, $args{olimit} // 0, command_and_args($format, $basename), exists $args{args} ? @{$args{args}} : ();
-			exit 42
+		my @args;
+		push @args, '--timeout', $args{timeout} if $args{timeout};
+		push @args, '--mlimit',  $args{mlimit}  if $args{mlimit};
+		push @args, '--olimit',  $args{olimit}  if $args{olimit};
+		my @fds = exists $args{fds} ? @{$args{fds}} : ();
+		my $it = natatime 2, @fds;
+		while (my ($fd, $file) = $it->()) {
+			push @args, "--fd=$fd $file";
 		}
+		execlist @args, command_and_args($format, $basename);
 	}
 }
 
 sub prepare{
 	my ($name, $format) = @_;
-	our $errors;
-	my $basename = fileparse $name, qr/\.[^.]*/;
 	get_logger->trace("Preparing file $name...");
 
-	$errors .= `gruntmaster-compile $format $basename $name 2>&1`;
-	$errors .= "\n";
-	die 'Compile error' if $?
+	try {
+		execlist '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
+	} catch {
+		die "Compile error\n"
+	} finally {
+		$Gruntmaster::Daemon::errors .= read_file 'errors';
+		$Gruntmaster::Daemon::errors .= "\n";
+		unlink 'errors';
+	};
 }
 
 sub prepare_files{
 	my $meta = shift;
 
-	for my $file (values $meta->{files}) {
+	for my $file (values %{$meta->{files}}) {
 		my ($format, $name, $content) = @{$file}{qw/format name content/};
 
 		$file->{run} = mkrun($format);
@@ -91,4 +97,55 @@ sub prepare_files{
 	}
 }
 
-1
+1;
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+Gruntmaster::Daemon::Format - Utility functions for handling source files
+
+=head1 SYNOPSIS
+
+  use Gruntmaster::Daemon::Format qw/prepare_files/;
+  prepare_files { files => {
+    prog => {
+      name => 'prog.pl',
+      format => 'PERL',
+      content => 'print "Hello, world!"'
+    },
+    ver => {
+      name => 'ver.cpp',
+      format => 'CPP',
+      content => ...
+    },
+  }};
+
+=head1 DESCRIPTION
+
+Gruntmaster::Daemon::Format exports utility functions for handling source files.
+
+=over
+
+=item B<prepare_files> I<$meta>
+
+Compiles all the source files in C<< $meta->{files} >>.
+
+=back
+
+=head1 AUTHOR
+
+Marius Gavrilescu E<lt>marius@ieval.roE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2014 by Marius Gavrilescu
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+=cut