renegade-project/linux-snapdragon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samples: pktgen: fix to print when terminated normally

Browse Source 
[ Upstream commit c0e9422c4e6ca9abd4bd6e1598400c7231eb600b ]

Currently, most pktgen samples print the execution result when the
program is terminated normally. However, sample03 doesn't work
appropriately.

This is results of samples:

    # DEV=eth0 DEST_IP=10.1.0.1 DST_MAC=00:11:22:33:44:55 ./pktgen_sample04_many_flows.sh -n 1
    Running... ctrl^C to stop
    Device: eth0@0
    Result: OK: 19(c5+d13) usec, 1 (60byte,0frags)
    51762pps 24Mb/sec (24845760bps) errors: 0

    # DEV=eth0 DEST_IP=10.1.0.1 DST_MAC=00:11:22:33:44:55 ./pktgen_sample03_burst_single_flow.sh -n 1
    Running... ctrl^C to stop

The reason why it doesn't print the execution result when the program is
terminated usually is that sample03 doesn't call the function which
prints the result, unlike other samples.

So, this commit solves this issue by calling the function before
termination. Also, this commit changes control_c function to
print_result to maintain consistency with other samples.

Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Juhee Kang 2021-08-25 19:57:15 +09:00 committed by Greg Kroah-Hartman
parent fe944e6472
commit 706060c70a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/pktgen/pktgen_sample03_burst_single_flow.sh
View File

@ -85,7 +85,7 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do
done done
# Run if user hits control-c # Run if user hits control-c
function control_c() { function print_result() {
# Print results # Print results
for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do
dev=${DEV}@${thread} dev=${DEV}@${thread}
@ -94,11 +94,13 @@ function control_c() {
done done
} }
# trap keyboard interrupt (Ctrl-C) # trap keyboard interrupt (Ctrl-C)
trap control_c SIGINT trap true SIGINT
if [ -z "$APPEND" ]; then if [ -z "$APPEND" ]; then
echo "Running... ctrl^C to stop" >&2 echo "Running... ctrl^C to stop" >&2
pg_ctrl "start" pg_ctrl "start"
print_result
else else
echo "Append mode: config done. Do more or use 'pg_ctrl start' to run" echo "Append mode: config done. Do more or use 'pg_ctrl start' to run"
fi fi