From 44c7d64fb3b212ba97a85a94a975b7c2b0756386 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Fri, 22 Nov 2013 09:21:21 +0100 Subject: [PATCH] netperf: remove packet/s from statistics Mixing MB/s and packet/s in one graph is a bit confusing - so remove it from the graph, but is still in the log output. --- ports/run/netperf.inc | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/ports/run/netperf.inc b/ports/run/netperf.inc index ba8e2f5ce..e9216713d 100644 --- a/ports/run/netperf.inc +++ b/ports/run/netperf.inc @@ -255,19 +255,14 @@ foreach netperf_test $netperf_tests { puts "[format %8.0f $packets_second] packets/s\n" # format output parseable for post proccessing scripts - foreach i {0 1} { - puts -nonewline "! PERF: $netperf_test" - if {$use_nic_bridge} { puts -nonewline "_bridge" } - if {$use_usb_driver} { - if {![string compare $use_usb_11 "yes"]} { puts -nonewline "_uhci" } - if {![string compare $use_usb_20 "yes"]} { puts -nonewline "_ohci" } - if {![string compare $use_usb_30 "yes"]} { puts -nonewline "_xhci" } - } - if {$i == 0} { puts -nonewline " [lindex $throughput 1] MBit/s ok" } - if {$i == 1} { puts -nonewline "_packet_$packet_size [format %6.0f $packets_second] packets/s ok" } - if {$i > 1} { puts -nonewline " 0 unknown err" } - puts "" + puts -nonewline "! PERF: $netperf_test" + if {$use_nic_bridge} { puts -nonewline "_bridge" } + if {$use_usb_driver} { + if {![string compare $use_usb_11 "yes"]} { puts -nonewline "_uhci" } + if {![string compare $use_usb_20 "yes"]} { puts -nonewline "_ohci" } + if {![string compare $use_usb_30 "yes"]} { puts -nonewline "_xhci" } } + puts " [lindex $throughput 1] MBit/s ok" }