projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix handling of timeouts.
[pintos-anon]
/
src
/
utils
/
pintos
diff --git
a/src/utils/pintos
b/src/utils/pintos
index 8721db313042bb35438dd1cf20856aa0f816c7e2..348c6abf3a7882e8b1e600c6e2cf2043c5108a6f 100755
(executable)
--- a/
src/utils/pintos
+++ b/
src/utils/pintos
@@
-682,10
+682,12
@@
sub relay_signal {
# Interrupts $pid and dies with a timeout error message.
sub timeout {
my ($pid) = @_;
# Interrupts $pid and dies with a timeout error message.
sub timeout {
my ($pid) = @_;
- relay_signal ($pid, "INT");
+ kill "INT", $pid;
+ waitpid ($pid, 0);
+ seek (STDOUT, 0, 2);
my ($load_avg) = `uptime` =~ /(load average:.*)$/i;
my ($load_avg) = `uptime` =~ /(load average:.*)$/i;
- print "TIMEOUT after $timeout seconds";
+ print "
\n
TIMEOUT after $timeout seconds";
print " - $load_avg" if defined $load_avg;
print "\n";
print " - $load_avg" if defined $load_avg;
print "\n";
- exit
(2)
;
+ exit
0
;
}
}