xstat: prevent CPU loop when -period 0

[openafs.git] / src / xstat / xstat_fs.c

diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c
index ba2066e..3145a00 100644 (file)
--- a/src/xstat/xstat_fs.c
+++ b/src/xstat/xstat_fs.c
@@ -32,9 +32,7 @@
 int xstat_fs_numServers;       /*Num connected servers */
 struct xstat_fs_ConnectionInfo
  *xstat_fs_ConnInfo;           /*Ptr to connection array */
-int numCollections;            /*Number of data collections */
 struct xstat_fs_ProbeResults xstat_fs_Results; /*Latest probe results */
-char terminationEvent;         /*One-shot termination event */
 
 afs_int32 xstat_fsData[AFS_MAX_XSTAT_LONGS];   /*Buffer for collected data */
 
@@ -277,12 +275,12 @@ xstat_fs_LWP(void *unused)
 
                    if (xstat_fs_debug) {
                        printf
-                           ("%s: Calling RXAFS_GetXStats, conn=%" AFS_PTR_FMT ", clientVersionNumber=%d, collectionNumber=%d, srvVersionNumberP=%" AFS_PTR_FMT ", timeP=%" AFS_PTR_FMT ", dataP=%" AFS_PTR_FMT "\n",
+                           ("%s: Calling RXAFS_GetXStats, conn=%p, clientVersionNumber=%d, collectionNumber=%d, srvVersionNumberP=%p, timeP=%p, dataP=%p\n",
                             rn, curr_conn->rxconn, clientVersionNumber,
                             *currCollIDP, &srvVersionNumber,
                             &(xstat_fs_Results.probeTime),
                             &(xstat_fs_Results.data));
-                       printf("%s: [bufflen=%d, buffer at %" AFS_PTR_FMT "]\n", rn,
+                       printf("%s: [bufflen=%d, buffer at %p]\n", rn,
                               xstat_fs_Results.data.AFS_CollData_len,
                               xstat_fs_Results.data.AFS_CollData_val);
                    }
@@ -432,7 +430,7 @@ xstat_fs_Init(int a_numServers, struct sockaddr_in *a_socketArray,
                a_ProbeFreqInSecs);
        arg_errfound = 1;
     }
-    if (a_ProbeHandler == (int (*)())0) {
+    if (a_ProbeHandler == NULL) {
        fprintf(stderr, "[%s] Null probe handler function argument\n", rn);
        arg_errfound = 1;
     }
@@ -585,7 +583,7 @@ xstat_fs_Init(int a_numServers, struct sockaddr_in *a_socketArray,
            conn_err = 1;
        }
        if (xstat_fs_debug)
-           printf("[%s] New connection at %" AFS_PTR_FMT "\n", rn, curr_conn->rxconn);
+           printf("[%s] New connection at %p\n", rn, curr_conn->rxconn);
 
        /*
         * Bump the current xstat_fs connection to set up.
@@ -858,8 +856,6 @@ xstat_fs_Wait(int sleep_secs)
        }
     } else if (sleep_secs == 0) {
        /* Sleep forever. */
-       tv.tv_sec = 24 * 60;
-       tv.tv_usec = 0;
        if (xstat_fs_debug)
            fprintf(stderr, "[ %s ] going to sleep ...\n", rn);
        while (1) {
@@ -867,7 +863,7 @@ xstat_fs_Wait(int sleep_secs)
                          0,    /*Descriptors ready for reading */
                          0,    /*Descriptors ready for writing */
                          0,    /*Descriptors with exceptional conditions */
-                         &tv); /*Timeout structure */
+                         NULL);        /* NULL timeout means "forever" */
            if (code < 0) {
                fprintf(stderr, "[%s] select() error %d\n", rn, errno);
                break;