X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=cef1040563b1f84ae2af85235c80752aa4cabfe9;hb=41e16a7c24eed8c602399781ff545b99930d73c6;hp=3a8a1b27cf5e403389ba0b962ac775ec1040e158;hpb=ef367a93d16bb6f1a32e50e3538a56d4f18fe715;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 3a8a1b27c..cef104056 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -155,6 +155,7 @@ static const struct option long_options[] = {
 	{ "jul-tcp-port", 1, 0, 'J' },
 	{ "config", 1, 0, 'f' },
 	{ "load", 1, 0, 'l' },
+	{ "kmod-probes", 1, 0, 'P' },
 	{ NULL, 0, 0, 0 }
 };
 
@@ -2821,6 +2822,38 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		break;
 	}
 
+	/*
+	 * Commands that need a valid session but should NOT create one if none
+	 * exists. Instead of creating one and destroying it when the command is
+	 * handled, process that right before so we save some round trip in useless
+	 * code path.
+	 */
+	switch (cmd_ctx->lsm->cmd_type) {
+	case LTTNG_DISABLE_CHANNEL:
+	case LTTNG_DISABLE_EVENT:
+	case LTTNG_DISABLE_ALL_EVENT:
+		switch (cmd_ctx->lsm->domain.type) {
+		case LTTNG_DOMAIN_KERNEL:
+			if (!cmd_ctx->session->kernel_session) {
+				ret = LTTNG_ERR_NO_CHANNEL;
+				goto error;
+			}
+			break;
+		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_UST:
+			if (!cmd_ctx->session->ust_session) {
+				ret = LTTNG_ERR_NO_CHANNEL;
+				goto error;
+			}
+			break;
+		default:
+			ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+			goto error;
+		}
+	default:
+		break;
+	}
+
 	if (!need_domain) {
 		goto skip_domain;
 	}
@@ -4132,6 +4165,7 @@ static void usage(void)
 	fprintf(stderr, "      --jul-tcp-port                 JUL application registration TCP port\n");
 	fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
 	fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
+	fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
 }
 
 /*
@@ -4164,7 +4198,20 @@ static int set_option(int opt, const char *arg, const char *optname)
 		opt_background = 1;
 		break;
 	case 'g':
+		/*
+		 * If the override option is set, the pointer points to a
+		 * *non* const thus freeing it even though the variable type is
+		 * set to const.
+		 */
+		if (tracing_group_name_override) {
+			free((void *) tracing_group_name);
+		}
 		tracing_group_name = strdup(arg);
+		if (!tracing_group_name) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
+		tracing_group_name_override = 1;
 		break;
 	case 'h':
 		usage();
@@ -4202,10 +4249,15 @@ static int set_option(int opt, const char *arg, const char *optname)
 	case 'v':
 		/* Verbose level can increase using multiple -v */
 		if (arg) {
+			/* Value obtained from config file */
 			lttng_opt_verbose = config_parse_value(arg);
 		} else {
-			lttng_opt_verbose += 1;
+			/* -v used on command line */
+			lttng_opt_verbose++;
 		}
+		/* Clamp value to [0, 3] */
+		lttng_opt_verbose = lttng_opt_verbose < 0 ? 0 :
+			(lttng_opt_verbose <= 3 ? lttng_opt_verbose : 3);
 		break;
 	case 'Z':
 		if (arg) {
@@ -4215,23 +4267,56 @@ static int set_option(int opt, const char *arg, const char *optname)
 		}
 		break;
 	case 'u':
+		if (consumerd32_bin_override) {
+			free((void *) consumerd32_bin);
+		}
 		consumerd32_bin = strdup(arg);
+		if (!consumerd32_bin) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
 		consumerd32_bin_override = 1;
 		break;
 	case 'U':
+		if (consumerd32_libdir_override) {
+			free((void *) consumerd32_libdir);
+		}
 		consumerd32_libdir = strdup(arg);
+		if (!consumerd32_libdir) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
 		consumerd32_libdir_override = 1;
 		break;
 	case 't':
+		if (consumerd64_bin_override) {
+			free((void *) consumerd64_bin);
+		}
 		consumerd64_bin = strdup(arg);
+		if (!consumerd64_bin) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
 		consumerd64_bin_override = 1;
 		break;
 	case 'T':
+		if (consumerd64_libdir_override) {
+			free((void *) consumerd64_libdir);
+		}
 		consumerd64_libdir = strdup(arg);
+		if (!consumerd64_libdir) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
 		consumerd64_libdir_override = 1;
 		break;
 	case 'p':
+		free(opt_pidfile);
 		opt_pidfile = strdup(arg);
+		if (!opt_pidfile) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
 		break;
 	case 'J': /* JUL TCP port. */
 	{
@@ -4252,12 +4337,24 @@ static int set_option(int opt, const char *arg, const char *optname)
 		break;
 	}
 	case 'l':
+		free(opt_load_session_path);
 		opt_load_session_path = strdup(arg);
 		if (!opt_load_session_path) {
 			perror("strdup");
 			ret = -ENOMEM;
 		}
 		break;
+	case 'P': /* probe modules list */
+		free(kmod_probes_list);
+		kmod_probes_list = strdup(arg);
+		if (!kmod_probes_list) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
+		break;
+	case 'f':
+		/* This is handled in set_options() thus silent break. */
+		break;
 	default:
 		/* Unknown option or other error.
 		 * Error is printed by getopt, just return */
@@ -5190,7 +5287,7 @@ int main(int argc, char **argv)
 	ret = pthread_create(&apps_notify_thread, NULL,
 			ust_thread_manage_notify, (void *) NULL);
 	if (ret != 0) {
-		PERROR("pthread_create apps");
+		PERROR("pthread_create notify");
 		goto exit_apps_notify;
 	}
 
@@ -5198,7 +5295,7 @@ int main(int argc, char **argv)
 	ret = pthread_create(&jul_reg_thread, NULL,
 			jul_thread_manage_registration, (void *) NULL);
 	if (ret != 0) {
-		PERROR("pthread_create apps");
+		PERROR("pthread_create JUL");
 		goto exit_jul_reg;
 	}