X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=fa7672b5834a370f3484ae43cb3d8f2306ba937a;hp=aea667cd116d2fea0132bffec7782b065fc71536;hb=a914e76ac1a529191035f1fec439026c83beee3f;hpb=3e3665b89947ebdd812bcfaca1090d22b34d5778

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index aea667cd1..fa7672b58 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -478,7 +478,7 @@ static int create_kernel_session(struct ltt_session *session)
 
 	DBG("Creating kernel session");
 
-	ret = kernel_create_session(session, kernel_tracer_fd);
+	ret = kernel_create_session(session);
 	if (ret < 0) {
 		ret = LTTNG_ERR_KERN_SESS_FAIL;
 		goto error_create;
@@ -879,6 +879,15 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			goto error;
 		}
 
+		/* Kernel tracer check */
+		if (!kernel_tracer_is_initialized()) {
+			/* Basically, load kernel tracer modules */
+			ret = init_kernel_tracer();
+			if (ret != 0) {
+				goto error;
+			}
+		}
+
 		/* Consumer is in an ERROR state. Report back to client */
 		if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_KERNCONSUMERD;
@@ -1703,13 +1712,15 @@ error_add_context:
 	}
 	case LTTNG_SNAPSHOT_ADD_OUTPUT:
 	{
+		uint32_t snapshot_id;
 		struct lttcomm_lttng_output_id reply;
 
 		ret = cmd_snapshot_add_output(cmd_ctx->session,
-				&cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
+				&cmd_ctx->lsm->u.snapshot_output.output, &snapshot_id);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
+		reply.id = snapshot_id;
 
 		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &reply,
 			sizeof(reply));
@@ -1835,7 +1846,8 @@ error_add_context:
 			goto error;
 		}
 
-		ret = cmd_rotate_session(cmd_ctx->session, &rotate_return);
+		ret = cmd_rotate_session(cmd_ctx->session, &rotate_return,
+				false);
 		if (ret < 0) {
 			ret = -ret;
 			goto error;