Merge tag 'mac80211-for-davem-2017-07-07' of git://git.kernel.org/pub/scm/linux/kerne...

[mirror_ubuntu-artful-kernel.git] / samples / pktgen / parameters.sh

diff --git a/samples/pktgen/parameters.sh b/samples/pktgen/parameters.sh
index f70ea7dd5660de30daed20364e5f4e75bf6ea92a..3a6244d5f47a0bbcf21fb04169efbce735aa4385 100644 (file)
--- a/samples/pktgen/parameters.sh
+++ b/samples/pktgen/parameters.sh
@@ -10,7 +10,9 @@ function usage() {
     echo "  -d : (\$DEST_IP)   destination IP"
     echo "  -m : (\$DST_MAC)   destination MAC-addr"
     echo "  -t : (\$THREADS)   threads to start"
+    echo "  -f : (\$F_THREAD)  index of first thread (zero indexed CPU number)"
     echo "  -c : (\$SKB_CLONE) SKB clones send before alloc new SKB"
+    echo "  -n : (\$COUNT)     num messages to send per thread, 0 means indefinitely"
     echo "  -b : (\$BURST)     HW level bursting of SKBs"
     echo "  -v : (\$VERBOSE)   verbose"
     echo "  -x : (\$DEBUG)     debug"
@@ -20,7 +22,7 @@ function usage() {
 
 ##  --- Parse command line arguments / parameters ---
 ## echo "Commandline options:"
-while getopts "s:i:d:m:t:c:b:vxh6" option; do
+while getopts "s:i:d:m:f:t:c:n:b:vxh6" option; do
     case $option in
         i) # interface
           export DEV=$OPTARG
@@ -38,16 +40,22 @@ while getopts "s:i:d:m:t:c:b:vxh6" option; do
           export DST_MAC=$OPTARG
          info "Destination MAC set to: DST_MAC=$DST_MAC"
           ;;
+        f)
+         export F_THREAD=$OPTARG
+         info "Index of first thread (zero indexed CPU number): $F_THREAD"
+          ;;
         t)
          export THREADS=$OPTARG
-          export CPU_THREADS=$OPTARG
-         let "CPU_THREADS -= 1"
-         info "Number of threads to start: $THREADS (0 to $CPU_THREADS)"
+         info "Number of threads to start: $THREADS"
           ;;
         c)
          export CLONE_SKB=$OPTARG
          info "CLONE_SKB=$CLONE_SKB"
           ;;
+        n)
+         export COUNT=$OPTARG
+         info "COUNT=$COUNT"
+          ;;
         b)
          export BURST=$OPTARG
          info "SKB bursting: BURST=$BURST"
@@ -77,12 +85,17 @@ if [ -z "$PKT_SIZE" ]; then
     info "Default packet size set to: set to: $PKT_SIZE bytes"
 fi
 
+if [ -z "$F_THREAD" ]; then
+    # First thread (F_THREAD) reference the zero indexed CPU number
+    export F_THREAD=0
+fi
+
 if [ -z "$THREADS" ]; then
-    # Zero CPU threads means one thread, because CPU numbers are zero indexed
-    export CPU_THREADS=0
     export THREADS=1
 fi
 
+export L_THREAD=$(( THREADS + F_THREAD - 1 ))
+
 if [ -z "$DEV" ]; then
     usage
     err 2 "Please specify output device"