[netperf-dev] netperf2 commit notice r461 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2011-07-27 14:38:19 -0700 (Wed, 27 Jul 2011)
New Revision: 461

Modified:
   trunk/src/netlib.h
   trunk/src/nettest_omni.c
Log:
more pickiness in the Windows wdk compiler what a grouch

Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h	2011-07-27 19:49:20 UTC (rev 460)
+++ trunk/src/netlib.h	2011-07-27 21:38:19 UTC (rev 461)
@@ -560,7 +560,8 @@
 extern void     find_interface_ids(char *interface_name, int *vendor, int *device, int *sub_vend, int *sub_dev);
 extern void     find_driver_info(char *ifname, char *driver, char *version, char *firmware, char *bus, int len);
 extern void     find_system_info(char **system_model, char **cpu_model, int *cpu_frequency);
-
+extern int      HIST_get_percentile();
+extern void     HIST_get_stats();
 #ifndef WIN32
 
 /* WIN32 requires that at least one of the file sets to select be

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-07-27 19:49:20 UTC (rev 460)
+++ trunk/src/nettest_omni.c	2011-07-27 21:38:19 UTC (rev 461)
@@ -929,8 +929,8 @@
     myport_init = 1;
   }
     
- newport:
-    /* pick a new port number */
+  /* newport: */
+  /* pick a new port number */
   myport++;
     
   /* check to see if we are using the port number on which the
@@ -5658,7 +5658,8 @@
 	remote_bytes_received = (uint64_t)omni_result->bytes_received_hi << 32;
 	remote_bytes_received += omni_result->bytes_received_lo;
 	remote_receive_calls = omni_result->recv_calls;
-	remote_bytes_xferd = remote_bytes_received + remote_bytes_sent;
+	remote_bytes_xferd = (double) remote_bytes_received +
+	                              remote_bytes_sent;
 	if (omni_result->recv_calls > 0)
 	  remote_bytes_per_recv = (double) remote_bytes_received /
 	    (double) omni_result->recv_calls;
@@ -5700,7 +5701,7 @@
       /* when we are sending, in a no_control test, we have to
 	 ass-u-me that everything we sent was received, otherwise, we
 	 will report a transfer rate of zero. */
-      remote_bytes_xferd = bytes_sent;
+      remote_bytes_xferd = (double) bytes_sent;
     }
 
     /* so, what was the end result? */
@@ -5715,7 +5716,7 @@
     else
       bytes_per_recv = 0.0;
     
-    bytes_xferd  = bytes_sent + bytes_received;
+    bytes_xferd  = (double) bytes_sent + bytes_received;
 
     /* if the output format is 'x' we know the test was
        request/response.  if the libfmt is something else, it could be
@@ -5859,10 +5860,10 @@
   if ('x' == libfmt) {
     libfmt = 'm';
   }
-  local_send_thruput = calc_thruput(bytes_sent);
-  local_recv_thruput = calc_thruput(bytes_received);
-  remote_send_thruput = calc_thruput(remote_bytes_sent);
-  remote_recv_thruput = calc_thruput(remote_bytes_received);
+  local_send_thruput = calc_thruput((double)bytes_sent);
+  local_recv_thruput = calc_thruput((double)bytes_received);
+  remote_send_thruput = calc_thruput((double)remote_bytes_sent);
+  remote_recv_thruput = calc_thruput((double)remote_bytes_received);
 
   libfmt = tmpfmt;
 
@@ -6608,15 +6609,15 @@
 
   /* send the results to the sender  */
   
-  omni_results->send_calls      = local_send_calls;
+  omni_results->send_calls      = (uint32_t) local_send_calls;
   omni_results->bytes_received_lo = bytes_received & 0x00000000FFFFFFFFULL;
   omni_results->bytes_received_hi = (bytes_received & 0xFFFFFFFF00000000ULL) >> 32;
   omni_results->recv_buf_size   = lsr_size_end;
-  omni_results->recv_calls      = local_receive_calls;
+  omni_results->recv_calls      = (uint32_t) local_receive_calls;
   omni_results->bytes_sent_lo   = bytes_sent & 0x00000000FFFFFFFFULL;
   omni_results->bytes_sent_hi   = (bytes_sent & 0xFFFFFFFF00000000ULL) >> 32;
   omni_results->send_buf_size   = lss_size_end;
-  omni_results->trans_received	= trans_completed;
+  omni_results->trans_received	= (uint32_t) trans_completed;
   omni_results->elapsed_time	= elapsed_time;
   omni_results->cpu_method      = cpu_method;
   omni_results->num_cpus        = lib_num_loc_cpus;