arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save and restore the old value of {CHLD} in functions plugin_command and dispatch_request to avoid the change of {CHLD}

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5057 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2010-01-27 10:24:34 +00:00
parent 969806a3fa
commit 27dbebaf82
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/sbin/xcatd
View File

@ -880,6 +880,8 @@ sub plugin_command {
}
$plugin_numchildren=0;
%plugin_children=();
# save the old signal
my $old_sig_chld = $SIG{CHLD};
$SIG{CHLD} = \&plugin_reaper; #sub {my $plugpid; while (($plugpid = waitpid(-1, WNOHANG)) > 0) { if ($plugin_children{$plugpid}) { delete $plugin_children{$plugpid}; $plugin_numchildren--; } } };
my $check_fds;
if ($sock) {
@ -970,11 +972,20 @@ sub plugin_command {
}
}
}
unless ($sock) { return $Main::resps };
unless ($sock) {
# restore the old signal
$SIG{CHLD} = $old_sig_chld;
return $Main::resps
}
while (($plugin_numchildren > 0) and ($check_fds->count > 0)) { #this tracks end of useful data from children much more closely
relay_fds($check_fds,$sock);
}
#while (relay_fds($check_fds,$sock)) {}
# restore the old signal
$SIG{CHLD} = $old_sig_chld;
my %done;
$done{serverdone} = {};
if ($req->{transid}) {
@ -1060,6 +1071,9 @@ sub dispatch_request {
my $child_fdset = new IO::Select;
no strict "refs";
# save the old signal
my $old_sig_chld = $SIG{CHLD};
#Hierarchy support. Originally, the default scope for noderange commands was
#going to be the servicenode associated unless overriden.
#However, assume for example that you have blades and a blade is the service node
@ -1180,6 +1194,9 @@ sub dispatch_request {
}
while (($dispatch_children > 0) and ($child_fdset->count > 0)) { relay_dispatch($child_fdset,$dispatch_cb) }
while (relay_dispatch($child_fdset,$dispatch_cb)) { } #Potentially useless drain.
# restore the old signal
$SIG{CHLD} = $old_sig_chld;
}