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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 048c1e16d..e05d72bac 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -446,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);
 
 	/*
@@ -675,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
@@ -2428,6 +2433,7 @@ 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 */
@@ -2485,6 +2491,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;
+	session->kernel_session->snapshot_mode = session->snapshot_mode;
 
 	return LTTNG_OK;
 
@@ -2540,6 +2547,7 @@ 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:
@@ -2602,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:
@@ -3293,6 +3302,45 @@ skip_domain:
 				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;
@@ -4583,6 +4631,9 @@ int main(int argc, char **argv)
 
 	write_pidfile();
 
+	/* Initialize communication library */
+	lttcomm_init();
+
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&ht_cleanup_thread, NULL,
 			thread_ht_cleanup, (void *) NULL);