[netperf-dev] netperf2 commit notice r575 - trunk/doc/examples

[raj at netperf.org]

Author: raj
Date: 2012-05-11 11:39:03 -0700 (Fri, 11 May 2012)
New Revision: 575

Modified:
   trunk/doc/examples/find_max_burst.sh
   trunk/doc/examples/runemomniaggdemo.sh
Log:
script tweaks

Modified: trunk/doc/examples/find_max_burst.sh
===================================================================
--- trunk/doc/examples/find_max_burst.sh	2012-05-11 18:22:43 UTC (rev 574)
+++ trunk/doc/examples/find_max_burst.sh	2012-05-11 18:39:03 UTC (rev 575)
@@ -6,8 +6,9 @@
 LAST_TPS=0
 BURST=1
 LAST_BURST=0
+NETPERF=${NETPERF:="netperf"}
 
-TMP_TPS=`netperf -t TCP_RR -P 0 -H $1 -- -b $BURST -D -o throughput`
+TMP_TPS=`$NETPERF -t TCP_RR -P 0 -H $1 -- -b $BURST -D -o throughput`
 
 if [ $? -ne 0 ]
 then
@@ -23,7 +24,7 @@
     BURST=`expr $BURST \* 2`
     LAST_TPS=$CUR_TPS
 
-    TMP_TPS=`netperf -t TCP_RR -P 0 -H $1 -- -b $BURST -D -o throughput`
+    TMP_TPS=`$NETPERF -t TCP_RR -P 0 -H $1 -- -b $BURST -D -o throughput`
 
     if [ $? -ne 0 ]
     then

Modified: trunk/doc/examples/runemomniaggdemo.sh
===================================================================
--- trunk/doc/examples/runemomniaggdemo.sh	2012-05-11 18:22:43 UTC (rev 574)
+++ trunk/doc/examples/runemomniaggdemo.sh	2012-05-11 18:39:03 UTC (rev 575)
@@ -79,7 +79,8 @@
 # number of CPUs
 MAX_INSTANCES=`expr $NUM_CPUS \* 2`
 
-NETPERF=${NETPERF:="./netperf"}
+# allow the netperf binary to be used to be overridden 
+NETPERF=${NETPERF:="netperf"}
 
 if [ $NUM_REMOTE_HOSTS -lt 2 ]
 then
@@ -105,9 +106,15 @@
 
 # TCP_RR for TPC/PPS using single-byte transactions and TCP_NODELAY
 if [ $DO_RRAGG -eq 1 ]; then
+    BURST=`./find_max_burst.sh ${REMOTE_HOSTS[0]}`
+    if [ $BURST -eq -1 ]; then
+        # use a value that find_max_burst will not have picked
+        BURST=9
+        echo "find_max_burst.sh returned -1 so picking a burst of $BURST"
+    fi
     TEST="tps"
     TESTLOG="netperf_tps.log"
-    NETPERF_CMD="-D 1 -c -C -f x -P 0 -t omni $LENGTH -v 2 -- -r 1 -b 8 -D -u $MY_UUID $OUTPUT"
+    NETPERF_CMD="-D 1 -c -C -f x -P 0 -t omni $LENGTH -v 2 -- -r 1 -b $BURST -D -u $MY_UUID $OUTPUT"
     run_cmd
 fi