Fix printfs of time for Darwin

Darwin uses a fancy type for tv_sec, which needs to be cast to long
before it can be printed.

Reviewed-on: http://gerrit.openafs.org/165
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>

diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c
index b4c71c8..1dc0e59 100644 (file)
--- a/src/afsmonitor/afsmon-output.c
+++ b/src/afsmonitor/afsmon-output.c
@@ -253,11 +253,11 @@ Print_fs_OpTiming(int a_opIdx, struct fs_stats_opTimingData *a_opTimeP)
 {                              /*Print_fs_OpTiming */
 
     fprintf(fs_outFD,
-           "%15s: %d ops (%d OK); sum=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+           "%15s: %d ops (%d OK); sum=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
            fsOpNames[a_opIdx], a_opTimeP->numOps, a_opTimeP->numSuccesses,
-           a_opTimeP->sumTime.tv_sec, a_opTimeP->sumTime.tv_usec,
-           a_opTimeP->minTime.tv_sec, a_opTimeP->minTime.tv_usec,
-           a_opTimeP->maxTime.tv_sec, a_opTimeP->maxTime.tv_usec);
+           (long)a_opTimeP->sumTime.tv_sec, (long)a_opTimeP->sumTime.tv_usec,
+           (long)a_opTimeP->minTime.tv_sec, (long)a_opTimeP->minTime.tv_usec,
+           (long)a_opTimeP->maxTime.tv_sec, (long)a_opTimeP->maxTime.tv_usec);
 
 }                              /*Print_fs_OpTiming */
 
