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

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index bab6d97..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_002";
+our $VERSION = "5999.000_004";
 our @EXPORT_OK = qw/prepare_files/;
 
 ##################################################
@@ -24,7 +24,7 @@ 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';
@@ -36,20 +36,22 @@ 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 && $signame != 'PIPE';
+			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}} : ();
@@ -82,7 +84,7 @@ sub prepare{
 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);