From: Jeffrey Altman Date: Thu, 25 Sep 2008 18:15:56 +0000 (+0000) Subject: DEVEL15-rename-rx-stats-20080925 X-Git-Tag: openafs-devel-1_5_53~10 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=572f3b29f7c24ce1fd9166c9505e92c8449d2835;p=packages%2Fo%2Fopenafs.git DEVEL15-rename-rx-stats-20080925 LICENSE IPL10 avoid using the same name for the struct and the global so the windows debugger works usefully (cherry picked from commit 7a4041f9404ff27f3e446d7b523086e0938dc6b9) --- diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c index f51d36497..8072dcb55 100644 --- a/src/libadmin/adminutil/afs_utilAdmin.c +++ b/src/libadmin/adminutil/afs_utilAdmin.c @@ -2508,7 +2508,7 @@ util_RXDebugBasicStats(rxdebugHandle_p handle, struct rx_debugStats *stats, */ int ADMINAPI -util_RXDebugRxStats(rxdebugHandle_p handle, struct rx_stats *stats, +util_RXDebugRxStats(rxdebugHandle_p handle, struct rx_statistics *stats, afs_uint32 * supportedValues, afs_status_p st) { int rc = 0; diff --git a/src/libadmin/adminutil/afs_utilAdmin.h b/src/libadmin/adminutil/afs_utilAdmin.h index c87550c47..d51b3bcf2 100644 --- a/src/libadmin/adminutil/afs_utilAdmin.h +++ b/src/libadmin/adminutil/afs_utilAdmin.h @@ -136,7 +136,7 @@ extern int ADMINAPI util_RXDebugBasicStats(rxdebugHandle_p handle, afs_status_p st); extern int ADMINAPI util_RXDebugRxStats(rxdebugHandle_p handle, - struct rx_stats *stats, + struct rx_statistics *stats, afs_uint32 * supportedStats, afs_status_p st); diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c index b8ed0af32..2a3de6b8b 100644 --- a/src/libadmin/samples/rxdebug_rx_stats.c +++ b/src/libadmin/samples/rxdebug_rx_stats.c @@ -68,7 +68,7 @@ main(int argc, char *argv[]) rxdebugHandle_p handle; char *srvrName; long srvrPort; - struct rx_stats stats; + struct rx_statistics stats; afs_uint32 supportedStats; char tstr[32]; int i; diff --git a/src/rx/rx.c b/src/rx/rx.c index bc842a119..6e032d307 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -480,7 +480,7 @@ rx_InitHost(u_int host, u_int port) rxi_nCalls = 0; rx_connDeadTime = 12; rx_tranquil = 0; /* reset flag */ - memset((char *)&rx_stats, 0, sizeof(struct rx_stats)); + memset((char *)&rx_stats, 0, sizeof(struct rx_statistics)); htable = (char *) osi_Alloc(rx_hashTableSize * sizeof(struct rx_connection *)); PIN(htable, rx_hashTableSize * sizeof(struct rx_connection *)); /* XXXXX */ @@ -6302,15 +6302,15 @@ rxi_DebugPrint(char *format, int a1, int a2, int a3, int a4, int a5, int a6, * checking. */ void -rx_PrintTheseStats(FILE * file, struct rx_stats *s, int size, +rx_PrintTheseStats(FILE * file, struct rx_statistics *s, int size, afs_int32 freePackets, char version) { int i; - if (size != sizeof(struct rx_stats)) { + if (size != sizeof(struct rx_statistics)) { fprintf(file, "Unexpected size of stats structure: was %d, expected %lud\n", - size, sizeof(struct rx_stats)); + size, sizeof(struct rx_statistics)); } fprintf(file, "rx stats: free packets %d, allocs %d, ", (int)freePackets, @@ -6588,7 +6588,7 @@ rx_GetServerDebug(osi_socket socket, afs_uint32 remoteAddr, afs_int32 rx_GetServerStats(osi_socket socket, afs_uint32 remoteAddr, - afs_uint16 remotePort, struct rx_stats * stat, + afs_uint16 remotePort, struct rx_statistics * stat, afs_uint32 * supportedValues) { struct rx_debugIn in; diff --git a/src/rx/rx.h b/src/rx/rx.h index 6a83900d0..a69383978 100644 --- a/src/rx/rx.h +++ b/src/rx/rx.h @@ -789,7 +789,7 @@ struct rx_securityClass { * Clearly we assume that ntohl will work on these structures so sizeof(int) * must equal sizeof(afs_int32). */ -struct rx_stats { /* General rx statistics */ +struct rx_statistics { /* General rx statistics */ int packetRequests; /* Number of packet allocation requests */ int receivePktAllocFailures; int sendPktAllocFailures; diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h index 3b56f3585..0347fc18c 100644 --- a/src/rx/rx_globals.h +++ b/src/rx/rx_globals.h @@ -493,7 +493,7 @@ EXT afs_kcondvar_t rx_waitingForPackets_cv; #endif EXT char rx_waitingForPackets; /* Processes set and wait on this variable when waiting for packet buffers */ -EXT struct rx_stats rx_stats; +EXT struct rx_statistics rx_stats; EXT struct rx_peer **rx_peerHashTable; EXT struct rx_connection **rx_connHashTable; diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index ee9801ba8..88b77bda1 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -186,7 +186,7 @@ extern void rxi_ReapConnections(struct rxevent *unused, void *unused1, void *unused2); extern int rxs_Release(struct rx_securityClass *aobj); #ifndef KERNEL -extern void rx_PrintTheseStats(FILE * file, struct rx_stats *s, int size, +extern void rx_PrintTheseStats(FILE * file, struct rx_statistics *s, int size, afs_int32 freePackets, char version); extern void rx_PrintStats(FILE * file); extern void rx_PrintPeerStats(FILE * file, struct rx_peer *peer); @@ -197,7 +197,7 @@ extern afs_int32 rx_GetServerDebug(osi_socket socket, afs_uint32 remoteAddr, afs_uint32 * supportedValues); extern afs_int32 rx_GetServerStats(osi_socket socket, afs_uint32 remoteAddr, afs_uint16 remotePort, - struct rx_stats *stat, + struct rx_statistics *stat, afs_uint32 * supportedValues); extern afs_int32 rx_GetServerVersion(osi_socket socket, afs_uint32 remoteAddr, afs_uint16 remotePort, diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index 93a8389a0..cf0d1e734 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -276,7 +276,7 @@ MainCommand(struct cmd_syndesc *as, void *arock) fprintf(stderr, "WARNING: Server doesn't support retrieval of Rx statistics\n"); } else { - struct rx_stats rxstats; + struct rx_statistics rxstats; /* should gracefully handle the case where rx_stats grows */ code =