Merge branch 'master' into benchmark

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

diff --cc Makefile.am
index bab695466d212894d07d9416e20bfda017e67342,b16632a4a33732e4bee372227c7eca7c80f08311..a02a1d1d35ce0b62c3a809551daa7b532c222885
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -7,7 -5,7 +7,10 @@@ SUBDIRS = src/common/ 
                  include \
                  doc
  
- 
- dist_doc_DATA = ChangeLog
+ dist_doc_DATA = LICENSE \
+                 ChangeLog
+ 
+ EXTRA_DIST = extras/lttng-bash_completion
++
 +bench:
 +      ./benchmark/runall.sh

diff --cc configure.ac
Simple merge

diff --cc src/bin/lttng-sessiond/main.c
index a2f342c3aeaa9a586d0d251465240d494af10262,93417bca04fe213276ed88189d07e11e72a404b3..023c11213d9fc6003465ad9e9806a65faa1753a0
--- 1/src/bin/lttng-sessiond/main.c
--- 2/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@@ -851,11 -830,16 +857,18 @@@ static void *thread_manage_kernel(void 
                /* Zeroed the poll events */
                lttng_poll_reset(&events);
  
 +              tracepoint(sessiond_th_kern_poll);
 +
                /* Poll infinite value of time */
+       restart:
                ret = lttng_poll_wait(&events, -1);
                if (ret < 0) {
+                       /*
+                        * Restart interrupted system call.
+                        */
+                       if (errno == EINTR) {
+                               goto restart;
+                       }
                        goto error;
                } else if (ret == 0) {
                        /* Should not happen since timeout is infinite */
@@@ -946,11 -928,16 +959,18 @@@ static void *thread_manage_consumer(voi
  
        nb_fd = LTTNG_POLL_GETNB(&events);
  
 +      tracepoint(sessiond_th_kcon_poll);
 +
        /* Inifinite blocking call, waiting for transmission */
+ restart:
        ret = lttng_poll_wait(&events, -1);
        if (ret < 0) {
+               /*
+                * Restart interrupted system call.
+                */
+               if (errno == EINTR) {
+                       goto restart;
+               }
                goto error;
        }
  
@@@ -1105,11 -1097,16 +1132,18 @@@ static void *thread_manage_apps(void *d
  
                DBG("Apps thread polling on %d fds", nb_fd);
  
 +              tracepoint(sessiond_th_apps_poll);
 +
                /* Inifinite blocking call, waiting for transmission */
+       restart:
                ret = lttng_poll_wait(&events, -1);
                if (ret < 0) {
+                       /*
+                        * Restart interrupted system call.
+                        */
+                       if (errno == EINTR) {
+                               goto restart;
+                       }
                        goto error;
                }