summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2016-01-31 23:10:30 +0100
committerAndré Nusser <andre.nusser@googlemail.com>2016-01-31 23:10:30 +0100
commit9310177b736ddf8c6599f685cd38191a95933202 (patch)
tree40b8a2f5d952065fd77737af0185e4e7217bda88
parent7985de37c0fad8500d69d3702a0cd58eb97d1030 (diff)
Give the test scripts a '.sh' ending. Small improvements to perf. test.
-rw-r--r--tools/performance_test/performance_test.gnuplot2
-rwxr-xr-xtools/performance_test/performance_test.sh (renamed from tools/performance_test/performance_test)7
-rwxr-xr-xtools/valgrind_test/valgrind_test.sh (renamed from tools/valgrind_test/valgrind_test)0
3 files changed, 6 insertions, 3 deletions
diff --git a/tools/performance_test/performance_test.gnuplot b/tools/performance_test/performance_test.gnuplot
index a145100..68743c4 100644
--- a/tools/performance_test/performance_test.gnuplot
+++ b/tools/performance_test/performance_test.gnuplot
@@ -1,5 +1,5 @@
set style line 1 lc rgb '#0060ad' lt 1 lw 2 pt 7 ps 1.5
-set terminal png size 400,300 enhanced font "Helvetica,10"
+set terminal png size 800,600 enhanced font "Helvetica,10"
set xlabel "time"
set output 'cpu_data.png'
set ylabel "CPU usage in %"
diff --git a/tools/performance_test/performance_test b/tools/performance_test/performance_test.sh
index 608b3ea..eb6d45d 100755
--- a/tools/performance_test/performance_test
+++ b/tools/performance_test/performance_test.sh
@@ -11,6 +11,7 @@ cpu_plot_file="cpu_plot"
ram_plot_file="ram_plot"
cpu_data_file="cpu_data.dat"
ram_data_file="ram_data.dat"
+dg_log_file="drumgizmo.log"
# check for right number of parameters
if [[ $# != 3 ]]
@@ -61,6 +62,7 @@ fi
echo "============================"
echo "Starting the performace test"
echo "============================"
+echo
# initial data values
cpu_data=""
@@ -99,11 +101,12 @@ function plotData
}
# start dg
-echo $kit
-$dg_path/./drumgizmo -i midifile -I file="$midifile",midimap="$midimap" -o jackaudio "$kit" &
+echo "The terminal output of drumgizmo is routed to ${dg_log_file}"
+$dg_path/./drumgizmo -i midifile -I file="$midifile",midimap="$midimap" -o jackaudio "$kit" > $dg_log_file 2>&1 &
pid=$!
# collect data while dg is running
+echo "Collecting the data now. That might take a while..."
while ps -p $pid > /dev/null
do
logData $pid
diff --git a/tools/valgrind_test/valgrind_test b/tools/valgrind_test/valgrind_test.sh
index b06342e..b06342e 100755
--- a/tools/valgrind_test/valgrind_test
+++ b/tools/valgrind_test/valgrind_test.sh