Merge branch 'master' into benchmark

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

diff --cc configure.ac
index e445a327831b31e8deb76c8d5c5a59c33d9e34c8,b38b0e2ea8990832faabe978aade15fe43e02908..b4accb0e5a7a3888db09ffc6bc215b1bdb43559f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -25,16 -25,10 +25,15 @@@ AC_CHECK_LIB([popt], [poptGetContext], 
        [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
  )
  
- # Check liburcu list.h, wfqueue.h, futex.h
- AC_CHECK_DECL([cds_list_add], [],
-       [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
- )
- 
- # Check liburcu
++# Needed for benchmark time
 +AC_CHECK_DECL([caa_get_cycles], [],
 +      [AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
 +)
 +
+ # 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>]]
+ )
  AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
  )

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

diff --cc ltt-sessiond/main.c
index 16067d354b7581d408b2bc2b9f08f804ed3911ee,e1bf1e416b49be23b8ca860d21062249b70a01df..07a4ba6de0e7284d98a2aa8f383777ed839bd4d6
--- 1/ltt-sessiond/main.c
--- 2/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -1021,11 -984,9 +1021,11 @@@ static void *thread_manage_apps(void *d
                                                perror("read apps cmd pipe");
                                                goto error;
                                        }
 +                                      tracepoint(ust_register_read_stop);
  
 +                                      tracepoint(ust_register_add_start);
                                        /* Register applicaton to the session daemon */
-                                       ret = register_traceable_app(&ust_cmd.reg_msg,
+                                       ret = ust_app_register(&ust_cmd.reg_msg,
                                                        ust_cmd.sock);
                                        if (ret < 0) {
                                                /* Only critical ENOMEM error can be returned here */