From 2320ac3349789551e9c7500dba03e04b9ac02f41 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 10 Jun 2022 12:32:42 +1000 Subject: Don't abbreviate ip(8) arguments in examples and tests ip(8)'s ability to take abbreviated arguments (e.g. "li sh" instead of "link show") is very handy when using it interactively, but it doesn't make for very readable scripts and examples when shown that way. Signed-off-by: David Gibson --- test/perf/passt_tcp | 6 +++--- test/perf/passt_udp | 6 +++--- test/perf/pasta_tcp | 6 +++--- test/perf/pasta_udp | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'test/perf') diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp index f13fdfc..5f017db 100644 --- a/test/perf/passt_tcp +++ b/test/perf/passt_tcp @@ -35,9 +35,9 @@ ns sysctl -w net.ipv4.tcp_rmem="4096 524288 134217728" ns sysctl -w net.ipv4.tcp_wmem="4096 524288 134217728" ns sysctl -w net.ipv4.tcp_timestamps=0 -gout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' +gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' hout FREQ_PROCFS (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 hout FREQ_CPUFREQ (echo "scale=1"; printf '( %i + 10^5 / 2 ) / 10^6\n' $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq) ) | bc -l diff --git a/test/perf/passt_udp b/test/perf/passt_udp index cc5711b..0515f00 100644 --- a/test/perf/passt_udp +++ b/test/perf/passt_udp @@ -28,9 +28,9 @@ guest /sbin/sysctl -w net.core.wmem_max=16777216 guest /sbin/sysctl -w net.core.rmem_default=16777216 guest /sbin/sysctl -w net.core.wmem_default=16777216 -gout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' +gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' hout FREQ_PROCFS (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 hout FREQ_CPUFREQ (echo "scale=1"; printf '( %i + 10^5 / 2 ) / 10^6\n' $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq) ) | bc -l diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp index a330bb4..5ef0f69 100644 --- a/test/perf/pasta_tcp +++ b/test/perf/pasta_tcp @@ -170,9 +170,9 @@ te test pasta: throughput and latency (connections via tap) -nsout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -nsout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -nsout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' +nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' set THREADS 1 set STREAMS 2 set OPTS -Z -P __STREAMS__ -i1 -t30 -O5 --pacing-timer 100000 diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp index 8b68b78..114a9bc 100644 --- a/test/perf/pasta_udp +++ b/test/perf/pasta_udp @@ -129,9 +129,9 @@ te test pasta: throughput and latency (traffic via tap) -nsout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -nsout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -nsout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' +nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' info Throughput in Gbps, latency in µs, one thread at __FREQ__ GHz, __STREAMS__ streams report pasta tap_udp 1 __FREQ__ -- cgit v1.2.3