[netperf-dev] netperf2 commit notice r609 - in trunk: . doc/examples src

[raj at netperf.org]

Author: raj
Date: 2012-10-04 16:44:28 -0700 (Thu, 04 Oct 2012)
New Revision: 609

Modified:
   trunk/AUTHORS
   trunk/doc/examples/bloat.sh
   trunk/doc/examples/runemomniaggdemo.sh
   trunk/src/netlib.c
   trunk/src/nettest_omni.c
Log:
fix from David Ahern and some other bits and bobs

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2012-09-19 18:55:00 UTC (rev 608)
+++ trunk/AUTHORS	2012-10-04 23:44:28 UTC (rev 609)
@@ -281,3 +281,5 @@
 
 Dave Taht - changes for symbolic handling of TOS values
 
+David Ahern - fix for an incorrect pointer check
+

Modified: trunk/doc/examples/bloat.sh
===================================================================
--- trunk/doc/examples/bloat.sh	2012-09-19 18:55:00 UTC (rev 608)
+++ trunk/doc/examples/bloat.sh	2012-10-04 23:44:28 UTC (rev 609)
@@ -14,7 +14,7 @@
 
 # first, start the TCP_RR test
 RR_START=`date +%s`
-echo "Starting netperf TCP_RR at $RR_START"
+echo "Starting netperf TCP_RR at $RR_START" | tee bloat.log
 # a negative value for the demo interval (-D) will cause netperf to
 # make gettimeofday() calls after every transaction. this will result
 # in more accurate demo intervals once the STREAM test kicks-in, but a
@@ -28,17 +28,17 @@
 # now run the TCP_STREAM test
 
 STREAM_START=`date +%s`
-echo "Starting netperf TCP_STREAM test at $STREAM_START"
+echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log
 netperf -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out
 STREAM_STOP=`date +%s`
-echo "Netperf TCP_STREAM test stopped at $STREAM_STOP"
+echo "Netperf TCP_STREAM test stopped at $STREAM_STOP" | tee -a bloat.log
 
 # sleep another CHUNK seconds
 sleep $CHUNK
 
 pkill -ALRM netperf
 RR_STOP=`date +%s`
-echo "Netperf TCP_RR test stopped at $RR_STOP"
+echo "Netperf TCP_RR test stopped at $RR_STOP" | tee -a bloat.log
 
 RRDTOOL=`which rrdtool`
 if [ $? -ne 0 ]

Modified: trunk/doc/examples/runemomniaggdemo.sh
===================================================================
--- trunk/doc/examples/runemomniaggdemo.sh	2012-09-19 18:55:00 UTC (rev 608)
+++ trunk/doc/examples/runemomniaggdemo.sh	2012-10-04 23:44:28 UTC (rev 609)
@@ -1,6 +1,5 @@
 # this is a quick and dirty migration of runemomniagg2.sh to the 
 # --enable-demo mode of aggregate testing
-
 function kill_netperfs {
     pkill -ALRM netperf
 
@@ -77,7 +76,7 @@
 
 # the number of netperf instances we will run will be up to 2x the
 # number of CPUs
-MAX_INSTANCES=${1:=`expr $NUM_CPUS \* 2`}
+MAX_INSTANCES=`expr $NUM_CPUS \* 2`
 
 # allow the netperf binary to be used to be overridden 
 NETPERF=${NETPERF:="netperf"}

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2012-09-19 18:55:00 UTC (rev 608)
+++ trunk/src/netlib.c	2012-10-04 23:44:28 UTC (rev 609)
@@ -1537,7 +1537,7 @@
       first_link = temp_link;
     }
     temp_link->buffer_base = (char *)malloc(malloc_size);
-    if (temp_link == NULL) {
+    if (temp_link->buffer_base == NULL) {
       fprintf(where,
 	      "malloc(%d) failed!\n",
 	      malloc_size);
@@ -3152,7 +3152,7 @@
   hints.ai_family = family;
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = IPPROTO_TCP;
-  hints.ai_flags = AI_CANONNAME|AI_ADDRCONFIG;
+  hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG;
   count = 0;
   do {
     error = getaddrinfo((char *)hostname,

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2012-09-19 18:55:00 UTC (rev 608)
+++ trunk/src/nettest_omni.c	2012-10-04 23:44:28 UTC (rev 609)
@@ -5465,8 +5465,6 @@
       }
       else if (ret == -1) {
 	/* test timed-out */
-	fprintf(where,"YO! TIMESUP!\n");
-	fflush(where);
 	times_up = 1;
 	timed_out = 1;
 	break;