[netperf-dev] netperf4 commit notice r161 - branches/glib_migration/src

[raj at netperf.org]

Author: raj
Date: 2006-04-17 17:00:49 -0700 (Mon, 17 Apr 2006)
New Revision: 161

Modified:
   branches/glib_migration/src/netlib.c
   branches/glib_migration/src/netserver.c
   branches/glib_migration/src/nettest_bsd.c
   branches/glib_migration/src/nettest_dns.c
   branches/glib_migration/src/nettest_vst.c
Log:
More cleanups, this time for LP64


Modified: branches/glib_migration/src/netlib.c
===================================================================
--- branches/glib_migration/src/netlib.c	2006-04-17 23:38:26 UTC (rev 160)
+++ branches/glib_migration/src/netlib.c	2006-04-18 00:00:49 UTC (rev 161)
@@ -268,7 +268,7 @@
   
   values[0] = 0;
   for (i = 0, j = 0; i < 10; i++) {
-    j += g_snprintf(&(values[j]), 256-j, ":%5lld", row[i]);
+    j += g_snprintf(&(values[j]), 256-j, ":%5"PRId64, row[i]);
   }
   ap = xmlSetProp(hist, (xmlChar *)name, (xmlChar *)values);
   return(ap);
@@ -316,11 +316,11 @@
       ap = set_hist_attribute(hist, "ten_sec", h->ten_sec);
     }
     if (ap != NULL) {
-      sprintf(value_str,": %4lld",h->ridiculous);
+      sprintf(value_str,": %4"PRId64,h->ridiculous);
       ap = xmlSetProp(hist, (xmlChar *)"plus_100_sec", (xmlChar *)value_str);
     }
     if (ap != NULL) {
-      sprintf(value_str,": %4lld",h->total);
+      sprintf(value_str,": %4"PRId64,h->total);
       ap = xmlSetProp(hist, (xmlChar *)"hist_total", (xmlChar *)value_str);
     }
     if (ap == NULL) {

Modified: branches/glib_migration/src/netserver.c
===================================================================
--- branches/glib_migration/src/netserver.c	2006-04-17 23:38:26 UTC (rev 160)
+++ branches/glib_migration/src/netserver.c	2006-04-18 00:00:49 UTC (rev 161)
@@ -588,6 +588,11 @@
 
   netperf = netperf_hash[0].server;
 
+  if (debug) {
+    g_fprintf(where,
+              "%s Hickory Dickory Dock, Callback Ran Off The Clock\n",
+              __func__);
+  }
   for (i = 0; i < TEST_HASH_BUCKETS; i ++) {
     h = &test_hash[i];
     /* mutex locking is not required because only one 

Modified: branches/glib_migration/src/nettest_bsd.c
===================================================================
--- branches/glib_migration/src/nettest_bsd.c	2006-04-17 23:38:26 UTC (rev 160)
+++ branches/glib_migration/src/nettest_bsd.c	2006-04-18 00:00:49 UTC (rev 161)
@@ -1008,7 +1008,7 @@
     for (i = 0; i < BSD_MAX_COUNTERS; i++) {
       loc_cnt[i] = my_data->stats.counter[i];
       if (test->debug) {
-        fprintf(test->where,"BSD_COUNTER%X = %#llx\n",i,loc_cnt[i]);
+        fprintf(test->where,"BSD_COUNTER%X = %#"PRIx64"\n",i,loc_cnt[i]);
       } 
     }
     if (GET_TEST_STATE == TEST_MEASURE) {
@@ -1053,7 +1053,7 @@
         break;
       }
       if (loc_cnt[i]) {
-        sprintf(value,"%#llx",my_data->stats.counter[i]);
+        sprintf(value,"%#"PRIx64,my_data->stats.counter[i]);
         sprintf(name,"cntr%1X_value",i);
         ap = xmlSetProp(stats,(xmlChar *)name,(xmlChar *)value);
         if (test->debug) {

Modified: branches/glib_migration/src/nettest_dns.c
===================================================================
--- branches/glib_migration/src/nettest_dns.c	2006-04-17 23:38:26 UTC (rev 160)
+++ branches/glib_migration/src/nettest_dns.c	2006-04-18 00:00:49 UTC (rev 161)
@@ -996,7 +996,7 @@
     for (i = 0; i < DNS_MAX_COUNTERS; i++) {
       loc_cnt[i] = my_data->stats.counter[i];
       if (test->debug) {
-        fprintf(test->where,"DNS_COUNTER%X = %#llx\n",i,loc_cnt[i]);
+        fprintf(test->where,"DNS_COUNTER%X = %#"PRIx64"\n",i,loc_cnt[i]);
       } 
     }
     if (GET_TEST_STATE == TEST_MEASURE) {
@@ -1040,7 +1040,7 @@
         break;
       }
       if (loc_cnt[i]) {
-        sprintf(value,"%#llx",my_data->stats.counter[i]);
+        sprintf(value,"%#"PRIx64,my_data->stats.counter[i]);
         sprintf(name,"cntr%1X_value",i);
         ap = xmlSetProp(stats,(xmlChar *)name,(xmlChar *)value);
         if (test->debug) {
@@ -1951,7 +1951,7 @@
       test_cntr[i] = strtod(value_str,NULL);
       if (test_cntr[i] == 0.0) {
         uint64_t x;
-        sscanf(value_str,"%llx",&x);
+        sscanf(value_str,"%"PRIx64,&x);
         test_cntr[i] = (double)x;
       }
     } else {
@@ -2076,7 +2076,7 @@
       sys_cntr[i] = strtod(value_str,NULL);
       if (sys_cntr[i] == 0.0) {
         uint64_t x;
-        sscanf(value_str,"%llx",&x);
+        sscanf(value_str,"%"PRIx64,&x);
         sys_cntr[i] = (double)x;
       }
     } else {

Modified: branches/glib_migration/src/nettest_vst.c
===================================================================
--- branches/glib_migration/src/nettest_vst.c	2006-04-17 23:38:26 UTC (rev 160)
+++ branches/glib_migration/src/nettest_vst.c	2006-04-18 00:00:49 UTC (rev 161)
@@ -1438,7 +1438,7 @@
     for (i = 0; i < VST_MAX_COUNTERS; i++) {
       loc_cnt[i] = my_data->stats.counter[i];
       if (test->debug) {
-        fprintf(test->where,"VST_COUNTER%X = %#llx\n",i,loc_cnt[i]);
+        fprintf(test->where,"VST_COUNTER%X = %#"PRIx64"\n",i,loc_cnt[i]);
       } 
     }
     if (GET_TEST_STATE == TEST_MEASURE) {
@@ -1483,7 +1483,7 @@
         break;
       }
       if (loc_cnt[i]) {
-        sprintf(value,"%#llx",my_data->stats.counter[i]);
+        sprintf(value,"%#"PRIx64,my_data->stats.counter[i]);
         sprintf(name,"cntr%1X_value",i);
         ap = xmlSetProp(stats,(xmlChar *)name,(xmlChar *)value);
         if (test->debug) {
@@ -2450,7 +2450,7 @@
       test_cntr[i] = strtod(value_str,NULL);
       if (test_cntr[i] == 0.0) {
         uint64_t x;
-        sscanf(value_str,"%llx",&x);
+        sscanf(value_str,"%"PRIx64,&x);
         test_cntr[i] = (double)x;
       }
     }
@@ -2574,7 +2574,7 @@
       sys_cntr[i] = strtod(value_str,NULL);
       if (sys_cntr[i] == 0.0) {
         uint64_t x;
-        sscanf(value_str,"%llx",&x);
+        sscanf(value_str,"%"PRIx64,&x);
         sys_cntr[i] = (double)x;
       }
     }