rxstats: correctly report vlserver VL_* RPC stats

[openafs.git] / src / libadmin / samples / rxstat_get_process.c

diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index 779f6c2..2fd8d20 100644 (file)
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -5,6 +5,8 @@
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
  */
 
 /*
@@ -14,27 +16,19 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
-#include <rx/rxstat.h>
+
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>
@@ -50,10 +44,8 @@ RCSID
 #include <ubik.h>
 #include <ubik_int.h>
 
-extern int RXSTATS_RetrieveProcessRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_get_process <cell> <host> <port>\n");
     exit(1);
@@ -118,7 +110,7 @@ GetPrintStrings(afs_RPCStats_p statp, char *ifName, char *ifRole,
        *funcListLen = VOTE_NO_OF_STAT_FUNCS;
        break;
     case VL_STATINDEX:
-       strcpy(ifName, "volserver interface");
+       strcpy(ifName, "vlserver interface");
        *funcList = VL_function_names;
        *funcListLen = VL_NO_OF_STAT_FUNCS;
        break;
@@ -215,14 +207,13 @@ main(int argc, char *argv[])
            printf("    %s\n", funcList[index]);
        }
 
-       if (!hiszero(stats.s.stats_v1.invocations)) {
-           printf("\tinvoc (%u.%u) bytes_sent (%u.%u) bytes_rcvd (%u.%u)\n",
-                  hgethi(stats.s.stats_v1.invocations),
-                  hgetlo(stats.s.stats_v1.invocations),
-                  hgethi(stats.s.stats_v1.bytes_sent),
-                  hgetlo(stats.s.stats_v1.bytes_sent),
-                  hgethi(stats.s.stats_v1.bytes_rcvd),
-                  hgetlo(stats.s.stats_v1.bytes_rcvd));
+       if (stats.s.stats_v1.invocations != 0) {
+           printf("\tinvoc %"AFS_UINT64_FMT
+                  " bytes_sent %"AFS_UINT64_FMT
+                  " bytes_rcvd %"AFS_UINT64_FMT"\n",
+                  stats.s.stats_v1.invocations,
+                  stats.s.stats_v1.bytes_sent,
+                  stats.s.stats_v1.bytes_rcvd);
            printf("\tqsum %d.%06d qsqr %d.%06d"
                   " qmin %d.%06d qmax %d.%06d\n",
                   stats.s.stats_v1.queue_time_sum.sec,