Merge pull request #493 from ndokos/jtaleric-master

White space fixes - also fixed some typos

Author: ndokos

agent/bench-scripts/pbench-uperf

@@ -1,4 +1,5 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: t; sh-basic-offset: 8; sh-indentation: 8; sh-indent-for-case-alt: + -*-
 
 # This is a script to run the uperf benchmark
 # Author: Andrew Theurer
@@ -142,51 +143,51 @@ function install_uperf {
 # Process options and arguments
 opts=$(getopt -q -o i:c:t:r:m:p:M:S:C: --longoptions "server-node:,server-nodes:,client-node:,client-nodes:,client-label:,server-label:,tool-label-pattern:,install,start-iteration-num:,config:,instances:,test-types:,runtime:,message-sizes:,protocols:,samples:,client:,clients:,servers:,server:,max-stddev:,max-failures:,kvm-host:,log-response-times:,postprocess-only:,run-dir:,tool-group:" -n "getopt.sh" -- "$@")
 if [ $? -ne 0 ]; then
-    printf -- "$*\n"
-    printf "\n"
-    printf "\t${benchmark}: you specified an invalid option\n\n"
-    printf "\tThe following options are available:\n\n"
-    printf -- "\t--kvm-host=str\n"
-    printf -- "\t--tool-group=str\n"
-    printf -- "\t-c str       --config=str               name of the test config (e.g. jumbo_frames_and_network_throughput)\n"
-    printf -- "\t-t str[,str] --test-types=str[,str]     can be stream, maerts, bidirec, and/or rr (default $test_types)\n"
-    printf -- "\t-r int       --runtime=int              test measurement period in seconds (default is $runtime)\n"
-    printf -- "\t-m int[,int] --message-sizes=str[,str]  list of message sizes in bytes (default is $message_sizes)\n"
-    printf -- "\t-p str[,str] --protocols=str[,str]      tcp and/or udp (default is $protocols)\n"
-    printf -- "\t-i int[,int] --instances=int[,int]      list of number of uperf instances to run (default is $instances)\n"
-    printf -- "\t-C str[,str] --client[s]=str[,str]      a list of one or more hostnames/IPs.  These systems will run the\n"
-    printf    "\t\t\t\t   uperf client (drive the test).\n"
-    printf    "\t\t\t\t   If this is omitted, the local system is the client\n"
-    printf    "\t\t\t\t   Note: the number of clients and server must be the same!\n"
-    printf    "\t\t\t\t   Clients and servers are paired according the order in the list (first\n"
-    printf    "\t\t\t\t   client pairs with firest server, etc)\n"
-    printf -- "\t-S str[,str] --server[s]=str[,str]      a list of one or more hostnames/IPs.  These systems will run the uperf\n"
-    printf    "\t\t\t\t   server (listening for connections)\n"
-    printf    "\t\t\t\t   If this is omitted, the server will listen on the local system\n"
-    printf    "\t\t\t\t   loopback interface\n"
-    printf -- "\t--server-node[s]=str[,str]              An ordered list of server NUMA nodes which should be used for CPU binding\n"
-    printf -- "\t--client-node[s]=str[,str]              An ordered list of rrclient NUMA nodes which should be used for CPU binding\n"
-    printf -- "\t\t\t\t   For both options above, the order must correspond with the --clients/--servers list\n"
-    printf -- "\t\t\t\t   To omit a specific client/server from binding, use a value of -1\n"
-    printf -- "\t--samples=int              the number of times each different test is run (to compute average &\n"
-    printf    "\t\t\t\t   standard deviations)\n"
-    printf -- "\t--max-failures=int         the maximum number of failures to get below stddev\n"
-    printf -- "\t--max-stddev=int           the maximum percent stddev allowed to pass\n"
-    printf -- "\t--postprocess-only=y|n     don't run the benchmark, but postprocess data from previous test\n"
-    printf -- "\t--run-dir=str              optionally specify what directory should be used (usually only used\n"
-    printf    "\t\t\t\t   if postprocess-only=y)\n"
-    printf -- "\t--start-iteration-num=int  optionally skip the first (n-1) tests\n"
-    printf -- "\t--log-response-times=y|n   record the response time of every single operation\n"
-    printf -- "\t--tool-label-pattern=str   uperf will provide CPU and efficiency information for any tool directory\n"
-    printf    "\t\t\t\t   with a \"^<pattern>\" in the name, provided \"sar\" is one of the\n"
-    printf    "\t\t\t\t   registered tools.\n"
-    printf    "\t\t\t\t   a default pattern, \"uperf-\" is used if none is provided.\n"
-    printf    "\t\t\t\t   simply register your tools with \"--label=uperf-\$X\", and this script\n"
-    printf    "\t\t\t\t   will genrate CPU_uperf-\$X and Gbps/CPU_uperf-\$X or\n"
-    printf    "\t\t\t\t   trans_sec/CPU-uperf-\$X for all tools which have that pattern as a\n"
-    printf    "\t\t\t\t   prefix.  if you don't want to register your tools with \"uperf-\" as\n"
-    printf    "\t\t\t\t   part of the label, just use --tool-label-pattern= to tell this script\n"
-    printf    "\t\t\t\t   the prefix pattern to use for CPU information.\n"
+	printf -- "$*\n"
+	printf "\n"
+	printf "\t${benchmark}: you specified an invalid option\n\n"
+	printf "\tThe following options are available:\n\n"
+	printf -- "\t--kvm-host=str\n"
+	printf -- "\t--tool-group=str\n"
+	printf -- "\t-c str       --config=str               name of the test config (e.g. jumbo_frames_and_network_throughput)\n"
+	printf -- "\t-t str[,str] --test-types=str[,str]     can be stream, maerts, bidirec, and/or rr (default $test_types)\n"
+	printf -- "\t-r int       --runtime=int              test measurement period in seconds (default is $runtime)\n"
+	printf -- "\t-m int[,int] --message-sizes=str[,str]  list of message sizes in bytes (default is $message_sizes)\n"
+	printf -- "\t-p str[,str] --protocols=str[,str]      tcp and/or udp (default is $protocols)\n"
+	printf -- "\t-i int[,int] --instances=int[,int]      list of number of uperf instances to run (default is $instances)\n"
+	printf -- "\t-C str[,str] --client[s]=str[,str]      a list of one or more hostnames/IPs.  These systems will run the\n"
+	printf    "\t\t\t\t   uperf client (drive the test).\n"
+	printf    "\t\t\t\t   If this is omitted, the local system is the client.\n"
+	printf    "\t\t\t\t   Note: the number of clients and servers must be the same!\n"
+	printf    "\t\t\t\t   Clients and servers are paired according to the order in the list (first\n"
+	printf    "\t\t\t\t   client pairs with first server, etc)\n"
+	printf -- "\t-S str[,str] --server[s]=str[,str]      a list of one or more hostnames/IPs.  These systems will run the uperf\n"
+	printf    "\t\t\t\t   server (listening for connections).\n"
+	printf    "\t\t\t\t   If this is omitted, the server will listen on the local system\n"
+	printf    "\t\t\t\t   loopback interface.\n"
+	printf -- "\t--server-node[s]=str[,str]              An ordered list of server NUMA nodes which should be used for CPU binding\n"
+	printf -- "\t--client-node[s]=str[,str]              An ordered list of rrclient NUMA nodes which should be used for CPU binding\n"
+	printf -- "\t\t\t\t   For both options above, the order must correspond with the --clients/--servers list\n"
+	printf -- "\t\t\t\t   To omit a specific client/server from binding, use a value of -1.\n"
+	printf -- "\t--samples=int              the number of times each different test is run (to compute average &\n"
+	printf    "\t\t\t\t   standard deviations).\n"
+	printf -- "\t--max-failures=int         the maximum number of failures to get below stddev.\n"
+	printf -- "\t--max-stddev=int           the maximum percent stddev allowed to pass.\n"
+	printf -- "\t--postprocess-only=y|n     don't run the benchmark, but postprocess data from previous test.\n"
+	printf -- "\t--run-dir=str              optionally specify what directory should be used (usually only used\n"
+	printf    "\t\t\t\t   if postprocess-only=y).\n"
+	printf -- "\t--start-iteration-num=int  optionally skip the first (n-1) tests.\n"
+	printf -- "\t--log-response-times=y|n   record the response time of every single operation.\n"
+	printf -- "\t--tool-label-pattern=str   uperf will provide CPU and efficiency information for any tool directory\n"
+	printf    "\t\t\t\t   with a \"^<pattern>\" in the name, provided \"sar\" is one of the\n"
+	printf    "\t\t\t\t   registered tools.\n"
+	printf    "\t\t\t\t   a default pattern, \"uperf-\" is used if none is provided.\n"
+	printf    "\t\t\t\t   simply register your tools with \"--label=uperf-\$X\", and this script\n"
+	printf    "\t\t\t\t   will generate CPU_uperf-\$X and Gbps/CPU_uperf-\$X or\n"
+	printf    "\t\t\t\t   trans_sec/CPU-uperf-\$X for all tools which have that pattern as a\n"
+	printf    "\t\t\t\t   prefix.  If you don't want to register your tools with \"uperf-\" as\n"
+	printf    "\t\t\t\t   part of the label, just use --tool-label-pattern= to tell this script\n"
+	printf    "\t\t\t\t   the prefix pattern to use for CPU information.\n"
 	exit 1
 fi
 eval set -- "$opts"