X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=2929bba0d6f677cfdf813e3c89a5bb8d7bc51921;hp=f5a4db4dcb9830e98adc72ec8cd268bf6e7f3795;hb=bd722d76b035766511f0b329f9bbaa2f4180c4ed;hpb=feb0f3e5900ff58202ea0c3f227de3c1b8291952

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f5a4db4dc..2929bba0d 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
  */
@@ -401,7 +446,10 @@ static void cleanup(void)
 
 	DBG("Cleaning up");
 
-	/* First thing first, stop all threads */
+	/*
+	 * Close the thread quit pipe. It has already done its job,
+	 * since we are now called.
+	 */
 	utils_close_pipe(thread_quit_pipe);
 
 	/*
@@ -458,6 +506,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",
@@ -628,6 +678,8 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 				if (ret < 0) {
 					goto error;
 				}
+				/* Update the stream global counter */
+				ksess->stream_count_global += ret;
 
 				/*
 				 * Have we already sent fds to the consumer? If yes, it means
@@ -646,7 +698,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 +1154,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,6 +2432,8 @@ static int create_ust_session(struct ltt_session *session,
 
 	lus->uid = session->uid;
 	lus->gid = session->gid;
+	lus->output_traces = session->output_traces;
+	lus->snapshot_mode = session->snapshot_mode;
 	session->ust_session = lus;
 
 	/* Copy session output to the newly created UST session */
@@ -2433,6 +2490,8 @@ 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;
+	session->kernel_session->snapshot_mode = session->snapshot_mode;
 
 	return LTTNG_OK;
 
@@ -2488,12 +2547,17 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 
 	switch (cmd_ctx->lsm->cmd_type) {
 	case LTTNG_CREATE_SESSION:
+	case LTTNG_CREATE_SESSION_SNAPSHOT:
 	case LTTNG_DESTROY_SESSION:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_DOMAINS:
 	case LTTNG_START_TRACE:
 	case LTTNG_STOP_TRACE:
 	case LTTNG_DATA_PENDING:
+	case LTTNG_SNAPSHOT_ADD_OUTPUT:
+	case LTTNG_SNAPSHOT_DEL_OUTPUT:
+	case LTTNG_SNAPSHOT_LIST_OUTPUT:
+	case LTTNG_SNAPSHOT_RECORD:
 		need_domain = 0;
 		break;
 	default:
@@ -2546,6 +2610,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	/* Commands that DO NOT need a session. */
 	switch (cmd_ctx->lsm->cmd_type) {
 	case LTTNG_CREATE_SESSION:
+	case LTTNG_CREATE_SESSION_SNAPSHOT:
 	case LTTNG_CALIBRATE:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
@@ -3176,6 +3241,106 @@ skip_domain:
 		ret = cmd_data_pending(cmd_ctx->session);
 		break;
 	}
+	case LTTNG_SNAPSHOT_ADD_OUTPUT:
+	{
+		struct lttcomm_lttng_output_id reply;
+
+		ret = cmd_snapshot_add_output(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = setup_lttng_msg(cmd_ctx, sizeof(reply));
+		if (ret < 0) {
+			goto setup_error;
+		}
+
+		/* Copy output list into message payload */
+		memcpy(cmd_ctx->llm->payload, &reply, sizeof(reply));
+		ret = LTTNG_OK;
+		break;
+	}
+	case LTTNG_SNAPSHOT_DEL_OUTPUT:
+	{
+		ret = cmd_snapshot_del_output(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_output.output);
+		break;
+	}
+	case LTTNG_SNAPSHOT_LIST_OUTPUT:
+	{
+		ssize_t nb_output;
+		struct lttng_snapshot_output *outputs = NULL;
+
+		nb_output = cmd_snapshot_list_outputs(cmd_ctx->session, &outputs);
+		if (nb_output < 0) {
+			ret = -nb_output;
+			goto error;
+		}
+
+		ret = setup_lttng_msg(cmd_ctx,
+				nb_output * sizeof(struct lttng_snapshot_output));
+		if (ret < 0) {
+			free(outputs);
+			goto setup_error;
+		}
+
+		if (outputs) {
+			/* Copy output list into message payload */
+			memcpy(cmd_ctx->llm->payload, outputs,
+					nb_output * sizeof(struct lttng_snapshot_output));
+			free(outputs);
+		}
+
+		ret = LTTNG_OK;
+		break;
+	}
+	case LTTNG_SNAPSHOT_RECORD:
+	{
+		ret = cmd_snapshot_record(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_record.output,
+				cmd_ctx->lsm->u.snapshot_record.wait);
+		break;
+	}
+	case LTTNG_CREATE_SESSION_SNAPSHOT:
+	{
+		size_t nb_uri, len;
+		struct lttng_uri *uris = NULL;
+
+		nb_uri = cmd_ctx->lsm->u.uri.size;
+		len = nb_uri * sizeof(struct lttng_uri);
+
+		if (nb_uri > 0) {
+			uris = zmalloc(len);
+			if (uris == NULL) {
+				ret = LTTNG_ERR_FATAL;
+				goto error;
+			}
+
+			/* Receive variable len data */
+			DBG("Waiting for %zu URIs from client ...", nb_uri);
+			ret = lttcomm_recv_unix_sock(sock, uris, len);
+			if (ret <= 0) {
+				DBG("No URIs received from client... continuing");
+				*sock_error = 1;
+				ret = LTTNG_ERR_SESSION_FAIL;
+				free(uris);
+				goto error;
+			}
+
+			if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
+				DBG("Creating session with ONE network URI is a bad call");
+				ret = LTTNG_ERR_SESSION_FAIL;
+				free(uris);
+				goto error;
+			}
+		}
+
+		ret = cmd_create_session_snapshot(cmd_ctx->lsm->session.name, uris,
+				nb_uri, &cmd_ctx->creds);
+		free(uris);
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
@@ -4028,6 +4193,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);