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

[raj at netperf.org]

Author: raj
Date: 2012-11-26 15:17:51 -0800 (Mon, 26 Nov 2012)
New Revision: 613

Modified:
   trunk/src/netlib.c
   trunk/src/netlib.h
   trunk/src/nettest_omni.c
Log:
do something a bit more sophisticated with interim results in the event of a receive timout on a socket in the UDP_RR test

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2012-11-26 22:59:37 UTC (rev 612)
+++ trunk/src/netlib.c	2012-11-26 23:17:51 UTC (rev 613)
@@ -3940,6 +3940,16 @@
   HIST_timestamp(demo_one_ptr);
 }
 
+void demo_reset() {
+  if (debug) {
+    fprintf(where,
+	    "Resetting interim results\n");
+    fflush(where);
+  }
+  units_this_tick = 0;
+  demo_first_timestamp();
+}
+
 /* for a _STREAM test, "a" should be lss_size and "b" should be
    rsr_size. for a _MAERTS test, "a" should be lsr_size and "b" should
    be rss_size. raj 2005-04-06 */

Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h	2012-11-26 22:59:37 UTC (rev 612)
+++ trunk/src/netlib.h	2012-11-26 23:17:51 UTC (rev 613)
@@ -602,6 +602,7 @@
 extern void     HIST_get_stats();
 extern void     find_security_info(int *enabled, int *type, char **specific);
 extern void     demo_first_timestamp();
+extern void     demo_reset();
 extern void     demo_stream_setup(uint32_t a, uint32_t b);
 #ifndef WIN32
 

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2012-11-26 22:59:37 UTC (rev 612)
+++ trunk/src/nettest_omni.c	2012-11-26 23:17:51 UTC (rev 613)
@@ -4355,6 +4355,10 @@
 	    requests_outstanding = 0;
 	    request_cwnd = request_cwnd_initial;
 	  }
+#ifdef WANT_DEMO
+	  demo_reset();
+#endif /* WANT_DEMO */
+
 	  continue;
 	}
 	else {