X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=dpdk-tests%2Fdpdk_scripts%2Frun_l2fwd.sh;h=80ed14a3308b2e19f6125fea94ce5b2d0b60d3cc;hb=refs%2Fchanges%2F98%2F5098%2F22;hp=6df33a1317e7f706fbc79282611164e2873b01fb;hpb=b633f4ebf7878ae968e27b71da69b6cde0265904;p=csit.git

diff --git a/dpdk-tests/dpdk_scripts/run_l2fwd.sh b/dpdk-tests/dpdk_scripts/run_l2fwd.sh
index 6df33a1317..80ed14a330 100755
--- a/dpdk-tests/dpdk_scripts/run_l2fwd.sh
+++ b/dpdk-tests/dpdk_scripts/run_l2fwd.sh
@@ -1,48 +1,66 @@
 #!/bin/bash
 
+set -x
+
+# Setting variables
+DPDK_VERSION=dpdk-17.02
 ROOTDIR=/tmp/openvpp-testing
+TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
 
-TESTPMD_LOG=/tmp/testpmd.log
-TESTPMD_PID=/tmp/testpmd.pid
-
-cpu_coremask=$1
+# Setting command line arguments
+cpu_corelist=$1
 nb_cores=$2
 queue_nums=$3
 jumbo_frames=$4
 
-#kill the testpmd
-sudo pkill testpmd
-sudo rm -f ${TESTPMD_PID}
+# Try to kill the testpmd
+sudo pgrep testpmd
+if [ $? -eq "0" ]; then
+    success=false
+    sudo pkill testpmd
+    echo "RC = $?"
+    for attempt in {1..5}; do
+        echo "Checking if testpmd is still alive, attempt nr ${attempt}"
+        sudo pgrep testpmd
+        if [ $? -eq "1" ]; then
+            echo "testpmd is dead"
+            success=true
+            break
+        fi
+        echo "testpmd is still alive, waiting 1 second"
+        sleep 1
+    done
+    if [ "$success" = false ]; then
+        echo "The command sudo pkill testpmd failed"
+        sudo pkill -9 testpmd
+        echo "RC = $?"
+        exit 1
+    fi
+else
+    echo "testpmd is not running"
+fi
 
-sleep 2
+# Remove hugepages
+sudo rm -f /dev/hugepages/*
 
-pid=`pgrep testpmd`
-if [ "$pid" != "" ]; then
-    echo "terminate the testpmd failed!"
-    exit 1
-fi
+sleep 2
 
-#run the testpmd
-cd ${ROOTDIR}
+cd ${ROOTDIR}/${DPDK_VERSION}/
+rm -f ${TESTPMDLOG}
 if [ "$jumbo_frames" = "yes" ]; then
-#sudo sh -c "screen -dmS DPDK-test ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-#    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-#    --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=${queue_nums} \
-#    --txq=${queue_nums} --auto-start"
-tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-    --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=${queue_nums} \
-    --txq=${queue_nums} --auto-start > ${TESTPMD_LOG} 2>&1 &
-echo $! > ${TESTPMD_PID}
+    sudo sh -c "screen -dmSL DPDK-test ./x86_64-native-linuxapp-gcc/app/testpmd -l ${cpu_corelist} \
+        -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
+        --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=${queue_nums} \
+        --txq=${queue_nums} --auto-start"
+    sleep 10
+    cat ${TESTPMDLOG}
 else
-#sudo sh -c "screen -dmS DPDK-test ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-#    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-#    --forward-mode=io --rxq=${queue_nums} --txq=${queue_nums} --auto-start"
-tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-    --forward-mode=io --rxq=${queue_nums} --txq=${queue_nums} --auto-start > ${TESTPMD_LOG} 2>&1 &
-echo $! > ${TESTPMD_PID}
+    sudo sh -c "screen -dmSL DPDK-test ./x86_64-native-linuxapp-gcc/app/testpmd -l ${cpu_corelist} \
+        -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
+        --forward-mode=io --rxq=${queue_nums} --txq=${queue_nums} --auto-start"
+    sleep 10
+    cat ${TESTPMDLOG}
 fi
 
 cd ${PWDDIR}