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

[raj at netperf.org]

Author: raj
Date: 2006-04-13 16:38:19 -0700 (Thu, 13 Apr 2006)
New Revision: 155

Modified:
   branches/glib_migration/src/netsysstats_common.c
   branches/glib_migration/src/netsysstats_windows.c
Log:
perhaps this is working CPU util for Windows?

Modified: branches/glib_migration/src/netsysstats_common.c
===================================================================
--- branches/glib_migration/src/netsysstats_common.c	2006-04-13 00:30:21 UTC (rev 154)
+++ branches/glib_migration/src/netsysstats_common.c	2006-04-13 23:38:19 UTC (rev 155)
@@ -311,10 +311,10 @@
 
   NETPERF_DEBUG_ENTRY(test->debug,test->where);
 
-  sprintf(value_str,"%#llx",value);
+  sprintf(value_str,"%#"PRIx64,value);
   ap = xmlSetProp(stats,(xmlChar *)name,(xmlChar *)value_str);
   if (test->debug) {
-    fprintf(test->where,"%s=%s\n",name,value_str);
+    fprintf(test->where,"%s=%s from %"PRIx64"\n",name,value_str,value);
     fflush(test->where);
   }
   return(ap);

Modified: branches/glib_migration/src/netsysstats_windows.c
===================================================================
--- branches/glib_migration/src/netsysstats_windows.c	2006-04-13 00:30:21 UTC (rev 154)
+++ branches/glib_migration/src/netsysstats_windows.c	2006-04-13 23:38:19 UTC (rev 155)
@@ -221,7 +221,7 @@
               i, res[i].calibrate);
     }
 #else
-    res[i].calibrate = (uint64_t)(elapsed * (double)psd->TickHz.QuadPart);
+    res[i].calibrate = (uint64_t)(elapsed * 10000000.0);
 #endif
     res[i].user      = psd->counters[i].UserTime.QuadPart;
     res[i].kernel    = psd->counters[i].KernelTime.QuadPart;