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

fix the issue for xcatdebug:1. aix cannot recognize the signal NUM50,NUM51. 2. the xcatdeug -f does not work after the change that loading plugin when really running of command

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11822 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2012-03-12 11:54:28 +00:00
parent 3c021b2b23
commit 8797bd6954
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/sbin/xcatd
View File

@@ -750,8 +750,21 @@ unless ($pid_MON) {
$$progname="xcatd: SSL listener";
# Enable the signals for the subroutine calling trace
$SIG{NUM50} = \&enable_callingtrace;
$SIG{NUM51} = \&disable_callingtrace;
$SIG{TRAP} = sub {
if (-f "/tmp/xcatcallingtrace.flag") {
if (open (TRACEFLAG, "</tmp/xcatcallingtrace.flag")) {
my $traceflag = <TRACEFLAG>;
if($traceflag == 1) {
&enable_callingtrace;
print "enabled calling trace\n";
} else {
&disable_callingtrace;
print "dislabled calling trace\n";
}
close (TRACEFLAG);
}
}
};
#setup signal in NotifHandler so that the cache can be updated
xCAT::NotifHandler::setup($$, $dbmaster);
@@ -2063,6 +2076,8 @@ sub enable_callingtrace{
my @pluginfuncs = (); # function list that will be enabled for plugins
my @xcatdfuncs = (); # function list that will be enabled for xcatd
# call the subroutine scan_plugins to fill the symbol table
scan_plugins();
# Backup the trace log
my ($sec,$min,$hour,$mday,$mon,$year) = localtime();
@@ -2252,8 +2267,7 @@ sub disable_callingtrace {
foreach my $glob (keys %::DEBUG_FUN) {
if (defined $::DEBUG_FUN{$glob}{'orig'}) {
*{"$glob"} = $::DEBUG_FUN{$glob}{'orig'};
print $::LOG_FILE_HANDLE "$glob\n";
#print "$glob".": => $::DEBUG_FUN{$glob}{orig}\n";
print $::LOG_FILE_HANDLE "$glob\n" if ($::LOG_FILE_HANDLE);
}
}
print $::LOG_FILE_HANDLE "####################################################\n" if ($::LOG_FILE_HANDLE);

11
xCAT-server/sbin/xcatdebug
View File

@@ -90,10 +90,17 @@ if (defined($::FUNC)) {
} else {
unlink "/tmp/xcatcallingtrace.cfg";
}
kill 50, $pid;
open(TRACEFLAG, ">/tmp/xcatcallingtrace.flag") or die "Cannot open file to write in /tmp\n";
print TRACEFLAG 1;
close (TRACEFLAG);
kill SIGTRAP, $pid;
print "Enabled the subroutine calling trace.\n";
} elsif ($::FUNC eq "disable") {
kill 51, $pid;
open(TRACEFLAG, ">/tmp/xcatcallingtrace.flag") or die "Cannot open file to write in /tmp\n";
print TRACEFLAG 0;
close (TRACEFLAG);
kill SIGTRAP, $pid;
unlink "/tmp/xcatcallingtrace.cfg";
print "Disabled the subroutine calling trace.\n";
} else {
print "$usage";