Merge branch 'master' into benchmark

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

diff --cc configure.ac
index 7af39997a47de01d8e0488757da01b23bcbd9fc1,02698885375515674b0ee2f68795dbd5dd67c05f..8a1c162b6e658bdca7030c020868058212e4a2cb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -27,9 -27,9 +27,15 @@@ AC_CHECK_DECL([cds_list_add], []
        [AC_MSG_ERROR([liburcu 0.5.4 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_CHECK_DECL([cds_wfq_init], [],
+       [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/wfqueue.h>]]
++>>>>>>> master
  )
  
  AC_PROG_CC

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

diff --cc ltt-sessiond/main.c
index 78682f3a4eeeb27d318e5ad931b1c0f79b8e4bc6,b636986f832d7352b572c5a08fbcbaf92ceadfc7..631812cae934c676577e44bd34522addeb756d7e
--- 1/ltt-sessiond/main.c
--- 2/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -47,9 -48,8 +48,10 @@@
  #include "traceable-app.h"
  #include "ust-ctl.h"
  #include "utils.h"
+ #include "ust-comm.h"
  
 +#include "benchmark.h"
 +
  /* Const values */
  const char default_home_dir[] = DEFAULT_HOME_DIR;
  const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;
@@@ -819,20 -1043,13 +1061,25 @@@ static void *thread_registration_apps(v
  {
        int sock = 0, ret;
        struct pollfd pollfd[2];
+       /*
+        * Get allocated in this thread, enqueued to a global queue, dequeued and
+        * freed in the manage apps thread.
+        */
+       struct ust_command *ust_cmd = NULL;
  
-       DBG("[thread] Manage apps started");
 +      tracepoint(sessiond_th_apps_start);
 +
 +      /* TODO: Something more elegant is needed but fine for now */
 +      /* FIXME: change all types to either uint8_t, uint32_t, uint64_t
 +       * for 32-bit vs 64-bit compat processes. */
 +      /* replicate in ust with version number */
 +      struct {
 +              int reg;        /* 1:register, 0:unregister */
 +              pid_t pid;
 +              uid_t uid;
 +      } reg_msg;
 +
+       DBG("[thread] Manage application registration started");
  
        ret = lttcomm_listen_unix_sock(apps_sock);
        if (ret < 0) {