Re: [PATCH net-next V2 1/2] pktgen: Specify num packets per thread

[Jesper Dangaard Brouer]

On Thu, 15 Jun 2017 19:07:21 +0300
Tariq Toukan  wrote:

> Use -n , to specify the number of packets every
> thread sends.
> Zero means indefinitely.
> 
> Signed-off-by: Tariq Toukan 
> Cc: Jesper Dangaard Brouer 

Acked-by: Jesper Dangaard Brouer 

-- 
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Principal Kernel Engineer at Red Hat
  LinkedIn: http://www.linkedin.com/in/brouer

[PATCH net-next V2 1/2] pktgen: Specify num packets per thread

[Tariq Toukan]

Use -n , to specify the number of packets every
thread sends.
Zero means indefinitely.

Signed-off-by: Tariq Toukan 
Cc: Jesper Dangaard Brouer 
---
 samples/pktgen/README.rst  | 1 +
 samples/pktgen/parameters.sh   | 7 ++-
 samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 2 +-
 samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh| 2 +-
 samples/pktgen/pktgen_sample01_simple.sh   | 2 +-
 samples/pktgen/pktgen_sample02_multiqueue.sh   | 3 ++-
 samples/pktgen/pktgen_sample03_burst_single_flow.sh| 2 +-
 samples/pktgen/pktgen_sample04_many_flows.sh   | 2 +-
 samples/pktgen/pktgen_sample05_flow_per_thread.sh  | 2 +-
 9 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/samples/pktgen/README.rst b/samples/pktgen/README.rst
index 8365c4e5c513..c018d67da1a1 100644
--- a/samples/pktgen/README.rst
+++ b/samples/pktgen/README.rst
@@ -22,6 +22,7 @@ across the sample scripts.  Usage example is printed on 
errors::
   -m : ($DST_MAC)   destination MAC-addr
   -t : ($THREADS)   threads to start
   -c : ($SKB_CLONE) SKB clones send before alloc new SKB
+  -n : ($COUNT) num messages to send per thread, 0 means indefinitely
   -b : ($BURST) HW level bursting of SKBs
   -v : ($VERBOSE)   verbose
   -x : ($DEBUG) debug
diff --git a/samples/pktgen/parameters.sh b/samples/pktgen/parameters.sh
index f70ea7dd5660..036147594a20 100644
--- a/samples/pktgen/parameters.sh
+++ b/samples/pktgen/parameters.sh
@@ -11,6 +11,7 @@ function usage() {
 echo "  -m : (\$DST_MAC)   destination MAC-addr"
 echo "  -t : (\$THREADS)   threads to start"
 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 +21,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:t:c:n:b:vxh6" option; do
 case $option in
 i) # interface
   export DEV=$OPTARG
@@ -48,6 +49,10 @@ while getopts "s:i:d:m:t:c:b:vxh6" option; do
  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"
diff --git a/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh 
b/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
index f3e1bedfd77f..d2694a12de61 100755
--- a/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
+++ b/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
@@ -39,10 +39,10 @@ if [ -z "$DEST_IP" ]; then
 fi
 [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff"
 [ -z "$BURST" ] && BURST=1024
+[ -z "$COUNT" ] && COUNT="1000" # Zero means indefinitely
 
 # Base Config
 DELAY="0"# Zero means max speed
-COUNT="1000" # Zero means indefinitely
 
 # General cleanup everything since last run
 pg_ctrl "reset"
diff --git a/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh 
b/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
index cc102e923241..43604c2db726 100755
--- a/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
+++ b/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
@@ -22,10 +22,10 @@ fi
 if [[ -n "$BURST" ]]; then
 err 1 "Bursting not supported for this mode"
 fi
+[ -z "$COUNT" ] && COUNT="1000" # Zero means indefinitely
 
 # Base Config
 DELAY="0"# Zero means max speed
-COUNT="1000" # Zero means indefinitely
 
 # General cleanup everything since last run
 pg_ctrl "reset"
diff --git a/samples/pktgen/pktgen_sample01_simple.sh 
b/samples/pktgen/pktgen_sample01_simple.sh
index 29ef4ba50796..35b7fe34bda2 100755
--- a/samples/pktgen/pktgen_sample01_simple.sh
+++ b/samples/pktgen/pktgen_sample01_simple.sh
@@ -20,10 +20,10 @@ fi
 [ -z "$CLONE_SKB" ] && CLONE_SKB="0"
 # Example enforce param "-m" for dst_mac
 [ -z "$DST_MAC" ] && usage && err 2 "Must specify -m dst_mac"
+[ -z "$COUNT" ]   && COUNT="10" # Zero means indefinitely
 
 # Base Config
 DELAY="0"# Zero means max speed
-COUNT="10"   # Zero means indefinitely
 
 # Flow variation random source port between min and max
 UDP_MIN=9
diff --git a/samples/pktgen/pktgen_sample02_multiqueue.sh 
b/samples/pktgen/pktgen_sample02_multiqueue.sh
index c88a161d3e6f..164194d1c79b 100755
--- a/samples/pktgen/pktgen_sample02_multiqueue.sh
+++ b/samples/pktgen/pktgen_sample02_multiqueue.sh
@@ -13,9 +13,10 @@ root_check_run_with_sudo "$@"
 # Required param: -i dev in $DEV
 source ${basedir}/parameters.sh
 
+[ -z "$COUNT" ] && COUNT="10" # Zero means indefinitely
+
 # Base Config
 DELAY="0"# Zero means max