Merge branch 'master' into benchmark

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

diff --cc configure.ac
index 8a1c162b6e658bdca7030c020868058212e4a2cb,f30b8329d44f9003431207d59db0fdec6074c7c9..c1bff453f9f3add803e7b83a0d6c82db70d5a295
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -22,20 -25,17 +25,22 @@@ AC_CHECK_LIB([popt], [poptGetContext], 
        [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
  )
  
- # Check liburcu list.h
+ # Check liburcu list.h, wfqueue.h, futex.h
  AC_CHECK_DECL([cds_list_add], [],
-       [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
+       [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
  )
  
- <<<<<<< HEAD
 +# Check liburcu
 +AC_CHECK_DECL([caa_get_cycles], [],
-       [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/arch.h>]]
- =======
- # Check liburcu wfqueue.h
++      [AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
++)
++
  AC_CHECK_DECL([cds_wfq_init], [],
-       [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/wfqueue.h>]]
- >>>>>>> master
+       [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+ )
+ 
+ AC_CHECK_DECL([futex_async], [],
+       [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
  )
  
  AC_PROG_CC

diff --cc ltt-sessiond/Makefile.am
Simple merge

diff --cc ltt-sessiond/main.c
index 631812cae934c676577e44bd34522addeb756d7e,85ac06be9e32c2967417513b7902d2b226b303ba..aa44351cad214ba29c09b5345bba27e9b8123593
--- 1/ltt-sessiond/main.c
--- 2/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -48,10 -52,8 +52,10 @@@
  #include "traceable-app.h"
  #include "ust-ctl.h"
  #include "utils.h"
- #include "ust-comm.h"
+ #include "ust-ctl.h"
  
 +#include "benchmark.h"
 +
  /* Const values */
  const char default_home_dir[] = DEFAULT_HOME_DIR;
  const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;
@@@ -254,16 -293,10 +295,18 @@@ static void cleanup(void
        DBG("Closing kernel fd");
        close(kernel_tracer_fd);
  
-       DBG("Unloading kernel modules");
-       modprobe_remove_kernel_modules();
+       if (is_root) {
+               DBG("Unloading kernel modules");
+               modprobe_remove_kernel_modules();
+       }
 +
 +      /* OUTPUT BENCHMARK RESULTS */
 +      bench_init();
 +
 +      bench_print_boot_process();
 +
 +      bench_close();
 +      /* END BENCHMARK */
  }
  
  /*