holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Optimization of 'localtime' calls

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7805 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-01 01:53:37 +00:00
parent 204117e1f2
commit 960c77ebde
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Shorewall-perl/Shorewall/Config.pm
View File

@ -433,7 +433,7 @@ sub warning_message
{ {
my $linenumber = $currentlinenumber || 1; my $linenumber = $currentlinenumber || 1;
my $currentlineinfo = $currentfile ? " : $currentfilename (line $linenumber)" : ''; my $currentlineinfo = $currentfile ? " : $currentfilename (line $linenumber)" : '';
my @localtime; our @localtime;
$| = 1; $| = 1;
@ -444,7 +444,7 @@ sub warning_message
if ( $debug ) { if ( $debug ) {
print STDERR longmess( " WARNING: @_$currentlineinfo" ); print STDERR longmess( " WARNING: @_$currentlineinfo" );
print $log longmess( " WARNING: @_$currentlineinfo" ) if $log; print $log longmess( " WARNING: @_$currentlineinfo\n" ) if $log;
} else { } else {
print STDERR " WARNING: @_$currentlineinfo\n"; print STDERR " WARNING: @_$currentlineinfo\n";
print $log " WARNING: @_$currentlineinfo\n" if $log; print $log " WARNING: @_$currentlineinfo\n" if $log;
@ -463,11 +463,11 @@ sub fatal_error {
$| = 1; $| = 1;
if ( $log ) { if ( $log ) {
my @localtime = localtime; our @localtime = localtime;
printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
if ( $debug ) { if ( $debug ) {
print $log longmess( " ERROR: @_$currentlineinfo" ); print $log longmess( " ERROR: @_$currentlineinfo\n" );
} else { } else {
print $log " ERROR: @_$currentlineinfo\n"; print $log " ERROR: @_$currentlineinfo\n";
} }
@ -484,7 +484,7 @@ sub fatal_error1 {
$| = 1; $| = 1;
if ( $log ) { if ( $log ) {
my @localtime = localtime; our @localtime = localtime;
printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
if ( $debug ) { if ( $debug ) {
@ -612,15 +612,18 @@ sub set_command( $$$ ) {
# Print the current TOD to STDOUT. # Print the current TOD to STDOUT.
# #
sub timestamp() { sub timestamp() {
printf '%02d:%02d:%02d ', ( localtime ) [2,1,0]; our @localtime = localtime;
printf '%02d:%02d:%02d ', @localtime[2,1,0];
} }
# #
# Write a message if $verbose >= 2 # Write a message if $verbose >= 2
# #
sub progress_message { sub progress_message {
my $havelocaltime = 0;
if ( $verbose > 1 ) { if ( $verbose > 1 ) {
timestamp if $timestamp; timestamp, $havelocaltime = 1 if $timestamp;
# #
# We use this function to display messages containing raw config file images which may contains tabs (including multiple tabs in succession). # We use this function to display messages containing raw config file images which may contains tabs (including multiple tabs in succession).
# The following makes such messages look more readable and uniform # The following makes such messages look more readable and uniform
@ -631,7 +634,9 @@ sub progress_message {
} }
if ( $log_verbose > 1 ) { if ( $log_verbose > 1 ) {
my @localtime = localtime; our @localtime;
@localtime = localtime unless $havelocaltime;
printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
my $line = "@_"; my $line = "@_";
@ -644,13 +649,17 @@ sub progress_message {
# Write a message if $verbose >= 1 # Write a message if $verbose >= 1
# #
sub progress_message2 { sub progress_message2 {
my $havelocaltime = 0;
if ( $verbose > 0 ) { if ( $verbose > 0 ) {
timestamp if $timestamp; timestamp, $havelocaltime = 1 if $timestamp;
print "@_\n"; print "@_\n";
} }
if ( $log_verbose > 0 ) { if ( $log_verbose > 0 ) {
my @localtime = localtime; our @localtime;
@localtime = localtime unless $havelocaltime;
printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
print $log "@_\n"; print $log "@_\n";
@ -661,13 +670,17 @@ sub progress_message2 {
# Write a message if $verbose >= 0 # Write a message if $verbose >= 0
# #
sub progress_message3 { sub progress_message3 {
my $havelocaltime = 0;
if ( $verbose >= 0 ) { if ( $verbose >= 0 ) {
timestamp if $timestamp; timestamp, $havelocaltime = 1 if $timestamp;
print "@_\n"; print "@_\n";
} }
if ( $log_verbose > 0 ) { if ( $log_verbose >= 0 ) {
my @localtime = localtime; our @localtime;
@localtime = localtime unless $havelocaltime;
printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %02d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
print $log "@_\n"; print $log "@_\n";