Bugfix/master

Readme.md

@@ -1,5 +1,12 @@
 # Lockbench - A benchmarks suite for evaluating lock implementations
 
+### Dependencies
+
+Install these software before using Lockbench:
+
+1. gnuplot
+2. texlive-font-utils
+
 ### Build
 
 Compile the suite by simply typing make and tests will be ready to run.
@@ -21,14 +28,19 @@ It will generate a configuration file in `script/machine_conf/`.
 Now, you can run standard benchmarks by executing:
 
 ```sh
-$ ./run_rand_batch_test.sh machine_conf/<your machine conf> tests_conf/<tests conf> thread_conf/<thread conf>
+$ ./run_rand_batch_test.sh machine_conf/<your_machine.conf> tests_conf/<test_selected.conf> thread_conf/<threads_selected.conf>
 ```
 
 ### Plotting results
 
 Obtaining plots resuming the benchmark results is quite straightforward, but it might require some minutes.
-1. First aggregate results by executing the following command
-`./generate_dat.sh machine_conf/<your machine conf> tests_conf/<tests conf>`
-2. Obtain the plots
-`./plot_results.sh machine_conf/<your machine conf> tests_conf/<tests conf>`
+
+1. First aggregate results by executing the following command:
+```sh
+$ ./generate_dat.sh tests_conf/<test_selected.conf> machine_conf/<your_machine.conf> thread_conf/<threads_selected.conf>
+```
+2. Obtain the plots:
+```sh
+$ ./plot_results.sh tests_conf/<test_selected.conf> machine_conf/<your_machine.conf> thread_conf/<threads_selected.conf>
+```
 3. Find the charts in the `plots` directory

script/create_machine_conf.sh

@@ -25,7 +25,7 @@ make clean
 cd ..
 
 val=`../bin/test-QUEUED_SPINLOCK_LOCK -s 1 -rnd_cs_lower 100000 -rnd_cs_higher 100000 -rnd_ncs_lower 0 -rnd_ncs_higher 0 -t 1 -seq | grep CS/sec`
-val=`python -c "print '$val'.strip().split(' ')[-1]"` 
+val=`python -c "print ('$val'.strip().split(' ')[-1])"`
 result=`echo 100000/$val | bc`
 echo LAST LOOPER $result
 
@@ -34,20 +34,20 @@ cpucount=`lscpu | grep "CPU(s):"|head -n1`
 vendor=`lscpu | grep "Vendor ID"`
 
 
-cpu=`python -c "print '$cpu'.split(':')[1]"`
-cpucount=`python -c "print '$cpucount'.split(':')[1].replace(' ', '')"`
-vendor=`python -c "print '$vendor'.split(':')[1].replace(' ', '')"`
+cpu=`python -c "print ('$cpu'.split(':')[1])"`
+cpucount=`python -c "print ('$cpucount'.split(':')[1].replace(' ', ''))"`
+vendor=`python -c "print ('$vendor'.split(':')[1].replace(' ', ''))"`
 cpu_label=$cpu
-cpu_label=`python -c "print '$cpu_label'.replace('Intel(R) ', '').replace('Xeon(R)', '').replace('Core(TM)', '').replace('CPU', '').replace(' ', '').split('@')[0]"`
-cpu_label=`python -c "print '$cpu_label'.replace('(tm)', '').replace('AMD', '').replace('Processor', '-').replace(' ', '')"`
+cpu_label=`python -c "print ('$cpu_label'.replace('Intel(R) ', '').replace('Xeon(R)', '').replace('Core(TM)', '').replace('CPU', '').replace(' ', '').split('@')[0])"`
+cpu_label=`python -c "print ('$cpu_label'.replace('(tm)', '').replace('AMD', '').replace('Processor', '-').replace(' ', ''))"`
 
-python -c "print '$cpu_label'"
-python -c "print '$cpucount'"
-python -c "print '$vendor'"
+python -c "print ('$cpu_label')"
+python -c "print ('$cpucount')"
+python -c "print ('$vendor')"
 
 
 distro=`lsb_release -a | grep Descr`
-distro=`python -c "print '$distro'.split(':')[1].strip()"`
+distro=`python -c "print ('$distro'.split(':')[1].strip())"`
 
 file="machine_conf/`uname -n`.conf"
 

script/generate_dat.sh

@@ -2,6 +2,7 @@
 
 # $1 confing_test
 # $2 confing_machine
+# $3 confing_thread
 
 
 
@@ -44,9 +45,20 @@ FOLDER="batch_res_${LOWER_RANGE_CS}_${UPPER_RANGE_CS}_${LOWER_RANGE_NCS}_${UPPER
 SRC_FOLDER="../out/${MACHINE_NAME}-out-$FOLDER/dat"
 DST_FOLDER="../out/${MACHINE_NAME}-out-$FOLDER/dat-aggregated"
 
-if [ ! -d ../out ]; then
+
+# if './out' directory exists remove it and run './utils/aggregate_rand_batch_test.sh'
+# if './out' directory does not exist run './utils/aggregate_rand_batch_test.sh'
+# '../out' because when executing 'generate_dat.sh' we are in the directory 'lockbench/script/' and 'out' is in 'lockbench/out/'
+if [ -d ../out ]; then
+	echo "The './out' directory exists: removing it."
+	rm ../out -r
+	echo "Aggregating data..."
+	./utils/aggregate_rand_batch_test.sh $1 $2 $3
+	echo "DONE!"
+elif [ ! -d ../out ]; then
+	echo "The './out' directory does not exist."
 	echo "Aggregating data..."
-	./utils/aggregate_rand_batch_test.sh $1 $2
+	./utils/aggregate_rand_batch_test.sh $1 $2 $3
 	echo "DONE!"
 fi
 

script/plotresults.sh → script/plot_results.sh

@@ -3,7 +3,7 @@
 
 # $1 confing_test
 # $2 confing_machine
-
+# $3 confing_thread
 
 source  ./$1
 source  ./$2

script/run_rand_batch_test.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-# $1 confing_test
-# $2 confing_machine
+# $1 confing_machine
+# $2 confing_test
+# $3 confing_thread
 
 MAX_RETRY="5"
 

script/utils/aggregate_rand_batch_test.sh

@@ -6,6 +6,7 @@
 
 # $1 confing_test
 # $2 confing_machine
+# $3 confing_thread
 
 source  ./$1
 source  ./$2