From 1385a81069a24cfd53d5f0fed14c4b7c12fa5102 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 6 Sep 2011 21:46:12 +0000 Subject: NO-JIRA: Fix ambiguous option to qpid-cluster-benchmark. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-1@1165878 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/qpid-cluster-benchmark | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qpid/cpp/src/tests/qpid-cluster-benchmark b/qpid/cpp/src/tests/qpid-cluster-benchmark index ff787a46dd..9f64de31ce 100755 --- a/qpid/cpp/src/tests/qpid-cluster-benchmark +++ b/qpid/cpp/src/tests/qpid-cluster-benchmark @@ -22,16 +22,16 @@ # Default values PORT="5672" -COUNT=10000 +MESSAGES=10000 FLOW=100 # Flow control limit on queue depth for latency. REPEAT=10 QUEUES=4 CLIENTS=3 -while getopts "p:c:f:r:t:b:q:c" opt; do +while getopts "p:m:f:r:t:b:q:c" opt; do case $opt in p) PORT=$OPTARG;; - c) COUNT=$OPTARG;; + m) MESSAGES=$OPTARG;; f) FLOW=$OPTARG;; r) REPEAT=$OPTARG;; s) SCALE=$OPTARG;; @@ -48,11 +48,11 @@ BROKER=`echo $BROKERS | awk -F, '{print $1}'` # First broker run_test() { echo $*; shift; "$@"; echo; echo; echo; } # Multiple pubs/subs connect via multiple brokers (active-active) -run_test "multi-host-thruput" qpid-cpp-benchmark --repeat $REPEAT -b $BROKERS --no-timestamp --summarize -q$QUEUES -s$CLIENTS -r$CLIENTS -m $COUNT +run_test "multi-host-thruput" qpid-cpp-benchmark --repeat $REPEAT -b $BROKERS --no-timestamp --summarize -q$QUEUES -s$CLIENTS -r$CLIENTS -m $MESSAGES # Multiple pubs/subs connect via single broker (active-passive) -run_test "single-host-thruput" qpid-cpp-benchmark --repeat $REPEAT -b $BROKER --no-timestamp --summarize -q$QUEUES -s$CLIENTS -r$CLIENTS -m $COUNT +run_test "single-host-thruput" qpid-cpp-benchmark --repeat $REPEAT -b $BROKER --no-timestamp --summarize -q$QUEUES -s$CLIENTS -r$CLIENTS -m $MESSAGES # Latency -run_test "latency" qpid-cpp-benchmark --repeat $REPEAT -b $BROKER --connection-options '{tcp-nodelay:true}' -m $COUNT --flow-control $FLOW +run_test "latency" qpid-cpp-benchmark --repeat $REPEAT -b $BROKER --connection-options '{tcp-nodelay:true}' -m $MESSAGES --flow-control $FLOW -- cgit v1.2.1