Merge branch 'master' into benchmark

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --cc Makefile.am
index 279a73ae53ccc2370c6e37363830065c9ff9a1f9,fa5beea9a9df6ddd0d5cdcdd4ee1d7ea0191cbb2..ae88bcaa0cadc5a541533cd7dbb27bdd8d3d76d1
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -6,13 -5,14 +6,17 @@@ SUBDIRS = benchmark 
                  liblttng-kconsumer \
                  liblttng-ustconsumer \
                  liblttng-consumer \
-                 lttng-consumerd \
-                 liblttngctl \
-                 lttng \
-                 lttng-sessiond \
-                 tests \
-                 include \
-                 doc
+                 lttng-consumerd
+ 
+ if ! BUILD_CONSUMERD_ONLY
+ SUBDIRS += liblttngctl \
+            lttng \
+            lttng-sessiond
+ endif
+ 
+ SUBDIRS += tests \
+            include \
+            doc
 +
 +bench:
 +      ./benchmark/runall.sh

diff --cc configure.ac
index 59c6a2838045fee5939c2329391b9d9e0576e960,621f091fd9d57db8e9211a416181ac999f48e1d3..d259b290c880631a1a14a45b307e263d0a98f24f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -29,11 -57,9 +57,14 @@@ 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"
+ 
  # Check liburcu needed function calls
  AC_CHECK_DECL([cds_list_add], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]

diff --cc lttng-sessiond/Makefile.am
index 425a0d58357809e06b5bf6c7eb75f722aa4fe618,7f97d9d2f7e5486c506346320745cefde6453e47..db621d8e38999fcee97c5e48ae5a9ad85a6506ce
--- 1/lttng-sessiond/Makefile.am
--- 2/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@@ -1,5 -1,6 +1,6 @@@
 -AM_CPPFLAGS = -I$(top_srcdir)/include \
 +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/benchmark \
-                         -DINSTALL_BIN_PATH=\"$(bindir)\"
+                         -DINSTALL_BIN_PATH=\""$(bindir)"\" \
+                         -DINSTALL_LIB_PATH=\""$(libdir)"\"
  
  AM_CFLAGS = -fno-strict-aliasing
  
@@@ -35,12 -36,11 +36,12 @@@ endi
  lttng_sessiond_SOURCES += lttng-sessiond.h main.c
  
  # link on liblttngctl for check if sessiond is already alive.
- lttng_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
+ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
                 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
                 $(top_builddir)/libkernelctl/libkernelctl.la \
 -               $(top_builddir)/liblttngctl/liblttngctl.la
 +               $(top_builddir)/liblttngctl/liblttngctl.la \
 +               $(top_builddir)/benchmark/liblttng-benchmark.la
  
- if LTTNG_TOOLS_HAVE_UST
- lttng_sessiond_LDADD += -llttng-ust-comm -lustctl
+ if HAVE_LIBLTTNG_UST_CTL
+ lttng_sessiond_LDADD += -llttng-ust-ctl
  endif

diff --cc lttng-sessiond/main.c
index 04e5efb4f594a8190f2ad99a4570dbaaffc3bca6,75732a334c376cb5a0b5c7fd666c10ffc3cbccde..db0d661016889924c3310e42eec5f1a931e1f834
--- 1/lttng-sessiond/main.c
--- 2/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@@ -391,24 -468,11 +470,30 @@@ 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"
+                       "Matthew, BEET driven development works!%c[%dm",
+                       27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
+       /* </fun> */
  }
  
  /*
@@@ -1077,13 -1137,18 +1177,20 @@@ static void *thread_manage_apps(void *d
                                        /* Register applicaton to the session daemon */
                                        ret = ust_app_register(&ust_cmd.reg_msg,
                                                        ust_cmd.sock);
-                                       if (ret < 0) {
-                                               /* Only critical ENOMEM error can be returned here */
+                                       if (ret == -ENOMEM) {
                                                goto error;
+                                       } else if (ret < 0) {
+                                               break;
                                        }
 +                                      tracepoint(ust_register_add_stop);
  
 +                                      tracepoint(ust_register_done_start);
+                                       /*
+                                        * Add channel(s) and event(s) to newly registered apps
+                                        * from lttng global UST domain.
+                                        */
+                                       update_ust_app(ust_cmd.sock);
+ 
                                        ret = ustctl_register_done(ust_cmd.sock);
                                        if (ret < 0) {
                                                /*