From: David Goulet <dgoulet@efficios.com>
Date: Tue, 28 Feb 2012 21:10:07 +0000 (-0500)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4e76e518e4b2a82cb43ddc1da4f1943e9334df3b;p=lttng-tools.git

Merge branch 'master' into benchmark

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

4e76e518e4b2a82cb43ddc1da4f1943e9334df3b
diff --cc Makefile.am
index bab695466,b16632a4a..a02a1d1d3
--- a/Makefile.am
+++ b/Makefile.am
@@@ -7,7 -5,7 +7,10 @@@ SUBDIRS = src/common/ 
  		  include \
  		  doc
  
+ dist_doc_DATA = LICENSE \
+                 ChangeLog
+ 
+ EXTRA_DIST = extras/lttng-bash_completion
++
 +bench:
 +	./benchmark/runall.sh
- 
- dist_doc_DATA = ChangeLog
diff --cc src/bin/lttng-sessiond/main.c
index a2f342c3a,93417bca0..023c11213
--- a/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;
  		}