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

[raj at netperf.org]

Author: raj
Date: 2012-11-28 14:03:09 -0800 (Wed, 28 Nov 2012)
New Revision: 615

Modified:
   trunk/src/netlib.c
   trunk/src/nettest_omni.c
Log:
a few more tweaks to the udp_rr restart kludge

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2012-11-27 00:35:38 UTC (rev 614)
+++ trunk/src/netlib.c	2012-11-28 22:03:09 UTC (rev 615)
@@ -3044,6 +3044,7 @@
 set_sock_buffer (SOCKET sd, enum sock_buffer which, int requested_size, int *effective_sizep)
 {
 #ifdef SO_SNDBUF
+
   int optname = (which == SEND_BUFFER) ? SO_SNDBUF : SO_RCVBUF;
 
   /* seems that under Windows, setting a value of zero is how one
@@ -3055,9 +3056,10 @@
   if (requested_size >= 0) {
     if (setsockopt(sd, SOL_SOCKET, optname,
 		   (char *)&requested_size, sizeof(int)) < 0) {
-      fprintf(where, "netperf: set_sock_buffer: %s option: errno %d\n",
+      fprintf(where, "netperf: set_sock_buffer: %s option: errno %d (%s)\n",
 	      (which == SEND_BUFFER) ? "SO_SNDBUF" : "SO_RCVBUF",
-	      errno);
+	      errno,
+	      strerror(errno));
       fflush(where);
       exit(1);
     }

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2012-11-27 00:35:38 UTC (rev 614)
+++ trunk/src/nettest_omni.c	2012-11-28 22:03:09 UTC (rev 615)
@@ -4360,7 +4360,10 @@
 	    HIST_purge(time_hist);
 	  }
 #ifdef WANT_DEMO
-	  demo_reset();
+	  /* "start over" on a demo interval. we will forget about
+	  everything that happened in the demo interval up to the
+	  timeout and begin fresh. */
+	  demo_reset(); 
 #endif /* WANT_DEMO */
 
 	  continue;