X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=6081fb2b026818b43c60302d1e9d60a316336300;hb=5cfbc08ca9e36ca0d5cac64e2c448cdb5cb863a7;hp=3f3ce4f1493dba040fdae3f1f8a140d5de2338d7;hpb=53e367f936beb2f9a1f49f6a2920c2f58bcb08d7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 3f3ce4f14..6081fb2b0 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3039,6 +3039,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_SNAPSHOT_RECORD:
 	case LTTNG_SAVE_SESSION:
 	case LTTNG_SET_SESSION_SHM_PATH:
+	case LTTNG_METADATA_REGENERATE:
 		need_domain = 0;
 		break;
 	default:
@@ -3316,6 +3317,8 @@ skip_domain:
 	if (cmd_ctx->lsm->cmd_type == LTTNG_START_TRACE ||
 			cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
 		switch (cmd_ctx->lsm->domain.type) {
+		case LTTNG_DOMAIN_NONE:
+			break;
 		case LTTNG_DOMAIN_JUL:
 		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_PYTHON:
@@ -3331,6 +3334,9 @@ skip_domain:
 				goto error;
 			}
 			break;
+		default:
+			ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+			goto error;
 		}
 	}
 
@@ -3873,6 +3879,7 @@ error_add_context:
 		struct lttcomm_event_command_header cmd_header;
 		size_t total_size;
 
+		memset(&cmd_header, 0, sizeof(cmd_header));
 		/* Extended infos are included at the end of events */
 		nb_event = cmd_list_events(cmd_ctx->lsm->domain.type,
 			cmd_ctx->session, cmd_ctx->lsm->u.list.channel_name,
@@ -4142,6 +4149,11 @@ error_add_context:
 				cmd_ctx->lsm->u.set_shm_path.shm_path);
 		break;
 	}
+	case LTTNG_METADATA_REGENERATE:
+	{
+		ret = cmd_metadata_regenerate(cmd_ctx->session);
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
@@ -4644,43 +4656,6 @@ error_create_poll:
 	return NULL;
 }
 
-
-/*
- * usage function on stderr
- */
-static void usage(void)
-{
-	fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
-	fprintf(stderr, "  -h, --help                         Display this usage.\n");
-	fprintf(stderr, "  -c, --client-sock PATH             Specify path for the client unix socket\n");
-	fprintf(stderr, "  -a, --apps-sock PATH               Specify path for apps unix socket\n");
-	fprintf(stderr, "      --kconsumerd-err-sock PATH     Specify path for the kernel consumer error socket\n");
-	fprintf(stderr, "      --kconsumerd-cmd-sock PATH     Specify path for the kernel consumer command socket\n");
-	fprintf(stderr, "      --ustconsumerd32-err-sock PATH Specify path for the 32-bit UST consumer error socket\n");
-	fprintf(stderr, "      --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n");
-	fprintf(stderr, "      --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n");
-	fprintf(stderr, "      --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n");
-	fprintf(stderr, "      --consumerd32-path PATH     Specify path for the 32-bit UST consumer daemon binary\n");
-	fprintf(stderr, "      --consumerd32-libdir PATH   Specify path for the 32-bit UST consumer daemon libraries\n");
-	fprintf(stderr, "      --consumerd64-path PATH     Specify path for the 64-bit UST consumer daemon binary\n");
-	fprintf(stderr, "      --consumerd64-libdir PATH   Specify path for the 64-bit UST consumer daemon libraries\n");
-	fprintf(stderr, "  -d, --daemonize                    Start as a daemon.\n");
-	fprintf(stderr, "  -b, --background                   Start as a daemon, keeping console open.\n");
-	fprintf(stderr, "  -g, --group NAME                   Specify the tracing group name. (default: tracing)\n");
-	fprintf(stderr, "  -V, --version                      Show version number.\n");
-	fprintf(stderr, "  -S, --sig-parent                   Send SIGUSR1 to parent pid to notify readiness.\n");
-	fprintf(stderr, "  -q, --quiet                        No output at all.\n");
-	fprintf(stderr, "  -v, --verbose                      Verbose mode. Activate DBG() macro.\n");
-	fprintf(stderr, "  -p, --pidfile FILE                 Write a pid to FILE name overriding the default value.\n");
-	fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
-	fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
-	fprintf(stderr, "      --agent-tcp-port               Agent registration TCP port\n");
-	fprintf(stderr, "  -f  --config PATH                  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");
-	fprintf(stderr, "      --extra-kmod-probes            Specify extra kernel module probes to load\n");
-}
-
 static int string_match(const char *str1, const char *str2)
 {
 	return (str1 && str2) && !strcmp(str1, str2);
@@ -4746,8 +4721,12 @@ static int set_option(int opt, const char *arg, const char *optname)
 			tracing_group_name_override = 1;
 		}
 	} else if (string_match(optname, "help") || opt == 'h') {
-		usage();
-		exit(EXIT_SUCCESS);
+		ret = utils_show_man_page(8, "lttng-sessiond");
+		if (ret) {
+			ERR("Cannot view man page lttng-sessiond(8)");
+			perror("exec");
+		}
+		exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
 	} else if (string_match(optname, "version") || opt == 'V') {
 		fprintf(stdout, "%s\n", VERSION);
 		exit(EXIT_SUCCESS);
@@ -5464,7 +5443,10 @@ static int write_pidfile(void)
 	assert(rundir);
 
 	if (opt_pidfile) {
-		strncpy(pidfile_path, opt_pidfile, sizeof(pidfile_path));
+		if (lttng_strncpy(pidfile_path, opt_pidfile, sizeof(pidfile_path))) {
+			ret = -1;
+			goto error;
+		}
 	} else {
 		/* Build pidfile path from rundir and opt_pidfile. */
 		ret = snprintf(pidfile_path, sizeof(pidfile_path), "%s/"