jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 14:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rx: PrintTheseStats should not be dependent on RXDEBUG

Browse Source 
When RXDEBUG is not defined, PrintTheseStats generates an error
even though the statistics are in fact available.  The global
variable rx_packetTypes was not being defined without RXDEBUG.

Make rx_packetTypes defined always and permit statistics to
always be printed.

Change-Id: Ife708d34b5d56374c8aff9aa7c941d39b37ca4a1
Reviewed-on: http://gerrit.openafs.org/2778
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit f1183f16285be040b7150414c9563a9bceb53210)
Reviewed-on: http://gerrit.openafs.org/2813
Reviewed-by: Rod Widdowson <rdw@steadingsoftware.com>
This commit is contained in:
Jeffrey Altman 2010-09-19 09:14:06 -07:00 committed by Derrick Brashear
parent e7bd67e5bd
commit bd9f7b125f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rx/rx.c
View File

@ -6976,7 +6976,6 @@ void
rx_PrintTheseStats(FILE * file, struct rx_statistics *s, int size, rx_PrintTheseStats(FILE * file, struct rx_statistics *s, int size,
afs_int32 freePackets, char version) afs_int32 freePackets, char version)
{ {
#ifdef RXDEBUG
int i; int i;
if (size != sizeof(struct rx_statistics)) { if (size != sizeof(struct rx_statistics)) {
@ -7051,9 +7050,6 @@ rx_PrintTheseStats(FILE * file, struct rx_statistics *s, int size,
#if !defined(AFS_PTHREAD_ENV) && !defined(AFS_USE_GETTIMEOFDAY) #if !defined(AFS_PTHREAD_ENV) && !defined(AFS_USE_GETTIMEOFDAY)
fprintf(file, " %d clock updates\n", clock_nUpdates); fprintf(file, " %d clock updates\n", clock_nUpdates);
#endif #endif
#else
fprintf(file, "ERROR: compiled without RXDEBUG\n");
#endif
} }
/* for backward compatibility */ /* for backward compatibility */

4
src/rx/rx_globals.h
View File

@ -578,12 +578,12 @@ EXT int rxdebug_active;
#endif #endif
#endif #endif
#define rx_Log_event rxevent_debugFile #define rx_Log_event rxevent_debugFile
EXT char *rx_packetTypes[RX_N_PACKET_TYPES] GLOBALSINIT(RX_PACKET_TYPES); /* Strings defined in rx.h */
#else #else
#define dpf(args) #define dpf(args)
#endif /* RXDEBUG */ #endif /* RXDEBUG */
EXT char *rx_packetTypes[RX_N_PACKET_TYPES] GLOBALSINIT(RX_PACKET_TYPES); /* Strings defined in rx.h */
#ifndef KERNEL #ifndef KERNEL
/* /*
* Counter used to implement connection specific data * Counter used to implement connection specific data