X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=7d63656e4c401b9d66037d2c9d8126974cf6f4c5;hb=4fba72199030f1171956ad2ebf18ee7a8903eba6;hp=227f0c2f7f41a0cac7325248d1f5072e6f07494d;hpb=67e407978a700da256ab4f58736002826c7be7c1;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 227f0c2f7..7d63656e4 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -92,6 +92,7 @@ const char *progname;
 const char *opt_tracing_group;
 static int opt_sig_parent;
 static int opt_daemon;
+static int opt_no_kernel;
 static int is_root;			/* Set to 1 if the daemon is running as root */
 static pid_t ppid;          /* Parent PID for --sig-parent option */
 static char *rundir;
@@ -457,10 +458,9 @@ static void cleanup(void)
 
 	pthread_mutex_destroy(&kconsumer_data.pid_mutex);
 
-	DBG("Closing kernel fd");
-	close(kernel_tracer_fd);
-
-	if (is_root) {
+	if (is_root && !opt_no_kernel) {
+		DBG2("Closing kernel fd");
+		close(kernel_tracer_fd);
 		DBG("Unloading kernel modules");
 		modprobe_remove_kernel_modules();
 	}
@@ -1580,7 +1580,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 				}
 			}
 			DBG("Using 64-bit UST consumer at: %s",  consumerd64_bin);
-			ret = execl(consumerd64_bin, verbosity, "-u",
+			ret = execl(consumerd64_bin, "lttng-consumerd", verbosity, "-u",
 					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					NULL);
@@ -1624,7 +1624,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 				}
 			}
 			DBG("Using 32-bit UST consumer at: %s",  consumerd32_bin);
-			ret = execl(consumerd32_bin, verbosity, "-u",
+			ret = execl(consumerd32_bin, "lttng-consumerd", verbosity, "-u",
 					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					NULL);
@@ -2772,8 +2772,11 @@ static int cmd_start_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (session->enabled)
-		return LTTCOMM_UST_START_FAIL;
+	if (session->enabled) {
+		ret = LTTCOMM_UST_START_FAIL;
+		goto error;
+	}
+
 	session->enabled = 1;
 
 	/* Kernel tracing */
@@ -2861,8 +2864,11 @@ static int cmd_stop_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (!session->enabled)
-		return LTTCOMM_UST_START_FAIL;
+	if (!session->enabled) {
+		ret = LTTCOMM_UST_START_FAIL;
+		goto error;
+	}
+
 	session->enabled = 0;
 
 	/* Kernel tracer */
@@ -2994,7 +3000,7 @@ static int cmd_register_consumer(struct ltt_session *session, int domain,
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
 		/* Can't register a consumer if there is already one */
-		if (session->kernel_session->consumer_fd != 0) {
+		if (session->kernel_session->consumer_fds_sent != 0) {
 			ret = LTTCOMM_KERN_CONSUMER_FAIL;
 			goto error;
 		}
@@ -3156,6 +3162,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 	DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
 
+	if (opt_no_kernel && cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
+		ret = LTTCOMM_KERN_NA;
+		goto error;
+	}
+
 	/*
 	 * Check for command that don't needs to allocate a returned payload. We do
 	 * this here so we don't have to make the call for no payload at each
@@ -3725,6 +3736,7 @@ static void usage(void)
 	fprintf(stderr, "  -q, --quiet                        No output at all.\n");
 	fprintf(stderr, "  -v, --verbose                      Verbose mode. Activate DBG() macro.\n");
 	fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
+	fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
 }
 
 /*
@@ -3755,12 +3767,13 @@ static int parse_args(int argc, char **argv)
 		{ "quiet", 0, 0, 'q' },
 		{ "verbose", 0, 0, 'v' },
 		{ "verbose-consumer", 0, 0, 'Z' },
+		{ "no-kernel", 0, 0, 'N' },
 		{ NULL, 0, 0, 0 }
 	};
 
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:C:E:D:F:Z:u:t",
+		c = getopt_long(argc, argv, "dhqvVSN" "a:c:g:s:C:E:D:F:Z:u:t",
 				long_options, &option_index);
 		if (c == -1) {
 			break;
@@ -3812,6 +3825,9 @@ static int parse_args(int argc, char **argv)
 		case 'G':
 			snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, "%s", optarg);
 			break;
+		case 'N':
+			opt_no_kernel = 1;
+			break;
 		case 'q':
 			opt_quiet = 1;
 			break;
@@ -4323,7 +4339,9 @@ int main(int argc, char **argv)
 		}
 
 		/* Setup kernel tracer */
-		init_kernel_tracer();
+		if (!opt_no_kernel) {
+			init_kernel_tracer();
+		}
 
 		/* Set ulimit for open files */
 		set_ulimit();