database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Use mtr_kill_process from mtr_kill_processes

Browse Source 
Change to use 0.1 second sleep between kill attempt
This commit is contained in:
msvensson@shellback.(none)
2006-05-23 15:25:17 +02:00
parent 15b6bd3fe1
commit 1cf3b0d3bf
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/lib/mtr_process.pl
View File

@@ -927,14 +927,14 @@ sub sleep_until_file_created ($$$) {
sub mtr_kill_processes ($) { sub mtr_kill_processes ($) {
my $pids = shift; my $pids = shift;
mtr_verbose("mtr_kill_processes " . join(" ", @$pids)); mtr_verbose("mtr_kill_processes " . join(" ", @$pids));
foreach my $sig (15, 9)
foreach my $pid (@$pids)
{ {
my $retries= 10; foreach my $sig (15, 9)
while (1)
{ {
kill($sig, @{$pids}); last if mtr_kill_process($pid, $sig, 10, 1);
last unless kill (0, @{$pids}) and $retries--;
} }
} }
} }
@@ -945,17 +945,20 @@ sub mtr_kill_process ($$$$) {
my $signal= shift; my $signal= shift;
my $retries= shift; my $retries= shift;
my $timeout= shift; my $timeout= shift;
my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt
while (1) while (1)
{ {
kill($signal, $pid); kill($signal, $pid);
last unless kill (0, $pid) and $retries--; last unless kill (0, $pid) and $max_loop--;
mtr_debug("Sleep $timeout second waiting for processes to die"); mtr_verbose("Sleep 0.1 second waiting for processes to die");
sleep($timeout); select(undef, undef, undef, 0.1);
} }
return $max_loop;
} }
############################################################################## ##############################################################################