From 7b4dff181b075328f113c62bef8e3b347cedb37a Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 27 Jan 2012 11:31:26 -0500 Subject: [PATCH] Fix benchmarks with the new dir structure of master branch Signed-off-by: David Goulet --- Makefile.am | 5 +++-- benchmark/Makefile.am | 7 ++++--- benchmark/bench-sessions.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 35828f2db..b6c5a7a0d 100644 --- 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 ae66f87df..ae5bb91a9 100644 --- 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 f56312e35..440b26e78 100644 --- a/benchmark/bench-sessions.c +++ b/benchmark/bench-sessions.c @@ -25,7 +25,7 @@ #include #include -#include "lttng-sessiond/session.h" +#include #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"); -- 2.34.1