benchmark: fix various problems

diff --git a/tests/benchmark/bench.c b/tests/benchmark/bench.c
index ec08130d764e8d5001a7836ab45ec470fa5b1fd1..bc6a389742de0bf89cf376c2b67419565fa04230 100644 (file)
--- a/tests/benchmark/bench.c
+++ b/tests/benchmark/bench.c
@@ -11,24 +11,22 @@
 #include <unistd.h>
 #include <sched.h>
 #include <ust/marker.h>
+#include <time.h>
 
 static int nr_cpus;
 static unsigned long nr_events;
-pthread_mutex_t        mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void do_stuff(void)
 {
        int v;
        FILE *file;
-       int lock;
 
        v = 1;
 
-       lock = pthread_mutex_lock(&mutex);
-       file = fopen("/tmp/bench.txt", "a");
+       file = fopen("/dev/null", "a");
        fprintf(file, "%d", v);
        fclose(file);
-       lock = pthread_mutex_unlock(&mutex);
+       time(NULL);
 
 #ifdef MARKER
        trace_mark(ust, event, "event %d", v);
@@ -47,7 +45,6 @@ void *function(void *arg)
        return NULL;
 }
 
-
 void usage(char **argv) {
        printf("Usage: %s nr_cpus nr_events\n", argv[0]);
 }

diff --git a/tests/benchmark/run b/tests/benchmark/run
index dfc1125565c36da11ddc43d72233a361a0d03aa2..1e84dc2ba9ab8e68d16ad6e6c70c017d17870079 100755 (executable)
--- a/tests/benchmark/run
+++ b/tests/benchmark/run
@@ -5,7 +5,7 @@
 
 echo "ust benchmark"
 
-NR_EVENTS=2000000
+NR_EVENTS=4000000
 NR_CPUS=2
 echo "using $NR_CPUS processor(s)"
 echo "using $NR_EVENTS events per cpu"
@@ -14,7 +14,8 @@ echo "using $NR_EVENTS events per cpu"
 rm -f /tmp/bench.txt
 # without markers
 echo ">running without markers"
-t1=$(/usr/bin/time -f%e usttrace ./bench1 $NR_CPUS $NR_EVENTS 2>&1 1> /dev/null)
+#t1=$(/usr/bin/time -f%e usttrace ./bench1 $NR_CPUS $NR_EVENTS 2>&1 1> /dev/null)
+t1=$(/usr/bin/time -f%e ./bench1 $NR_CPUS $NR_EVENTS 2>&1 1> /dev/null)
 echo " time=$t1 sec"
 
 
@@ -31,7 +32,7 @@ penalty=$(echo "$t2 - $t1;" | bc)
 echo "time penalty=$penalty sec"
 
 #event = penalty / (nr_events * nr_cpus)
-event=$(echo "scale=8; ($penalty / ($NR_EVENTS * $NR_CPUS));" | bc)
+event=$(echo "scale=10; ($penalty / ($NR_EVENTS * $NR_CPUS));" | bc)
 echo "time penalty per event=$event sec"
 
 rm -f /tmp/bench.txt