database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.

Browse Source 
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.


mysql-test/lib/mtr_process.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/mysql-test-run.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
This commit is contained in:
unknown
2006-06-11 11:28:11 +02:00
parent f2d51019e2
commit 312c46933a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ sub sleep_until_file_created ($$$);
sub mtr_kill_processes ($);
sub mtr_ping_with_timeout($);
sub mtr_ping_port ($);
sub mtr_kill_process ($$$$);
sub mtr_kill_process ($$$);
# static in C
sub spawn_impl ($$$$$$$$);
@@ -933,17 +933,16 @@ sub mtr_kill_processes ($) {
{
foreach my $sig (15, 9)
{
last if mtr_kill_process($pid, $sig, 10, 1);
last if mtr_kill_process($pid, $sig, 10);
}
}
}
sub mtr_kill_process ($$$$) {
sub mtr_kill_process ($$$) {
my $pid= shift;
my $signal= shift;
my $retries= shift;
my $timeout= shift;
my $timeout= shift; # Seconds to wait for process
my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt
while (1)
@@ -952,7 +951,7 @@ sub mtr_kill_process ($$$$) {
last unless kill (0, $pid) and $max_loop--;
mtr_verbose("Sleep 0.1 second waiting for processes to die");
mtr_verbose("Sleep 0.1 second waiting for processes $pid to die");
select(undef, undef, undef, 0.1);
}