X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=gruntmaster-exec;h=5235e8e5ed3430fa06b37a73a8bc5304c78d54ae;hp=dec8be38835c02ed0913078584cce3c1aee16b03;hb=cd0623f030026cc4a5c2c03d4464bb2d3cb75ca8;hpb=1fe52cdeacc583e0261f95932264f9d4bb0ed19d

diff --git a/gruntmaster-exec b/gruntmaster-exec
index dec8be3..5235e8e 100755
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -19,32 +19,49 @@ use constant +{
 	REJ => 10,
 };
 
-use BSD::Resource qw/setrlimit RLIMIT_AS RLIMIT_FSIZE/;
+use BSD::Resource qw/setrlimit RLIMIT_AS RLIMIT_FSIZE RLIMIT_NPROC/;
 use IPC::Signal qw/sig_name sig_num/;
 use sigtrap qw/XFSZ/;
 
 use Getopt::Long;
 use POSIX qw//;
+use Text::ParseWords qw/shellwords/;
 use Time::HiRes qw/alarm/;
 
-my (@fds, $timeout, $mlimit, $olimit);
-my $close = 1;
+my (@fds, $timeout, $mlimit, $olimit, $sudo, $keep_stderr);
 
 GetOptions(
-	"fd=s"      => \@fds,
-	"timeout=f" => \$timeout,
-	"mlimit=i"  => \$mlimit,
-	"olimit=i"  => \$olimit,
-	"close!"    => \$close,
+	"fd=s"         => \@fds,
+	"timeout=f"    => \$timeout,
+	"mlimit=i"     => \$mlimit,
+	"olimit=i"     => \$olimit,
+	"keep-stderr!" => \$keep_stderr,
+	"sudo!"        => \$sudo,
 );
 
+my $killuser = $ENV{GRUNTMASTER_KILL_USER};
+my @sudo;
+@sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO} && $sudo;
+undef $mlimit if @sudo; # sudo wants a lot of address space
+
 my $ret = fork // die 'Cannot fork';
 if ($ret) {
 	my $tle;
-	local $SIG{ALRM} = sub { kill KILL => $ret; $tle = 1};
-	alarm ($timeout || 5);
+	local $SIG{ALRM} = sub {
+		if ($killuser) {
+			system @sudo, 'pkill', '-KILL', '-u', $killuser;
+		} else {
+			kill KILL => $ret
+		}
+		$tle = 1
+	};
+	alarm ($timeout || 10);
 	waitpid $ret, 0;
 	alarm 0;
+	if (@sudo) {
+		$? = $? >> 8;
+		$? = $? < 128 || $? > 128+32 ? ($? << 8) : $? - 128;
+	}
 	my $sig = $? & 127;
 	my $signame = sig_name $sig;
 	exit !say TLE,  "\nTime Limit Exceeded"   if $tle;
@@ -54,9 +71,8 @@ if ($ret) {
 	exit !say AC,   "\nAll OK";
 } else {
 	$^F = 50;
-	if ($close) {
-		POSIX::close $_ for 0 .. $^F;
-	}
+	POSIX::close 2 unless $keep_stderr;
+	POSIX::close $_ for 0, 1, 3 .. $^F;
 	for my $fdstring (@fds) {
 		my ($fd, $file) = split ' ', $fdstring, 2;
 		open my $fh, $file or die $!;
@@ -66,11 +82,17 @@ if ($ret) {
 			POSIX::close $oldfd or die $!;
 		}
 	}
+	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;
-	POSIX::setgid 65534; # Set group id to nogroup
-	POSIX::setuid 65534; # Set user id to nobody
+	setrlimit RLIMIT_NPROC, $nproc, $nproc or die $! if $sudo;
+	open my $adj, '>', '/proc/self/oom_score_adj';
+	print $adj 900;
+	close $adj;
+	unshift @ARGV, @sudo;
+	say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
 	exec @ARGV;
 }