Commit a8117ca4 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
parents 727afed6 b23110f2
...@@ -85,6 +85,24 @@ BEGIN { ...@@ -85,6 +85,24 @@ BEGIN {
} }
} }
END {
# Kill any children still running
for my $proc (values %running){
if ( $proc->is_child($$) ){
print "Killing: $proc\n";
$proc->kill();
}
}
}
sub is_child {
my ($self, $parent_pid)= @_;
die "usage: \$safe_proc->is_child()" unless (@_ == 2 and ref $self);
return ($self->{PARENT} == $parent_pid);
}
# Find the safe process binary or script # Find the safe process binary or script
my @safe_process_cmd; my @safe_process_cmd;
my $safe_kill; my $safe_kill;
...@@ -172,6 +190,7 @@ sub new { ...@@ -172,6 +190,7 @@ sub new {
SAFE_WINPID => $winpid, SAFE_WINPID => $winpid,
SAFE_NAME => $name, SAFE_NAME => $name,
SAFE_SHUTDOWN => $shutdown, SAFE_SHUTDOWN => $shutdown,
PARENT => $$,
}, $class); }, $class);
# Put the new process in list of running # Put the new process in list of running
...@@ -203,6 +222,7 @@ sub timer { ...@@ -203,6 +222,7 @@ sub timer {
({ ({
SAFE_PID => $pid, SAFE_PID => $pid,
SAFE_NAME => "timer", SAFE_NAME => "timer",
PARENT => $$,
}, $class); }, $class);
# Put the new process in list of running # Put the new process in list of running
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment