X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=gruntmaster-exec;h=d8028b8f4f2c5bf15f12c6625a604f480a840680;hp=25a44d16f48f8635b58868a9f2c9695dab7caf45;hb=97358afcd073f82ebe205ec2cd6e99e09da973af;hpb=1e5f2b8b348c178a0656f9515917223c49d010d3

diff --git a/gruntmaster-exec b/gruntmaster-exec
index 25a44d1..d8028b8 100755
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -46,7 +46,7 @@ GetOptions(
 my $killuser = $ENV{GRUNTMASTER_KILL_USER};
 my @sudo;
 @sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO} && $nobody;
-$mlimit = 1_000_000_000 if @sudo; # sudo wants a lot of address space
+undef $mlimit if @sudo; # sudo wants a lot of address space
 
 my $ret = fork // die 'Cannot fork';
 if ($ret) {
@@ -59,12 +59,12 @@ if ($ret) {
 		}
 		$tle = 1
 	};
-	alarm ($timeout || 5);
+	alarm ($timeout || 10);
 	waitpid $ret, 0;
 	alarm 0;
 	if (@sudo) {
 		$? = $? >> 8;
-		$? = $? < 128 ? ($? << 8) : $? - 128;
+		$? = $? < 128 || $? > 128+32 ? ($? << 8) : $? - 128;
 	}
 	my $sig = $? & 127;
 	my $signame = sig_name $sig;
@@ -87,7 +87,8 @@ if ($ret) {
 			POSIX::close $oldfd or die $!;
 		}
 	}
-	my $nproc = $killuser ? 5 : 1;
+	my $nproc = $killuser ? 15 : 1;
+	my $debug = $ENV{TEST_VERBOSE};
 	%ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
 	setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
 	setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
@@ -95,7 +96,7 @@ if ($ret) {
 	POSIX::setgid $nobody ? 65534 : USER;
 	POSIX::setuid $nobody ? 65534 : GROUP;
 	unshift @ARGV, @sudo;
-	say STDERR "Execing: ", join ' ', map { "'$_'" } @ARGV;
+	say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
 	exec @ARGV;
 }