From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 7 Feb 2015 11:00:15 +0000 (+0200)
Subject: Do not fork/exec in gruntmaster-compile
X-Git-Tag: 5999.000_005~52
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9c1ab9145b96eba0eff66a8679e0d5665a115eda;p=gruntmaster-daemon.git

Do not fork/exec in gruntmaster-compile
---

diff --git a/gruntmaster-compile b/gruntmaster-compile
index 229eb98..d6425e9 100755
--- a/gruntmaster-compile
+++ b/gruntmaster-compile
@@ -8,44 +8,36 @@ use File::Basename qw/fileparse/;
 my ($format, $name) = @ARGV;
 my $basename = fileparse $name, qr/\..*/;
 
-my $ret = fork // die $!;
-if ($ret) {
-	$SIG{ALRM} = sub {kill KILL => $ret};
-	alarm 5;
-	wait;
-	exit $? >> 8
-} else {
-	given ($format){
-		exec 'gcc', qw/-DONLINE_JUDGE -std=gnu11 -Wall -Wextra -O2 -o/, $basename, $name when 'C';
-		exec 'g++', qw/-DONLINE_JUDGE -std=gnu++11 -Wall -Wextra -O2 -o/, $basename, $name when 'CPP';
-		when ('MONO') {
-			system 'gmcs', '-d:ONLINE_JUDGE', $name and die "gmcs failed: errno=$! return=$?";
-			rename "$basename.exe", $basename;
-			chmod 0755, $basename;
-		}
-		exec 'gmcs', '-d:ONLINE_JUDGE', $name when  'MONO';
-		when ('JAVA') {
-			system 'javac', $name and die "javac failed: errno=$! return=$?";
-			system 'jar', 'cfe', $basename, $basename, "$basename.class" and die "jar failed: errno=$! return=$?";
-			chmod 0755, $basename;
-			exit
-		}
-		exec 'fpc', qw/-dONLINE_JUDGE -O2/, $name when 'PASCAL';
-		exec 'go', qw/build -compiler gc/, $name when 'GOLANG';
-		exec 'go', qw/build -compiler gccgo/, $name, when 'GCCGO';
-		exec 'ghc', qw/-DONLINE_JUDGE -Wall -O2 -o/, $basename, $name when 'HASKELL';
-
-		when ([qw/PERL PYTHON/]){
-			open IN, '<', $name;
-			open OUT, '>', $basename;
-			print OUT "#!/usr/bin/perl\n"   if $_ eq 'PERL';
-			print OUT "#!/usr/bin/python\n" if $_ eq 'PYTHON';
-			print OUT while <IN>;
-			close OUT;
-			close IN;
-			chmod 0755, $basename;
-			exit
-		}
+given ($format){
+	exec 'gcc', qw/-DONLINE_JUDGE -std=gnu11 -Wall -Wextra -O2 -o/, $basename, $name when 'C';
+	exec 'g++', qw/-DONLINE_JUDGE -std=gnu++11 -Wall -Wextra -O2 -o/, $basename, $name when 'CPP';
+	when ('MONO') {
+		system 'gmcs', '-d:ONLINE_JUDGE', $name and die "gmcs failed: errno=$! return=$?";
+		rename "$basename.exe", $basename;
+		chmod 0755, $basename;
+	}
+	exec 'gmcs', '-d:ONLINE_JUDGE', $name when  'MONO';
+	when ('JAVA') {
+		system 'javac', $name and die "javac failed: errno=$! return=$?";
+		system 'jar', 'cfe', $basename, $basename, "$basename.class" and die "jar failed: errno=$! return=$?";
+		chmod 0755, $basename;
+		exit
+	}
+	exec 'fpc', qw/-dONLINE_JUDGE -O2/, $name when 'PASCAL';
+	exec 'go', qw/build -compiler gc/, $name when 'GOLANG';
+	exec 'go', qw/build -compiler gccgo/, $name, when 'GCCGO';
+	exec 'ghc', qw/-DONLINE_JUDGE -Wall -O2 -o/, $basename, $name when 'HASKELL';
+
+	when ([qw/PERL PYTHON/]){
+		open IN, '<', $name;
+		open OUT, '>', $basename;
+		print OUT "#!/usr/bin/perl\n"   if $_ eq 'PERL';
+		print OUT "#!/usr/bin/python\n" if $_ eq 'PYTHON';
+		print OUT while <IN>;
+		close OUT;
+		close IN;
+		chmod 0755, $basename;
+		exit
 	}
 }