X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=048c1e16d83feb66ff4c499470189e655e163727;hb=a24f05ab8afe43b1122d1fd6a4f4346443e0084a;hp=3b27c6f36fee19ca345add26ba6f427c2a253f27;hpb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 3b27c6f36..048c1e16d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -390,6 +390,51 @@ static void stop_threads(void)
 	futex_nto1_wake(&ust_cmd_queue.futex);
 }
 
+/*
+ * Close every consumer sockets.
+ */
+static void close_consumer_sockets(void)
+{
+	int ret;
+
+	if (kconsumer_data.err_sock >= 0) {
+		ret = close(kconsumer_data.err_sock);
+		if (ret < 0) {
+			PERROR("kernel consumer err_sock close");
+		}
+	}
+	if (ustconsumer32_data.err_sock >= 0) {
+		ret = close(ustconsumer32_data.err_sock);
+		if (ret < 0) {
+			PERROR("UST consumerd32 err_sock close");
+		}
+	}
+	if (ustconsumer64_data.err_sock >= 0) {
+		ret = close(ustconsumer64_data.err_sock);
+		if (ret < 0) {
+			PERROR("UST consumerd64 err_sock close");
+		}
+	}
+	if (kconsumer_data.cmd_sock >= 0) {
+		ret = close(kconsumer_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("kernel consumer cmd_sock close");
+		}
+	}
+	if (ustconsumer32_data.cmd_sock >= 0) {
+		ret = close(ustconsumer32_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("UST consumerd32 cmd_sock close");
+		}
+	}
+	if (ustconsumer64_data.cmd_sock >= 0) {
+		ret = close(ustconsumer64_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("UST consumerd64 cmd_sock close");
+		}
+	}
+}
+
 /*
  * Cleanup the daemon
  */
@@ -458,6 +503,8 @@ static void cleanup(void)
 		modprobe_remove_lttng_all();
 	}
 
+	close_consumer_sockets();
+
 	/* <fun> */
 	DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
 			"Matthew, BEET driven development works!%c[%dm",
@@ -646,7 +693,8 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 
 						pthread_mutex_lock(socket->lock);
 						ret = kernel_consumer_send_channel_stream(socket,
-								channel, ksess);
+								channel, ksess,
+								session->output_traces ? 1 : 0);
 						pthread_mutex_unlock(socket->lock);
 						if (ret < 0) {
 							rcu_read_unlock();
@@ -1101,12 +1149,14 @@ error:
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->err_sock = -1;
 	}
 	if (consumer_data->cmd_sock >= 0) {
 		ret = close(consumer_data->cmd_sock);
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->cmd_sock = -1;
 	}
 	if (consumer_data->metadata_sock.fd >= 0) {
 		ret = close(consumer_data->metadata_sock.fd);
@@ -2377,7 +2427,7 @@ static int create_ust_session(struct ltt_session *session,
 
 	lus->uid = session->uid;
 	lus->gid = session->gid;
-
+	lus->output_traces = session->output_traces;
 	session->ust_session = lus;
 
 	/* Copy session output to the newly created UST session */
@@ -2434,6 +2484,7 @@ static int create_kernel_session(struct ltt_session *session)
 
 	session->kernel_session->uid = session->uid;
 	session->kernel_session->gid = session->gid;
+	session->kernel_session->output_traces = session->output_traces;
 
 	return LTTNG_OK;
 
@@ -4094,6 +4145,16 @@ static int set_consumer_sockets(struct consumer_data *consumer_data,
 		goto error;
 	}
 
+	/*
+	 * Set the CLOEXEC flag. Return code is useless because either way, the
+	 * show must go on.
+	 */
+	ret = utils_set_fd_cloexec(consumer_data->err_sock);
+	if (ret < 0) {
+		PERROR("utils_set_fd_cloexec");
+		/* continue anyway */
+	}
+
 	/* File permission MUST be 660 */
 	ret = chmod(consumer_data->err_unix_sock_path,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);