X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=146ffb01868a91666d1ad7ec57b190303e5ca9cb;hp=99fe5144c433f6f09ab652e5420f5ff2a355be3f;hb=561871777e659371360d00b15de892d07eb428ea;hpb=496fffaa1f2582bd36d8426a0dcf22d94c5fd849

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 99fe514..146ffb0 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -15,7 +15,7 @@ use List::MoreUtils qw/natatime/;
 use Log::Log4perl qw/get_logger/;
 use IPC::Signal qw/sig_name sig_num/;
 
-our $VERSION = "5999.000_001";
+our $VERSION = "5999.000_004";
 our @EXPORT_OK = qw/prepare_files/;
 
 ##################################################
@@ -24,11 +24,11 @@ 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';
+		java => $basename when 'JAVA';
+		perl => $basename when 'PERL';
+		python => $basename when 'PYTHON';
 		default { die "Don't know how to execute format $format" }
 	}
 }
@@ -36,21 +36,23 @@ sub command_and_args{
 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;
+			waitpid $ret, 0;
 			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 $?;
+			die [DIED, "Crash (SIG$signame)"] if $sig && $signame ne 'PIPE';
+			die [NZX, "Non-zero exit status: " . ($? >> 8)] if $? >> 8;
 		} else {
 			my @fds = exists $args{fds} ? @{$args{fds}} : ();
 			$^F = 50;
@@ -72,18 +74,17 @@ sub mkrun{
 
 sub prepare{
 	my ($name, $format) = @_;
-	our $errors;
 	get_logger->trace("Preparing file $name...");
 
-	$errors .= `gruntmaster-compile $format $name 2>&1`;
-	$errors .= "\n";
+	$Gruntmaster::Daemon::errors .= `gruntmaster-compile $format $name 2>&1`;
+	$Gruntmaster::Daemon::errors .= "\n";
 	die 'Compile error' if $?
 }
 
 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);