@@ -287,11 +287,11 @@ Print_fs_XferTiming(int a_opIdx, struct fs_stats_xferData *a_xferP)
 {                              /*Print_fs_XferTiming */
 
     fprintf(fs_outFD,
-           "%s: %d xfers (%d OK), time sum=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+           "%s: %d xfers (%d OK), time sum=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
            xferOpNames[a_opIdx], a_xferP->numXfers, a_xferP->numSuccesses,
-           a_xferP->sumTime.tv_sec, a_xferP->sumTime.tv_usec,
-           a_xferP->minTime.tv_sec, a_xferP->minTime.tv_usec,
-           a_xferP->maxTime.tv_sec, a_xferP->maxTime.tv_usec);
+           (long)a_xferP->sumTime.tv_sec, (long)a_xferP->sumTime.tv_usec,
+           (long)a_xferP->minTime.tv_sec, (long)a_xferP->minTime.tv_usec,
+           (long)a_xferP->maxTime.tv_sec, (long)a_xferP->maxTime.tv_usec);
     fprintf(fs_outFD, "\t[bytes: sum=%d, min=%d, max=%d]\n",
            a_xferP->sumBytes, a_xferP->minBytes, a_xferP->maxBytes);
     fprintf(fs_outFD,
@@ -328,7 +328,7 @@ Print_fs_DetailedPerfInfo(struct fs_stats_DetailedStats *a_detP)
 
     int currIdx;               /*Loop variable */
 
-    fprintf(fs_outFD, "\t%10d epoch\n", a_detP->epoch);
+    fprintf(fs_outFD, "\t%10ld epoch\n", (long)a_detP->epoch.tv_sec);
 
     for (currIdx = 0; currIdx < FS_STATS_NUM_RPC_OPS; currIdx++)
        Print_fs_OpTiming(currIdx, &(a_detP->rpcOpTimes[currIdx]));
@@ -736,11 +736,11 @@ Print_cm_OpTiming(int a_opIdx, char *a_opNames[],
 {                              /*Print_cm_OpTiming */
 
     fprintf(cm_outFD,
-           "%15s: %d ops (%d OK); sum=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+           "%15s: %d ops (%d OK); sum=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
            a_opNames[a_opIdx], a_opTimeP->numOps, a_opTimeP->numSuccesses,
-           a_opTimeP->sumTime.tv_sec, a_opTimeP->sumTime.tv_usec,
-           a_opTimeP->minTime.tv_sec, a_opTimeP->minTime.tv_usec,
-           a_opTimeP->maxTime.tv_sec, a_opTimeP->maxTime.tv_usec);
+           (long)a_opTimeP->sumTime.tv_sec, (long)a_opTimeP->sumTime.tv_usec,
+           (long)a_opTimeP->minTime.tv_sec, (long)a_opTimeP->minTime.tv_usec,
+           (long)a_opTimeP->maxTime.tv_sec, (long)a_opTimeP->maxTime.tv_usec);
 
 }                              /*Print_cm_OpTiming */
 
@@ -771,11 +771,11 @@ Print_cm_XferTiming(int a_opIdx, char *a_opNames[],
 {                              /*Print_cm_XferTiming */
 
     fprintf(cm_outFD,
-           "%s: %d xfers (%d OK), time sum=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+           "%s: %d xfers (%d OK), time sum=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
            a_opNames[a_opIdx], a_xferP->numXfers, a_xferP->numSuccesses,
-           a_xferP->sumTime.tv_sec, a_xferP->sumTime.tv_usec,
-           a_xferP->minTime.tv_sec, a_xferP->minTime.tv_usec,
-           a_xferP->maxTime.tv_sec, a_xferP->maxTime.tv_usec);
+           (long)a_xferP->sumTime.tv_sec, (long)a_xferP->sumTime.tv_usec,
+           (long)a_xferP->minTime.tv_sec, (long)a_xferP->minTime.tv_usec,
+           (long)a_xferP->maxTime.tv_sec, (long)a_xferP->maxTime.tv_usec);
     fprintf(cm_outFD, "\t[bytes: sum=%d, min=%d, max=%d]\n",
            a_xferP->sumBytes, a_xferP->minBytes, a_xferP->maxBytes);
     fprintf(cm_outFD,

diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index de9a285..cf00cb6 100644 (file)
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -840,12 +840,12 @@ PrintOpTiming(int a_opIdx, char *a_opNames[],
 {                              /*PrintOpTiming */
 
     printf
-       ("%15s: %d ops (%d OK); sum=%d.%06d, sqr=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+       ("%15s: %d ops (%d OK); sum=%ld.%06ld, sqr=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
         a_opNames[a_opIdx], a_opTimeP->numOps, a_opTimeP->numSuccesses,
-        a_opTimeP->sumTime.tv_sec, a_opTimeP->sumTime.tv_usec,
-        a_opTimeP->sqrTime.tv_sec, a_opTimeP->sqrTime.tv_usec,
-        a_opTimeP->minTime.tv_sec, a_opTimeP->minTime.tv_usec,
-        a_opTimeP->maxTime.tv_sec, a_opTimeP->maxTime.tv_usec);
+        (long)a_opTimeP->sumTime.tv_sec, (long)a_opTimeP->sumTime.tv_usec,
+        (long)a_opTimeP->sqrTime.tv_sec, (long)a_opTimeP->sqrTime.tv_usec,
+        (long)a_opTimeP->minTime.tv_sec, (long)a_opTimeP->minTime.tv_usec,
+        (long)a_opTimeP->maxTime.tv_sec, (long)a_opTimeP->maxTime.tv_usec);
 
 }                              /*PrintOpTiming */
 
@@ -877,12 +877,12 @@ PrintXferTiming(int a_opIdx, char *a_opNames[],
 {                              /*PrintXferTiming */
 
     printf
-       ("%s: %d xfers (%d OK), time sum=%d.%06d, sqr=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+       ("%s: %d xfers (%d OK), time sum=%ld.%06ld, sqr=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
         a_opNames[a_opIdx], a_xferP->numXfers, a_xferP->numSuccesses,
-        a_xferP->sumTime.tv_sec, a_xferP->sumTime.tv_usec,
-        a_xferP->sqrTime.tv_sec, a_xferP->sqrTime.tv_usec,
-        a_xferP->minTime.tv_sec, a_xferP->minTime.tv_usec,
-        a_xferP->maxTime.tv_sec, a_xferP->maxTime.tv_usec);
+        (long)a_xferP->sumTime.tv_sec, (long)a_xferP->sumTime.tv_usec,
+        (long)a_xferP->sqrTime.tv_sec, (long)a_xferP->sqrTime.tv_usec,
+        (long)a_xferP->minTime.tv_sec, (long)a_xferP->minTime.tv_usec,
+        (long)a_xferP->maxTime.tv_sec, (long)a_xferP->maxTime.tv_usec);
     printf("\t[bytes: sum=%d, min=%d, max=%d]\n", a_xferP->sumBytes,
           a_xferP->minBytes, a_xferP->maxBytes);
     printf

diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index 7c949ab..63377b3 100644 (file)
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -288,12 +288,12 @@ PrintOpTiming(int a_opIdx, struct fs_stats_opTimingData *a_opTimeP)
     avg = fSumTime / ((double)(a_opTimeP->numSuccesses));
 
     printf
-       ("%15s: %d ops (%d OK); sum=%d.%06d, sqr=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+       ("%15s: %d ops (%d OK); sum=%ld.%06ld, sqr=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
         opNames[a_opIdx], a_opTimeP->numOps, a_opTimeP->numSuccesses,
-        a_opTimeP->sumTime.tv_sec, a_opTimeP->sumTime.tv_usec,
-        a_opTimeP->sqrTime.tv_sec, a_opTimeP->sqrTime.tv_usec,
-        a_opTimeP->minTime.tv_sec, a_opTimeP->minTime.tv_usec,
-        a_opTimeP->maxTime.tv_sec, a_opTimeP->maxTime.tv_usec);
+        (long)a_opTimeP->sumTime.tv_sec, (long)a_opTimeP->sumTime.tv_usec,
+        (long)a_opTimeP->sqrTime.tv_sec, (long)a_opTimeP->sqrTime.tv_usec,
+        (long)a_opTimeP->minTime.tv_sec, (long)a_opTimeP->minTime.tv_usec,
+        (long)a_opTimeP->maxTime.tv_sec, (long)a_opTimeP->maxTime.tv_usec);
 }
 
 
@@ -329,13 +329,13 @@ PrintXferTiming(int a_opIdx, struct fs_stats_xferData *a_xferP)
     avg = fSumTime / ((double)(a_xferP->numSuccesses));
 
     printf
-       ("%s: %d xfers (%d OK), time sum=%d.%06d, sqr=%d.%06d, min=%d.%06d, max=%d.%06d\n",
+       ("%s: %d xfers (%d OK), time sum=%ld.%06ld, sqr=%ld.%06ld, min=%ld.%06ld, max=%ld.%06ld\n",
         xferOpNames[a_opIdx], a_xferP->numXfers, a_xferP->numSuccesses,
-        a_xferP->sumTime.tv_sec, a_xferP->sumTime.tv_usec,
-        a_xferP->sqrTime.tv_sec, a_xferP->sqrTime.tv_usec,
-        a_xferP->minTime.tv_sec, a_xferP->minTime.tv_usec,
-        a_xferP->maxTime.tv_sec, a_xferP->maxTime.tv_usec);
-    printf("\t[bytes: sum=%lu, min=%d, max=%d]\n", a_xferP->sumBytes,
+        (long)a_xferP->sumTime.tv_sec, (long)a_xferP->sumTime.tv_usec,
+        (long)a_xferP->sqrTime.tv_sec, (long)a_xferP->sqrTime.tv_usec,
+        (long)a_xferP->minTime.tv_sec, (long)a_xferP->minTime.tv_usec,
+        (long)a_xferP->maxTime.tv_sec, (long)a_xferP->maxTime.tv_usec);
+    printf("\t[bytes: sum=%d, min=%d, max=%d]\n", a_xferP->sumBytes,
           a_xferP->minBytes, a_xferP->maxBytes);
     printf
        ("\t[buckets: 0: %d, 1: %d, 2: %d, 3: %d, 4: %d, 5: %d, 6: %d, 7: %d, 8: %d]\n",
@@ -369,7 +369,7 @@ PrintDetailedPerfInfo(struct fs_stats_DetailedStats *a_detP)
 {
     int currIdx;               /*Loop variable */
 
-    printf("\t%10d epoch\n", a_detP->epoch);
+    printf("\t%10ld epoch\n", (long) a_detP->epoch.tv_sec);
 
     for (currIdx = 0; currIdx < FS_STATS_NUM_RPC_OPS; currIdx++)
        PrintOpTiming(currIdx, &(a_detP->rpcOpTimes[currIdx]));
@@ -499,7 +499,7 @@ void
 PrintCbCounters(void) {
     int numInt32s = sizeof(CbCounterStrings)/sizeof(char *);
     int i;
-    afs_uint32 *val=xstat_fs_Results.data.AFS_CollData_val;
+    afs_int32 *val=xstat_fs_Results.data.AFS_CollData_val;
 
     if (numInt32s > xstat_fs_Results.data.AFS_CollData_len)
        numInt32s = xstat_fs_Results.data.AFS_CollData_len;