mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
mtr_timer.pl:
Simplified and corrected mtr_timer_stop_all()
This commit is contained in:
parent
207d159845
commit
8dd0a47da0
1 changed files with 2 additions and 14 deletions
|
@ -119,21 +119,9 @@ sub mtr_timer_stop_all ($) {
|
|||
|
||||
foreach my $name ( keys %{$timers->{'timers'}} )
|
||||
{
|
||||
my $tpid= $timers->{'timers'}->{$name}->{'pid'};
|
||||
|
||||
# FIXME as Cygwin reuses pids fast, maybe check that is
|
||||
# the expected process somehow?!
|
||||
kill(9, $tpid);
|
||||
|
||||
# As the timers are so simple programs, we trust them to terminate,
|
||||
# and use blocking wait for it. We wait just to avoid a zombie.
|
||||
waitpid($tpid,0);
|
||||
|
||||
delete $timers->{'timers'}->{$name}; # Remove the timer information
|
||||
delete $timers->{'pids'}->{$tpid}; # and PID reference
|
||||
|
||||
return 1;
|
||||
mtr_timer_stop($name);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue