Fix benchmarks with the new dir structure of master branch

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index 35828f2db8c7bf8c1da4f7d6db5896aca1eb80a2..b6c5a7a0d25bd3425f8a1b456c274c4398cdef2f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,10 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = src \
+SUBDIRS = src/common/ \
+                 benchmark \
+                 src \
                  tests \
                  include \
-                 benchmark \
                  doc
 
 bench:

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index ae66f87df1111de9d6e1d7d437c880fe63ade97a..ae5bb91a9e5543ae832ec55b4494ef8a9de1f04d 100644 (file)
--- a/benchmark/Makefile.am
+++ b/benchmark/Makefile.am
@@ -1,16 +1,17 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = liblttng-benchmark.la
 
 noinst_PROGRAMS = bench_sessions
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
 
 liblttng_benchmark_la_SOURCES = benchmark.c benchmark.h cpu.c cpu.h
 
 bench_sessions_SOURCES = bench-sessions.c $(SESSIONS) $(UTILS)
-bench_sessions_LDADD = $(top_builddir)/benchmark/liblttng-benchmark.la
+bench_sessions_LDADD = $(top_builddir)/benchmark/liblttng-benchmark.la \
+                                          $(top_builddir)/src/common/libcommon.la
 
 bench:
        ./runall.sh

diff --git a/benchmark/bench-sessions.c b/benchmark/bench-sessions.c
index f56312e35d96231f8c2ba7a8bfab95c3cc5b9b7b..440b26e787874ebbe92c06450d2afac8c3576647 100644 (file)
--- a/benchmark/bench-sessions.c
+++ b/benchmark/bench-sessions.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "lttng-sessiond/session.h"
+#include <bin/lttng-sessiond/session.h>
 #include "utils.h"
 #include "benchmark.h"
 
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
                names[i] = get_random_string();
                ret = system("echo 3 >/proc/sys/vm/drop_caches");
                tracepoint(create_session_start);
-               ret = session_create(names[i], PATH1);
+               ret = session_create(names[i], PATH1, getuid(), getgid());
                tracepoint(create_session_end);
                if (ret < 0) {
                        printf("Create session went wrong. Aborting\n");