percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 08:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use waitpid($pid, WNOHANG) instead of kill(0, $pid).

Browse Source
This commit is contained in:
Brian Fraser
2012-01-10 11:25:18 -03:00
parent 5098d33372
commit 01042d0fda
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/DiskstatsMenu.pm
View File

@@ -27,6 +27,8 @@ use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0; use constant PTDEBUG => $ENV{PTDEBUG} || 0;
use POSIX qw( :sys_wait_h );
use IO::Handle; use IO::Handle;
use IO::Select; use IO::Select;
use Scalar::Util qw( looks_like_number blessed ); use Scalar::Util qw( looks_like_number blessed );
@@ -150,8 +152,9 @@ sub run_interactive {
} }
ReadKeyMini::cbreak(); ReadKeyMini::cbreak();
my $run = 1;
MAIN_LOOP: MAIN_LOOP:
while (1) { while ($run) {
if ( my $input = read_command_timeout($sel, $o->get('redisplay-interval') ) ) { if ( my $input = read_command_timeout($sel, $o->get('redisplay-interval') ) ) {
if ($actions{$input}) { if ($actions{$input}) {
my $ret = $actions{$input}->( my $ret = $actions{$input}->(
@@ -178,14 +181,15 @@ sub run_interactive {
# process just calls it quits once it gathers enough samples. # process just calls it quits once it gathers enough samples.
# When that happens, we are also done. # When that happens, we are also done.
if ( !$args{filename} && $o->get('iterations') if ( !$args{filename} && $o->get('iterations')
&& !kill(0, $child_pid) ) { && waitpid($child_pid, WNOHANG) != 0 ) {
waitpid $child_pid, 0; $run = 0;
last MAIN_LOOP;
} }
} }
ReadKeyMini::cooked(); ReadKeyMini::cooked();
if ( !$args{filename} && kill 0, $child_pid ) { # If we don't have a filename, the daemon might still be running.
# If it is, ask it nicely to end, then wait.
if ( !$args{filename} && !defined $o->get('iterations') && kill 0, $child_pid ) {
$child_fh->printflush("End\n"); $child_fh->printflush("End\n");
waitpid $child_pid, 0; waitpid $child_pid, 0;
} }