mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 14:45:31 +02:00
WL#4189 Only kill process that hasn't yet finished at end of mtr.pl. Improve debug printout
This commit is contained in:
parent
01a3ac7596
commit
160e13cb4c
1 changed files with 4 additions and 2 deletions
|
|
@ -66,7 +66,9 @@ END {
|
|||
for my $proc (values %running){
|
||||
if ( $proc->is_child($$) ){
|
||||
#print "Killing: $proc\n";
|
||||
$proc->kill();
|
||||
if ($proc->wait_one(0)){
|
||||
$proc->kill();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -315,7 +317,7 @@ sub start_kill {
|
|||
$ret= system($safe_kill, $pid) >> 8;
|
||||
if (IS_CYGWIN and $ret == 3)
|
||||
{
|
||||
print "safe_process is gone, kickstart the fake process\n";
|
||||
print "safe_process is gone, kickstart the fake process, $self\n";
|
||||
if (kill(15, $self->{SAFE_PID}) != 1){
|
||||
print STDERR "Failed to kickstart the fake process\n";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue