Merge branch 'master' into benchmark

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

diff --cc Makefile.am
index ae88bcaa0cadc5a541533cd7dbb27bdd8d3d76d1,3b6344fa6cc271517eeb24c52de6236cafb8777d..fa7f5ec565a6a4944f55ac413826d488307efdd8
--- 1/Makefile.am
--- 2/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 e4084aed308d7ab1b7ec341a8b5f9955be1ccaba,6bddf8783c61556ea368408f30115ee566167011..eb0b3a05a97a4ff8f4356f4f537819bd1796b80c
--- 1/configure.ac
--- 2/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 db621d8e38999fcee97c5e48ae5a9ad85a6506ce,8fcea947e2fcf20497a8965bfb1aea551bb27602..829f9abb03bf58012ec4b5bf87933effdc8b8c48
--- 1/lttng-sessiond/Makefile.am
--- 2/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 d8f2125a4834066761d41cd6a0133ecfaddeb87c,91db9677abdfd24a6d781db11bd47951f95fbed9..6d6af18e23c35acd599226efb279ab9a71895d5d
--- 1/lttng-sessiond/main.c
--- 2/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: