Skip to content

Rename util scripts to avoid collisions. #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndokos merged 1 commit into from
Feb 5, 2016
Merged

Rename util scripts to avoid collisions. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ perl:
- "5.18"
- "5.16"
- "5.10"
before_install:
- sudo apt-get update
install:
- sudo apt-get update
- sudo apt-get install python python-pip bc libjson-perl realpath
Expand Down
64 changes: 32 additions & 32 deletions agent/bench-scripts/gold/pbench-dbench/test-00.txt
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions agent/bench-scripts/gold/pbench-uperf/test-00.txt
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions agent/bench-scripts/gold/pbench-uperf/test-01.txt
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions agent/bench-scripts/pbench-cyclictest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ printf "\n" >>$benchmark_summary_html_file
export benchmark config

count=1
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
if [ $stress ]; then
if [ ! -z "$cpu" ]; then
taskset -c $cpu stress -c 1 &
Expand All @@ -145,10 +145,10 @@ for runtime in `echo $runtimes | sed -e s/,/" "/g`; do
echo $benchmark_cmd >$benchmark_cmd_file
chmod +x $benchmark_cmd_file
debug_log "going to run $benchmark_cmd"
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
$benchmark_cmd_file | tee $result_file
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
min=`grep "Min Latencies:" $result_file | awk '{print $4}'`
avg=`grep "Avg Latencies:" $result_file | awk '{print $4}'`
max=`grep "Max Latencies:" $result_file | awk '{print $4}'`
Expand All @@ -158,7 +158,7 @@ done
if [ $stress ]; then
kill $stress_pid
fi
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
cat $benchmark_summary_txt_file

# signal to move/copy-results that this run is done.
Expand Down
12 changes: 6 additions & 6 deletions agent/bench-scripts/pbench-dbench
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ let total_iterations=count
count=1
max_key_length=0
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg

for thread_count in `echo $thread_counts | sed -e s/,/" "/g`; do
if [ $count -ge $start_iteration_num ]; then
Expand Down Expand Up @@ -348,7 +348,7 @@ for thread_count in `echo $thread_counts | sed -e s/,/" "/g`; do

((client_nr++))
done
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir

# start the dbench clients
echo "test sample $sample of $nr_samples"
Expand Down Expand Up @@ -382,8 +382,8 @@ for thread_count in `echo $thread_counts | sed -e s/,/" "/g`; do
wait

# stop tools and clean up
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
else
if [[ ! -d $benchmark_results_dir ]]; then
error_log "Results directory $benchmark_results_dir does not exist, skipping post-processing"
Expand Down Expand Up @@ -421,7 +421,7 @@ for thread_count in `echo $thread_counts | sed -e s/,/" "/g`; do
value=`grep -- "$key" $iteration_dir/sample$sample/result.txt | awk -F= '{print $2}'`
iteration_samples="$iteration_samples $value"
done
avg_stddev_result=`avg-stddev $iteration_samples`
avg_stddev_result=`pbench-avg-stddev $iteration_samples`
samples[$key_nr]="$iteration_samples"
avg[$key_nr]=`echo $avg_stddev_result | awk '{print $1}'`
stddev[$key_nr]=`echo $avg_stddev_result | awk '{print $2}'`
Expand Down Expand Up @@ -506,6 +506,6 @@ for thread_count in `echo $thread_counts | sed -e s/,/" "/g`; do
done

printf -- "</pre>\n" >>$benchmark_summary_html_file
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end

rmdir $benchmark_run_dir/.running
12 changes: 6 additions & 6 deletions agent/bench-scripts/pbench-fio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ function fio_run_job() {
else
mkdir -p $benchmark_results_dir/clients/localhost
fi
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
local client_opts=""
if [ ! -z "$clients" ]; then
local max_jobs=0
Expand All @@ -519,7 +519,7 @@ function fio_run_job() {
pushd $benchmark_results_dir >/dev/null
$benchmark_results_dir/fio.cmd >$benchmark_results_dir/fio-result.txt
popd >/dev/null
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
if [ ! -z "$clients" ]; then
debug_log "getting log files from clients"
for client in `echo $clients | sed -e s/,/" "/g`; do
Expand All @@ -535,7 +535,7 @@ function fio_run_job() {
else
mv $benchmark_results_dir/fio*.log $benchmark_results_dir/clients/localhost/
fi
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
echo "fio job complete"
}

Expand Down Expand Up @@ -664,7 +664,7 @@ function fio_run_benchmark() {
value=`grep -- "^$key" $iteration_dir/sample$sample/result.txt | awk -F= '{print $2}'`
iteration_samples="$iteration_samples $value"
done
avg_stddev_result=`avg-stddev $iteration_samples`
avg_stddev_result=`pbench-avg-stddev $iteration_samples`
samples[$key_nr]="$iteration_samples"
avg[$key_nr]=`echo $avg_stddev_result | awk '{print $1}'`
avg[$key_nr]=`printf "%.2f" ${avg[$key_nr]}`
Expand Down Expand Up @@ -781,9 +781,9 @@ fio_process_options "$@"
fio_install

export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
fio_run_benchmark
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
fio_print_summary

rmdir $benchmark_run_dir/.running
10 changes: 5 additions & 5 deletions agent/bench-scripts/pbench-iozone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ benchmark_summary_file="$benchmark_run_dir/$benchmark-summary.txt"

mkdir -p $benchmark_run_dir/.running
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg

benchmark_results_dir="$benchmark_run_dir/$iteration/reference-result"

benchmark_tools_dir="$benchmark_results_dir/tools-$tool_group"
mkdir -p $benchmark_results_dir $benchmark_tools_dir


start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir

# not 100% sure what is best run logic here, either to permute record sizes or over file sizes...

Expand All @@ -179,9 +179,9 @@ for file_size in $(echo $file_sizes | sed -e s/,/" "/g); do
done
done

stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end

rmdir $benchmark_run_dir/.running

10 changes: 5 additions & 5 deletions agent/bench-scripts/pbench-linpack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ benchmark_results_dir="$benchmark_run_dir/$iteration/reference-result"
result_file=$benchmark_results_dir/result.txt
mkdir -p $benchmark_results_dir
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
## Run the benchmark and start/stop perf analysis tools
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pushd /usr/local/linpack_11.1.3/benchmarks/linpack
OMP_NUM_THREADS=$threads ./xlinpack_xeon64 < ./linpack.dat | tee $result_file
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end

rmdir $benchmark_run_dir/.running
10 changes: 5 additions & 5 deletions agent/bench-scripts/pbench-migrate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ function do_migrate() {
# migrate
echo sleeping for $seconds_before_migrate seconds before starting migration | tee -a $benchmark_results_dir/result.txt
sleep $seconds_before_migrate
start-tools --group=$tool_group --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --dir=$benchmark_results_dir
if [ "$use_libvirt" == "y" ]; then
if [ ! -z "$dest_ipaddr" ]; then
tcp_opt="tcp://$dest_ipaddr"
Expand Down Expand Up @@ -303,7 +303,7 @@ function do_migrate() {
let count=$count+1
done
fi
stop-tools --group=$tool_group --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --dir=$benchmark_results_dir
}

if [ "$postprocess" = "only" ]; then
Expand All @@ -324,7 +324,7 @@ if [ $loops -eq 0 ]; then
fi
count=1
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
for i in `seq 1 $loops`; do
iteration="$count-from-$src_host-to-$dest_host"
benchmark_results_dir="$benchmark_run_dir/$iteration/reference-result"
Expand Down Expand Up @@ -362,9 +362,9 @@ done
echo sleeping for $seconds_before_postprocess seconds before postprocessing tools
sleep $seconds_before_postprocess
for postprocess_dir in $postprocess_dirs; do
postprocess-tools --group=$tool_group --dir=$postprocess_dir &
pbench-postprocess-tools --group=$tool_group --dir=$postprocess_dir &
done
wait
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end

rmdir $benchmark_run_dir/.running
24 changes: 12 additions & 12 deletions agent/bench-scripts/pbench-netperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ count=1
# disable firewall on local system
systemctl stop firewalld
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
# start the server processes
for protocol in `echo $protocols | sed -e s/,/" "/g`; do
for test_type in `echo $test_types | sed -e s/,/" "/g`; do
Expand Down Expand Up @@ -448,7 +448,7 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
wait
fi
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
# start a local netperf client process for each host found in the $servers list
if [ -z "$clients" ]; then
for server in `echo $servers | sed -e s/","/" "/g`; do
Expand Down Expand Up @@ -476,8 +476,8 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
wait
fi
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
else
echo "Not going to run netperf. Only postprocesing existing data"
fi
Expand Down Expand Up @@ -508,29 +508,29 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
debug_log "$tput_metric: $tputs"
# pick the result closest to the average and call it our "reference result"
debug_log "avg-stddev $tputs"
tput_data=`avg-stddev $tputs`
debug_log "pbench-avg-stddev $tputs"
tput_data=`pbench-avg-stddev $tputs`
tput_avg=`echo $tput_data | awk '{print $1}'`
tput_stddev=`echo $tput_data | awk '{print $2}'`
tput_stddevpct=`echo $tput_data | awk '{print $3}'`
tput_closest=`echo $tput_data | awk '{print $4}'`
if [ $test_type == "rr" ]; then
latency_data=`avg-stddev $latencies`
latency_data=`pbench-avg-stddev $latencies`
latency_avg=`echo $latency_data | awk '{print $1}'`
latency_stddev=`echo $latency_data | awk '{print $2}'`
latency_stddevpct=`echo $latency_data | awk '{print $3}'`
latency_closest=`echo $latency_data | awk '{print $4}'`
fi
client_cpu_data=`avg-stddev $client_cpus`
client_cpu_data=`pbench-avg-stddev $client_cpus`
client_cpu_avg=`echo $client_cpu_data | awk '{print $1}'`
client_cpu_stddevpct=`echo $client_cpu_data | awk '{print $3}'`
server_cpu_data=`avg-stddev $server_cpus`
server_cpu_data=`pbench-avg-stddev $server_cpus`
server_cpu_avg=`echo $server_cpu_data | awk '{print $1}'`
server_cpu_stddevpct=`echo $server_cpu_data | awk '{print $3}'`
client_eff_data=`avg-stddev $client_effs`
client_eff_data=`pbench-avg-stddev $client_effs`
client_eff_avg=`echo $client_eff_data | awk '{print $1}'`
client_eff_stddevpct=`echo $client_eff_data | awk '{print $3}'`
server_eff_data=`avg-stddev $server_effs`
server_eff_data=`pbench-avg-stddev $server_effs`
server_eff_avg=`echo $server_eff_data | awk '{print $1}'`
server_eff_stddevpct=`echo $server_eff_data | awk '{print $3}'`

Expand Down Expand Up @@ -583,7 +583,7 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
done
printf -- "</pre>\n" >>$benchmark_summary_html_file
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end


rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-specjbb2005
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ benchmark_results_dir="$benchmark_run_dir"

mkdir -p $benchmark_run_dir/.running

register-tool-trigger --group=$tool_group --start-trigger="Timing Measurement began" --stop-trigger="Timing Measurement ended"
pbench-register-tool-trigger --group=$tool_group --start-trigger="Timing Measurement began" --stop-trigger="Timing Measurement ended"

# run in the directory which has the jar and spec files
pushd $classpath
Expand Down Expand Up @@ -208,16 +208,16 @@ mv index.html SPECjbb.html
# rename the iterations with warehouse count and then postprocess the tools
iteration=1
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
for i in `seq $start_warehouses $inc_warehouses $stop_warehouses`; do
# for each of the test iterations (each test with a specific number of warehouses), copy the raw result data for that iteration in iteraration directory
grep "test$i" SPECjbb.raw >$i/reference-result/SPECjbb.raw
new_iteration_name="$iteration-warehouses:$i"
mv $iteration $new_iteration_name
postprocess-tools --group=$tool_group --iteration=$new_iteration_name --dir=$benchmark_results_dir/$new_iteration_name/reference-result
pbench-postprocess-tools --group=$tool_group --iteration=$new_iteration_name --dir=$benchmark_results_dir/$new_iteration_name/reference-result
let iteration=$iteration+1
done
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
popd

rmdir $benchmark_run_dir/.running
12 changes: 6 additions & 6 deletions agent/bench-scripts/pbench-uperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ let total_iterations=count
count=1
max_key_length=0
export benchmark config
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir beg
# start the server processes
for protocol in `echo $protocols | sed -e s/,/" "/g`; do
for test_type in `echo $test_types | sed -e s/,/" "/g`; do
Expand Down Expand Up @@ -603,7 +603,7 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do

((server_nr++))
done
start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-start-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir

# start the uperf clients
echo "test sample $sample of $nr_samples"
Expand Down Expand Up @@ -647,8 +647,8 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
sleep $runtime

# stop tools and clean up
stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-stop-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir
pbench-postprocess-tools --group=$tool_group --iteration=$iteration --dir=$benchmark_results_dir

server_nr=1
for server in `echo $servers | sed -e s/,/" "/g`; do
Expand Down Expand Up @@ -698,7 +698,7 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
value=`grep -- "$key" $iteration_dir/sample$sample/result.txt | awk -F= '{print $2}'`
iteration_samples="$iteration_samples $value"
done
avg_stddev_result=`avg-stddev $iteration_samples`
avg_stddev_result=`pbench-avg-stddev $iteration_samples`
samples[$key_nr]="$iteration_samples"
avg[$key_nr]=`echo $avg_stddev_result | awk '{print $1}'`
stddev[$key_nr]=`echo $avg_stddev_result | awk '{print $2}'`
Expand Down Expand Up @@ -786,6 +786,6 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
done
printf -- "</pre>\n" >>$benchmark_summary_html_file
collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir end

rmdir $benchmark_run_dir/.running
1 change: 0 additions & 1 deletion agent/bench-scripts/test-bin/avg-stddev
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions agent/bench-scripts/test-bin/pbench-avg-stddev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../agent/util-scripts/pbench-avg-stddev
0 agent/bench-scripts/test-bin/collect-sysinfo → ...h-scripts/test-bin/pbench-collect-sysinfo
View file
Open in desktop
File renamed without changes.
0 .../bench-scripts/test-bin/postprocess-tools → ...scripts/test-bin/pbench-postprocess-tools
View file
Open in desktop
File renamed without changes.
0 agent/bench-scripts/test-bin/start-tools → ...bench-scripts/test-bin/pbench-start-tools
View file
Open in desktop
File renamed without changes.
0 agent/bench-scripts/test-bin/stop-tools → .../bench-scripts/test-bin/pbench-stop-tools
View file
Open in desktop
File renamed without changes.
Loading