From 56bf85096cc89f91d28671b5d93b4172240263bc Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 27 Jul 2016 15:09:11 +0000 Subject: Cleanup patches, category benchmarks Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight --- benchmarks/netperf/files/patch-arr_script | 12 ---- benchmarks/netperf/files/patch-bloat.sh | 34 ---------- benchmarks/netperf/files/patch-configure | 8 +-- .../netperf/files/patch-doc_examples_arr__script | 12 ++++ .../netperf/files/patch-doc_examples_bloat.sh | 34 ++++++++++ .../files/patch-doc_examples_packet__byte__script | 11 ++++ .../netperf/files/patch-doc_examples_runemomni.sh | 74 ++++++++++++++++++++++ .../files/patch-doc_examples_runemomniagg2.sh | 69 ++++++++++++++++++++ .../files/patch-doc_examples_runemomniaggdemo.sh | 11 ++++ .../files/patch-doc_examples_sctp__stream__script | 11 ++++ .../files/patch-doc_examples_snapshot__script | 11 ++++ .../files/patch-doc_examples_tcp__range__script | 11 ++++ .../files/patch-doc_examples_tcp__rr__script | 11 ++++ .../files/patch-doc_examples_tcp__stream__script | 11 ++++ .../files/patch-doc_examples_udp__rr__script | 11 ++++ .../files/patch-doc_examples_udp__stream__script | 11 ++++ benchmarks/netperf/files/patch-doc_netperf.man | 12 ++++ benchmarks/netperf/files/patch-dscp.c | 10 --- benchmarks/netperf/files/patch-netcpu_sysctl.c | 11 ---- benchmarks/netperf/files/patch-netperf.man | 12 ---- benchmarks/netperf/files/patch-nettest_unix.c | 10 --- benchmarks/netperf/files/patch-packet_byte_script | 11 ---- benchmarks/netperf/files/patch-runemomni.sh | 74 ---------------------- benchmarks/netperf/files/patch-runemomniagg2.sh | 69 -------------------- benchmarks/netperf/files/patch-runemomniaggdemo.sh | 11 ---- benchmarks/netperf/files/patch-sctp_stream_script | 11 ---- benchmarks/netperf/files/patch-snapshot_script | 11 ---- benchmarks/netperf/files/patch-src_dscp.c | 10 +++ .../netperf/files/patch-src_netcpu__sysctl.c | 11 ++++ benchmarks/netperf/files/patch-src_nettest__unix.c | 10 +++ benchmarks/netperf/files/patch-tcp_range_script | 11 ---- benchmarks/netperf/files/patch-tcp_rr_script | 13 ---- benchmarks/netperf/files/patch-tcp_stream_script | 13 ---- benchmarks/netperf/files/patch-udp_rr_script | 13 ---- benchmarks/netperf/files/patch-udp_stream_script | 13 ---- 35 files changed, 335 insertions(+), 343 deletions(-) delete mode 100644 benchmarks/netperf/files/patch-arr_script delete mode 100644 benchmarks/netperf/files/patch-bloat.sh create mode 100644 benchmarks/netperf/files/patch-doc_examples_arr__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_bloat.sh create mode 100644 benchmarks/netperf/files/patch-doc_examples_packet__byte__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_runemomni.sh create mode 100644 benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh create mode 100644 benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh create mode 100644 benchmarks/netperf/files/patch-doc_examples_sctp__stream__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_snapshot__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_tcp__range__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_tcp__rr__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_tcp__stream__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_udp__rr__script create mode 100644 benchmarks/netperf/files/patch-doc_examples_udp__stream__script create mode 100644 benchmarks/netperf/files/patch-doc_netperf.man delete mode 100644 benchmarks/netperf/files/patch-dscp.c delete mode 100644 benchmarks/netperf/files/patch-netcpu_sysctl.c delete mode 100644 benchmarks/netperf/files/patch-netperf.man delete mode 100644 benchmarks/netperf/files/patch-nettest_unix.c delete mode 100644 benchmarks/netperf/files/patch-packet_byte_script delete mode 100644 benchmarks/netperf/files/patch-runemomni.sh delete mode 100644 benchmarks/netperf/files/patch-runemomniagg2.sh delete mode 100644 benchmarks/netperf/files/patch-runemomniaggdemo.sh delete mode 100644 benchmarks/netperf/files/patch-sctp_stream_script delete mode 100644 benchmarks/netperf/files/patch-snapshot_script create mode 100644 benchmarks/netperf/files/patch-src_dscp.c create mode 100644 benchmarks/netperf/files/patch-src_netcpu__sysctl.c create mode 100644 benchmarks/netperf/files/patch-src_nettest__unix.c delete mode 100644 benchmarks/netperf/files/patch-tcp_range_script delete mode 100644 benchmarks/netperf/files/patch-tcp_rr_script delete mode 100644 benchmarks/netperf/files/patch-tcp_stream_script delete mode 100644 benchmarks/netperf/files/patch-udp_rr_script delete mode 100644 benchmarks/netperf/files/patch-udp_stream_script (limited to 'benchmarks/netperf/files') diff --git a/benchmarks/netperf/files/patch-arr_script b/benchmarks/netperf/files/patch-arr_script deleted file mode 100644 index 2a9e6b32d9a6..000000000000 --- a/benchmarks/netperf/files/patch-arr_script +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/examples/arr_script.orig Wed Sep 8 15:57:17 1999 -+++ doc/examples/arr_script Wed Sep 8 15:57:56 1999 -@@ -10,8 +10,7 @@ - TOLERANCE=15 - MAX_RETRIES=3 - -- NETPERF="/usr/local/netperf/netperf" -- NETPERF="./netperf" -+ NETPERF="%%PREFIX%%/bin/netperf" - - NPROC_LIST="" - RR_SIZES="" diff --git a/benchmarks/netperf/files/patch-bloat.sh b/benchmarks/netperf/files/patch-bloat.sh deleted file mode 100644 index 32a55dee4707..000000000000 --- a/benchmarks/netperf/files/patch-bloat.sh +++ /dev/null @@ -1,34 +0,0 @@ ---- doc/examples/bloat.sh.orig 2012-10-05 02:25:19.000000000 +0200 -+++ doc/examples/bloat.sh 2015-10-19 15:18:22.392273000 +0200 -@@ -3,12 +3,7 @@ - # buffer bloat on latency. We assume that netperf has been compiled - # with demo-mode enabled via ./configure --enable-demo - --NETPERF=`which netperf` --if [ $? -ne 0 ] --then -- echo "Unable to find a netperf binary." -- exit -1 --fi -+NETPERF="%%PREFIX%%/bin/netperf" - - CHUNK=60 - -@@ -20,7 +15,7 @@ - # in more accurate demo intervals once the STREAM test kicks-in, but a - # somewhat lower transaction rate. not unlike enabling histogram - # mode. --netperf -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & -+$NETPERF -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & - - # sleep CHUNK seconds - sleep $CHUNK -@@ -29,7 +24,7 @@ - - STREAM_START=`date +%s` - echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log --netperf -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out -+$NETPERF -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out - STREAM_STOP=`date +%s` - echo "Netperf TCP_STREAM test stopped at $STREAM_STOP" | tee -a bloat.log - diff --git a/benchmarks/netperf/files/patch-configure b/benchmarks/netperf/files/patch-configure index 49d35272d24b..31f10b135692 100644 --- a/benchmarks/netperf/files/patch-configure +++ b/benchmarks/netperf/files/patch-configure @@ -1,6 +1,6 @@ ---- ./configure.orig 2012-05-12 07:05:20.000000000 +1000 -+++ ./configure 2012-05-12 07:22:49.000000000 +1000 -@@ -6567,7 +6567,7 @@ +--- configure.orig 2015-07-20 17:30:24 UTC ++++ configure +@@ -6567,7 +6567,7 @@ fi done case "$host" in @@ -9,7 +9,7 @@ # FreeBSD 7.x and later SCTP support doesn't need -lsctp. ;; *) -@@ -7142,7 +7142,7 @@ +@@ -7142,7 +7142,7 @@ ac_cv_lib_kstat=ac_cv_lib_kstat_main enable_cpuutil="kstat - auto" NETCPU_SOURCE="kstat" ;; diff --git a/benchmarks/netperf/files/patch-doc_examples_arr__script b/benchmarks/netperf/files/patch-doc_examples_arr__script new file mode 100644 index 000000000000..69f3f3f134e5 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_arr__script @@ -0,0 +1,12 @@ +--- doc/examples/arr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/arr_script +@@ -12,8 +12,7 @@ init_parms() { + TOLERANCE=15 + MAX_RETRIES=3 + +- NETPERF="/usr/local/netperf/netperf" +- NETPERF="./netperf" ++ NETPERF="%%PREFIX%%/bin/netperf" + + NPROC_LIST="" + RR_SIZES="" diff --git a/benchmarks/netperf/files/patch-doc_examples_bloat.sh b/benchmarks/netperf/files/patch-doc_examples_bloat.sh new file mode 100644 index 000000000000..8a0aff68146a --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_bloat.sh @@ -0,0 +1,34 @@ +--- doc/examples/bloat.sh.orig 2012-10-05 00:25:19 UTC ++++ doc/examples/bloat.sh +@@ -3,12 +3,7 @@ + # buffer bloat on latency. We assume that netperf has been compiled + # with demo-mode enabled via ./configure --enable-demo + +-NETPERF=`which netperf` +-if [ $? -ne 0 ] +-then +- echo "Unable to find a netperf binary." +- exit -1 +-fi ++NETPERF="%%PREFIX%%/bin/netperf" + + CHUNK=60 + +@@ -20,7 +15,7 @@ echo "Starting netperf TCP_RR at $RR_STA + # in more accurate demo intervals once the STREAM test kicks-in, but a + # somewhat lower transaction rate. not unlike enabling histogram + # mode. +-netperf -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & ++$NETPERF -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & + + # sleep CHUNK seconds + sleep $CHUNK +@@ -29,7 +24,7 @@ sleep $CHUNK + + STREAM_START=`date +%s` + echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log +-netperf -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out ++$NETPERF -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out + STREAM_STOP=`date +%s` + echo "Netperf TCP_STREAM test stopped at $STREAM_STOP" | tee -a bloat.log + diff --git a/benchmarks/netperf/files/patch-doc_examples_packet__byte__script b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script new file mode 100644 index 000000000000..17318deedc0c --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script @@ -0,0 +1,11 @@ +--- doc/examples/packet_byte_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/packet_byte_script +@@ -25,7 +25,7 @@ if [ $# -eq 0 ]; then + fi + + # where is netperf +-NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin} ++NETPERF_DIR=${NETPERF_DIR:=%%PREFIX%%/bin} + + + # at what port will netserver be waiting? If you decide to run diff --git a/benchmarks/netperf/files/patch-doc_examples_runemomni.sh b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh new file mode 100644 index 000000000000..caaa54ffb138 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh @@ -0,0 +1,74 @@ +--- doc/examples/runemomni.sh.orig 2011-07-28 20:35:06 UTC ++++ doc/examples/runemomni.sh +@@ -1,6 +1,8 @@ + # a script to run a set of single-instance netperf tests + # between two machines + ++NETPERF="%%PREFIX%%/bin/netperf" ++ + # the length in seconds of each test iteration. the actual + # run time will then be somewhere between that times min + # and max iteration for confidence intervals +@@ -81,7 +83,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; + done + done + fi +@@ -100,7 +102,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; + done + done + fi +@@ -119,7 +121,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; + done + done + fi +@@ -138,7 +140,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; + done + done + fi +@@ -151,7 +153,7 @@ do + do + for req in $reqs; do + for burst in $bursts; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; + done + done + done +@@ -165,7 +167,7 @@ do + do + for req in $reqs; do + for burst in $bursts; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; + done + done + done +@@ -180,7 +182,7 @@ do + for i in $netperf_CPUs + do + for req in $reqs; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; + done + done + fi diff --git a/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh new file mode 100644 index 000000000000..9a64a32bf259 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh @@ -0,0 +1,69 @@ +--- doc/examples/runemomniagg2.sh.orig 2011-07-28 18:37:22 UTC ++++ doc/examples/runemomniagg2.sh +@@ -1,4 +1,7 @@ + #set -x ++ ++NETPERF="%%PREFIX%%/bin/netperf" ++ + # edit and add to this array as necessary + # the hosts you will use should be contiguous + # starting at index zero +@@ -84,11 +87,11 @@ echo four dl585 G5 clients rh5.2, each w + echo TCP_STREAM + for i in $concurrent_sessions; do + j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -99,11 +102,11 @@ echo four dl585 G5 clients rh5.2, each w + echo TCP_MAERTS + for i in $concurrent_sessions; do + j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -115,11 +118,11 @@ echo four dl585 G5 clients rh5.2, each w + HDR="-P 1" + for i in $concurrent_sessions; + do j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -130,14 +133,14 @@ echo four dl585 G5 clients rh5.2, each w + echo TCP_RR aggregates + HDR="-P 1" + for i in $concurrent_sessions; do +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + for b in $burst_sizes; do + echo burst of $b; + j=0; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; diff --git a/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh new file mode 100644 index 000000000000..e2ba57a8a08f --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh @@ -0,0 +1,11 @@ +--- doc/examples/runemomniaggdemo.sh.orig 2013-05-10 18:14:25 UTC ++++ doc/examples/runemomniaggdemo.sh +@@ -138,7 +138,7 @@ then + fi + + # allow the netperf binary to be used to be overridden +-NETPERF=${NETPERF:="netperf"} ++NETPERF="%%PREFIX%%/bin/netperf" + + if [ $NUM_REMOTE_HOSTS -lt 2 ] + then diff --git a/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script new file mode 100644 index 000000000000..4bcc090e94ae --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script @@ -0,0 +1,11 @@ +--- doc/examples/sctp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/sctp_stream_script +@@ -24,7 +24,7 @@ fi + # where the programs are + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME=. ++NETHOME="%%PREFIX%%/bin" + + # at what port will netserver be waiting? If you decide to run + # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-doc_examples_snapshot__script b/benchmarks/netperf/files/patch-doc_examples_snapshot__script new file mode 100644 index 000000000000..c29a0a9467ac --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_snapshot__script @@ -0,0 +1,11 @@ +--- doc/examples/snapshot_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/snapshot_script +@@ -37,7 +37,7 @@ + # + # where is netperf installed, there are a few possible places: + +-NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf} ++NETPERF_CMD=${NETPERF_CMD:=%%PREFIX%%/bin/netperf} + + + # there should be no more than two parms passed diff --git a/benchmarks/netperf/files/patch-doc_examples_tcp__range__script b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script new file mode 100644 index 000000000000..29a14d41e13c --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script @@ -0,0 +1,11 @@ +--- doc/examples/tcp_range_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_range_script +@@ -43,7 +43,7 @@ PORT="" + # where is netperf, and are there any "constant" options such as + # the netserver port number + #NETHOME=/usr/etc/net_perf +-NETHOME="." ++NETHOME="%%PREFIX%%/bin" + NETPERF=$NETHOME/netperf $PORT + + # How accurate we want the estimate of performance: diff --git a/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script new file mode 100644 index 000000000000..aaa6d8a7bbdc --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script @@ -0,0 +1,11 @@ +--- doc/examples/tcp_rr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_rr_script +@@ -25,7 +25,7 @@ fi + # where the programs are + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME=. ++NETHOME=%%PREFIX%%/bin + + # at what port will netserver be waiting? If you decide to run + # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script new file mode 100644 index 000000000000..20365f24961c --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script @@ -0,0 +1,11 @@ +--- doc/examples/tcp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_stream_script +@@ -24,7 +24,7 @@ fi + # where the programs are + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME=. ++NETHOME=%%PREFIX%%/bin + + # at what port will netserver be waiting? If you decide to run + # netserver at a different port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-doc_examples_udp__rr__script b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script new file mode 100644 index 000000000000..03ec4228cc28 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script @@ -0,0 +1,11 @@ +--- doc/examples/udp_rr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/udp_rr_script +@@ -22,7 +22,7 @@ fi + + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME="." ++NETHOME=%%PREFIX%%/bin + + # at what port will netserver be waiting? If you decide to run + # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-doc_examples_udp__stream__script b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script new file mode 100644 index 000000000000..5237033f32b6 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script @@ -0,0 +1,11 @@ +--- doc/examples/udp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/udp_stream_script +@@ -19,7 +19,7 @@ fi + + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME="." ++NETHOME=%%PREFIX%%/bin + + # at what port will netserver be waiting? If you decide to run + # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-doc_netperf.man b/benchmarks/netperf/files/patch-doc_netperf.man new file mode 100644 index 000000000000..0e6515408c06 --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_netperf.man @@ -0,0 +1,12 @@ +--- doc/netperf.man.orig 2011-06-30 00:03:05 UTC ++++ doc/netperf.man +@@ -53,8 +53,7 @@ a test (possibly at the expense of perfo + .TP + .B \-D [secs,units] (*) + Display interim results at least every secs seconds uning units as the +-initial guess for units per second. This is only available when +-netperf has been configured with --enable-demo. ++initial guess for units per second. + .TP + .B \-f GMKgmk + Change the units of measure for *_STREAM tests. Capital letters are diff --git a/benchmarks/netperf/files/patch-dscp.c b/benchmarks/netperf/files/patch-dscp.c deleted file mode 100644 index 3354b085e6aa..000000000000 --- a/benchmarks/netperf/files/patch-dscp.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/dscp.c.orig 2012-04-04 08:51:29.000000000 +0900 -+++ src/dscp.c 2012-08-24 11:12:14.866495927 +0900 -@@ -50,6 +50,7 @@ - */ - - #if HAVE_NETINET_IN_SYSTM_H -+#include - #include - #endif - #if HAVE_NETINET_IP_H diff --git a/benchmarks/netperf/files/patch-netcpu_sysctl.c b/benchmarks/netperf/files/patch-netcpu_sysctl.c deleted file mode 100644 index cf96284de13d..000000000000 --- a/benchmarks/netperf/files/patch-netcpu_sysctl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/netcpu_sysctl.c.orig 2014-06-04 01:37:37.000000000 +0200 -+++ src/netcpu_sysctl.c 2015-10-19 16:05:51.583777000 +0200 -@@ -6,6 +6,8 @@ - #endif - - #include -+#include -+#include - #include - - #if HAVE_INTTYPES_H diff --git a/benchmarks/netperf/files/patch-netperf.man b/benchmarks/netperf/files/patch-netperf.man deleted file mode 100644 index afdccde69549..000000000000 --- a/benchmarks/netperf/files/patch-netperf.man +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/netperf.man.orig 2011-06-30 02:03:05.000000000 +0200 -+++ doc/netperf.man 2013-01-29 21:38:34.000000000 +0100 -@@ -53,8 +53,7 @@ - .TP - .B \-D [secs,units] (*) - Display interim results at least every secs seconds uning units as the --initial guess for units per second. This is only available when --netperf has been configured with --enable-demo. -+initial guess for units per second. - .TP - .B \-f GMKgmk - Change the units of measure for *_STREAM tests. Capital letters are diff --git a/benchmarks/netperf/files/patch-nettest_unix.c b/benchmarks/netperf/files/patch-nettest_unix.c deleted file mode 100644 index fb6e6b3b21de..000000000000 --- a/benchmarks/netperf/files/patch-nettest_unix.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/nettest_unix.c.orig 2012-06-19 22:35:37.000000000 +0200 -+++ src/nettest_unix.c 2015-10-19 16:15:15.347526000 +0200 -@@ -2714,7 +2714,6 @@ - that sort of rot... */ - - #ifdef WANT_INTERVALS -- kept_times[MAX_KEPT_TIMES] = 0; - time_index = 0; - while (time_index < MAX_KEPT_TIMES) { - if (kept_times[time_index] > 0) { diff --git a/benchmarks/netperf/files/patch-packet_byte_script b/benchmarks/netperf/files/patch-packet_byte_script deleted file mode 100644 index b3bb8ddd5aec..000000000000 --- a/benchmarks/netperf/files/patch-packet_byte_script +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/packet_byte_script.orig 2007-11-09 08:29:45.000000000 +0900 -+++ doc/examples/packet_byte_script 2009-06-16 15:35:37.000000000 +0900 -@@ -25,7 +25,7 @@ - fi - - # where is netperf --NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin} -+NETPERF_DIR=${NETPERF_DIR:=%%PREFIX%%/bin} - - - # at what port will netserver be waiting? If you decide to run diff --git a/benchmarks/netperf/files/patch-runemomni.sh b/benchmarks/netperf/files/patch-runemomni.sh deleted file mode 100644 index 939f3508fa25..000000000000 --- a/benchmarks/netperf/files/patch-runemomni.sh +++ /dev/null @@ -1,74 +0,0 @@ ---- doc/examples/runemomni.sh.orig 2011-07-28 22:35:06.000000000 +0200 -+++ doc/examples/runemomni.sh 2015-10-19 15:22:10.484922000 +0200 -@@ -1,6 +1,8 @@ - # a script to run a set of single-instance netperf tests - # between two machines - -+NETPERF="%%PREFIX%%/bin/netperf" -+ - # the length in seconds of each test iteration. the actual - # run time will then be somewhere between that times min - # and max iteration for confidence intervals -@@ -81,7 +83,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; - done - done - fi -@@ -100,7 +102,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; - done - done - fi -@@ -119,7 +121,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; - done - done - fi -@@ -138,7 +140,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; - done - done - fi -@@ -151,7 +153,7 @@ - do - for req in $reqs; do - for burst in $bursts; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; - done - done - done -@@ -165,7 +167,7 @@ - do - for req in $reqs; do - for burst in $bursts; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; - done - done - done -@@ -180,7 +182,7 @@ - for i in $netperf_CPUs - do - for req in $reqs; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; - done - done - fi diff --git a/benchmarks/netperf/files/patch-runemomniagg2.sh b/benchmarks/netperf/files/patch-runemomniagg2.sh deleted file mode 100644 index e39d00419b0a..000000000000 --- a/benchmarks/netperf/files/patch-runemomniagg2.sh +++ /dev/null @@ -1,69 +0,0 @@ ---- doc/examples/runemomniagg2.sh.orig 2011-07-28 20:37:22.000000000 +0200 -+++ doc/examples/runemomniagg2.sh 2015-10-19 15:35:43.704236000 +0200 -@@ -1,4 +1,7 @@ - #set -x -+ -+NETPERF="%%PREFIX%%/bin/netperf" -+ - # edit and add to this array as necessary - # the hosts you will use should be contiguous - # starting at index zero -@@ -84,11 +87,11 @@ - echo TCP_STREAM - for i in $concurrent_sessions; do - j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -99,11 +102,11 @@ - echo TCP_MAERTS - for i in $concurrent_sessions; do - j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -115,11 +118,11 @@ - HDR="-P 1" - for i in $concurrent_sessions; - do j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -130,14 +133,14 @@ - echo TCP_RR aggregates - HDR="-P 1" - for i in $concurrent_sessions; do -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - for b in $burst_sizes; do - echo burst of $b; - j=0; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; diff --git a/benchmarks/netperf/files/patch-runemomniaggdemo.sh b/benchmarks/netperf/files/patch-runemomniaggdemo.sh deleted file mode 100644 index 0c5ab9e01da8..000000000000 --- a/benchmarks/netperf/files/patch-runemomniaggdemo.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/runemomniaggdemo.sh.orig 2013-05-10 20:14:25.000000000 +0200 -+++ doc/examples/runemomniaggdemo.sh 2015-10-19 15:37:46.597952000 +0200 -@@ -138,7 +138,7 @@ - fi - - # allow the netperf binary to be used to be overridden --NETPERF=${NETPERF:="netperf"} -+NETPERF="%%PREFIX%%/bin/netperf" - - if [ $NUM_REMOTE_HOSTS -lt 2 ] - then diff --git a/benchmarks/netperf/files/patch-sctp_stream_script b/benchmarks/netperf/files/patch-sctp_stream_script deleted file mode 100644 index d3b60119e17d..000000000000 --- a/benchmarks/netperf/files/patch-sctp_stream_script +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/sctp_stream_script.bak Fri Oct 21 07:58:11 2005 -+++ doc/examples/sctp_stream_script Thu Nov 9 13:20:35 2006 -@@ -24,7 +24,7 @@ - # where the programs are - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME=. -+NETHOME="%%PREFIX%%/bin" - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-snapshot_script b/benchmarks/netperf/files/patch-snapshot_script deleted file mode 100644 index 1310ab3b8064..000000000000 --- a/benchmarks/netperf/files/patch-snapshot_script +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/snapshot_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/snapshot_script 21 Jan 2003 00:45:21 -0000 -@@ -37,7 +37,7 @@ - # - # where is netperf installed, there are a few possible places: - --NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf} -+NETPERF_CMD=${NETPERF_CMD:=%%PREFIX%%/bin/netperf} - - - # there should be no more than two parms passed diff --git a/benchmarks/netperf/files/patch-src_dscp.c b/benchmarks/netperf/files/patch-src_dscp.c new file mode 100644 index 000000000000..43f33fc55353 --- /dev/null +++ b/benchmarks/netperf/files/patch-src_dscp.c @@ -0,0 +1,10 @@ +--- src/dscp.c.orig 2012-10-11 20:42:06 UTC ++++ src/dscp.c +@@ -54,6 +54,7 @@ const char * iptos2str(int iptos); + */ + + #if HAVE_NETINET_IN_SYSTM_H ++#include + #include + #endif + #if HAVE_NETINET_IP_H diff --git a/benchmarks/netperf/files/patch-src_netcpu__sysctl.c b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c new file mode 100644 index 000000000000..b9b3c99aa54e --- /dev/null +++ b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c @@ -0,0 +1,11 @@ +--- src/netcpu_sysctl.c.orig 2014-06-03 23:37:37 UTC ++++ src/netcpu_sysctl.c +@@ -6,6 +6,8 @@ char netcpu_sysctl_id[]="\ + #endif + + #include ++#include ++#include + #include + + #if HAVE_INTTYPES_H diff --git a/benchmarks/netperf/files/patch-src_nettest__unix.c b/benchmarks/netperf/files/patch-src_nettest__unix.c new file mode 100644 index 000000000000..8078f397c183 --- /dev/null +++ b/benchmarks/netperf/files/patch-src_nettest__unix.c @@ -0,0 +1,10 @@ +--- src/nettest_unix.c.orig 2012-06-19 20:35:37 UTC ++++ src/nettest_unix.c +@@ -2714,7 +2714,6 @@ bytes bytes bytes bytes secs. per + that sort of rot... */ + + #ifdef WANT_INTERVALS +- kept_times[MAX_KEPT_TIMES] = 0; + time_index = 0; + while (time_index < MAX_KEPT_TIMES) { + if (kept_times[time_index] > 0) { diff --git a/benchmarks/netperf/files/patch-tcp_range_script b/benchmarks/netperf/files/patch-tcp_range_script deleted file mode 100644 index 8ed69996ae42..000000000000 --- a/benchmarks/netperf/files/patch-tcp_range_script +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/tcp_range_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/tcp_range_script 21 Jan 2003 00:45:21 -0000 -@@ -43,7 +43,7 @@ - # where is netperf, and are there any "constant" options such as - # the netserver port number - #NETHOME=/usr/etc/net_perf --NETHOME="." -+NETHOME="%%PREFIX%%/bin" - NETPERF=$NETHOME/netperf $PORT - - # How accurate we want the estimate of performance: diff --git a/benchmarks/netperf/files/patch-tcp_rr_script b/benchmarks/netperf/files/patch-tcp_rr_script deleted file mode 100644 index 5e10843ab2f7..000000000000 --- a/benchmarks/netperf/files/patch-tcp_rr_script +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/examples/tcp_rr_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/tcp_rr_script 21 Jan 2003 00:45:21 -0000 -@@ -23,9 +23,9 @@ - fi - - # where the programs are - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME=. -+NETHOME=%%PREFIX%%/bin - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-tcp_stream_script b/benchmarks/netperf/files/patch-tcp_stream_script deleted file mode 100644 index bff83ea174db..000000000000 --- a/benchmarks/netperf/files/patch-tcp_stream_script +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/examples/tcp_stream_script 2 Aug 1999 12:01:23 -0000 1.1.1.1 -+++ doc/examples/tcp_stream_script 21 Jan 2003 00:45:21 -0000 -@@ -22,9 +22,9 @@ - fi - - # where the programs are - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME=. -+NETHOME=%%PREFIX%%/bin - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-udp_rr_script b/benchmarks/netperf/files/patch-udp_rr_script deleted file mode 100644 index 83f9ca184848..000000000000 --- a/benchmarks/netperf/files/patch-udp_rr_script +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/examples/udp_rr_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/udp_rr_script 21 Jan 2003 00:45:21 -0000 -@@ -20,9 +20,9 @@ - - # where the programs are - - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME="." -+NETHOME=%%PREFIX%%/bin - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-udp_stream_script b/benchmarks/netperf/files/patch-udp_stream_script deleted file mode 100644 index 4dbc2058fcf1..000000000000 --- a/benchmarks/netperf/files/patch-udp_stream_script +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/examples/udp_stream_script 2 Aug 1999 12:01:23 -0000 1.1.1.1 -+++ doc/examples/udp_stream_script 21 Jan 2003 00:45:21 -0000 -@@ -17,9 +17,9 @@ - - # where the programs are - - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME="." -+NETHOME=%%PREFIX%%/bin - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set -- cgit v1.2.3