From: David Goulet <dgoulet@efficios.com>
Date: Mon, 9 Jan 2012 21:35:12 +0000 (-0500)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=56fe0b922a643df9f95524a32f456ed42802f55a;p=lttng-tools.git

Merge branch 'master' into benchmark

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

56fe0b922a643df9f95524a32f456ed42802f55a
diff --cc Makefile.am
index ae88bcaa0,3b6344fa6..fa7f5ec56
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,8 -1,9 +1,10 @@@
  ACLOCAL_AMFLAGS = -I config
  
 -SUBDIRS = common \
 +SUBDIRS = benchmark \
++		  common \
  		  liblttng-sessiond-comm \
  		  libkernelctl \
+ 		  liblttng-ht \
  		  liblttng-kconsumer \
  		  liblttng-ustconsumer \
  		  liblttng-consumer \
diff --cc configure.ac
index e4084aed3,6bddf8783..eb0b3a05a
--- a/configure.ac
+++ b/configure.ac
@@@ -57,13 -57,8 +57,13 @@@ AC_CHECK_LIB([popt], [poptGetContext], 
  	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
  )
  
 +# Needed for benchmark time
 +AC_CHECK_DECL([caa_get_cycles], [],
 +	[AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
 +)
 +
  # URCU library version needed or newer
- liburcu_version=">= 0.6.6"
+ liburcu_version=">= 0.6.7"
  
  # Check liburcu needed function calls
  AC_CHECK_DECL([cds_list_add], [],
@@@ -137,7 -132,7 +137,8 @@@ AC_SUBST(DEFAULT_INCLUDES
  AC_CONFIG_FILES([
  	Makefile
  	include/Makefile
 +	benchmark/Makefile
+ 	common/Makefile
  	libkernelctl/Makefile
  	liblttng-consumer/Makefile
  	liblttng-kconsumer/Makefile
diff --cc lttng-sessiond/Makefile.am
index db621d8e3,8fcea947e..829f9abb0
--- a/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@@ -40,7 -37,8 +37,9 @@@ lttng_sessiond_LDADD = -lrt -lurcu-comm
  		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
  		 $(top_builddir)/libkernelctl/libkernelctl.la \
  		 $(top_builddir)/liblttngctl/liblttngctl.la \
- 		 $(top_builddir)/benchmark/liblttng-benchmark.la
++		 $(top_builddir)/benchmark/liblttng-benchmark.la \
+ 		 $(top_builddir)/common/libcommon.la \
+ 		 $(top_builddir)/liblttng-ht/liblttng-ht.la
  
  if HAVE_LIBLTTNG_UST_CTL
  lttng_sessiond_LDADD += -llttng-ust-ctl
diff --cc lttng-sessiond/main.c
index d8f2125a4,91db9677a..6d6af18e2
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@@ -470,27 -469,8 +471,27 @@@ static void cleanup(void
  	close(thread_quit_pipe[0]);
  	close(thread_quit_pipe[1]);
  
 +	/* OUTPUT BENCHMARK RESULTS */
 +	bench_init();
 +
 +	if (getenv("BENCH_UST_NOTIFY")) {
 +		bench_print_ust_notification();
 +	}
 +
 +	if (getenv("BENCH_UST_REGISTER")) {
 +		bench_print_ust_register();
 +		bench_print_ust_unregister();
 +	}
 +
 +	if (getenv("BENCH_BOOT_PROCESS")) {
 +		bench_print_boot_process();
 +	}
 +
 +	bench_close();
 +	/* END BENCHMARK */
 +
  	/* <fun> */
- 	MSG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
+ 	DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
  			"Matthew, BEET driven development works!%c[%dm",
  			27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
  	/* </fun> */
@@@ -3454,10 -3465,8 +3528,10 @@@ static int process_client_msg(struct co
  	}
  	case LTTNG_CREATE_SESSION:
  	{
 +		tracepoint(create_session_start);
  		ret = cmd_create_session(cmd_ctx->lsm->session.name,
- 				cmd_ctx->lsm->session.path);
+ 				cmd_ctx->lsm->session.path, &cmd_ctx->creds);
 +		tracepoint(create_session_end);
  		break;
  	}
  	case LTTNG_DESTROY_SESSION: