X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=c43ce59b906c7a5f43db8e5fed1f709262951ac6;hb=314d52225ce6d9b81d48b7645b035b1c93875369;hp=d234c06a4f3f12afd891fce9e6e67b579d9e2483;hpb=ecc48a904cc7c419fd1400afaa9ccb93be490cdd;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index d234c06a4..c43ce59b9 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -65,7 +65,7 @@ static struct poptOption long_options[] = {
 	{"no-consumer",     0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0},
 	{"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
 	{"snapshot",        0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0},
-	{"live",            0, POPT_ARG_INT, 0, OPT_LIVE_TIMER, 0, 0},
+	{"live",            0, POPT_ARG_INT | POPT_ARGFLAG_OPTIONAL, 0, OPT_LIVE_TIMER, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -95,11 +95,14 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                       if one, as the default snapshot output.\n");
 	fprintf(ofp, "                       Every channel will be set in overwrite mode\n");
 	fprintf(ofp, "                       and with mmap output (splice not supported).\n");
-	fprintf(ofp, "      --live USEC      Set the session in live-reading mode.\n");
+	fprintf(ofp, "      --live [USEC]    Set the session in live-reading mode.\n");
 	fprintf(ofp, "                       The delay parameter in micro-seconds is the\n");
 	fprintf(ofp, "                       maximum time the user can wait for the data\n");
-	fprintf(ofp, "                       to be flushed. Requires a network URL (-U or -C/-D)\n");
-	fprintf(ofp, "                       and a lttng-relayd listening.\n");
+	fprintf(ofp, "                       to be flushed. Can be set with a network\n");
+	fprintf(ofp, "                       URL (-U or -C/-D) and must have a relayd listening.\n");
+	fprintf(ofp, "                       By default, %u is used for the timer and the\n",
+											DEFAULT_LTTNG_LIVE_TIMER);
+	fprintf(ofp, "                       network URL is set to net://127.0.0.1.\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Extended Options:\n");
 	fprintf(ofp, "\n");
@@ -288,6 +291,12 @@ static int create_session(void)
 		}
 	}
 
+	if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
+		ERR("You need both control and data URL.");
+		ret = CMD_ERROR;
+		goto error;
+	}
+
 	if (opt_output_path != NULL) {
 		traces_path = utils_expand_path(opt_output_path);
 		if (traces_path == NULL) {
@@ -308,6 +317,12 @@ static int create_session(void)
 	} else if (opt_url) { /* Handling URL (-U opt) */
 		url = opt_url;
 		print_str_url = url;
+	} else if (opt_data_url && opt_ctrl_url) {
+		/*
+		 * With both control and data, we'll be setting the consumer URL after
+		 * session creation thus use no URL.
+		 */
+		url = NULL;
 	} else if (!opt_no_output) {
 		/* Auto output path */
 		alloc_path = utils_get_home_dir();
@@ -329,24 +344,22 @@ static int create_session(void)
 		}
 
 		url = alloc_url;
-		if (!opt_data_url && !opt_ctrl_url) {
-			print_str_url = alloc_url + strlen("file://");
-		}
+		print_str_url = alloc_url + strlen("file://");
 	} else {
 		/* No output means --no-output or --snapshot mode. */
 		url = NULL;
 	}
 
-	if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
-		ERR("You need both control and data URL.");
-		ret = CMD_ERROR;
-		goto error;
-	}
-
+	/* Use default live URL if NO url is/are found. */
 	if ((opt_live_timer && !opt_url) && (opt_live_timer && !opt_data_url)) {
-		ERR("You need a network URL (-U or -C/-D) to use live tracing.");
-		ret = CMD_ERROR;
-		goto error;
+		ret = asprintf(&alloc_url, "net://127.0.0.1");
+		if (ret < 0) {
+			PERROR("asprintf default live URL");
+			ret = CMD_FATAL;
+			goto error;
+		}
+		url = alloc_url;
+		print_str_url = url;
 	}
 
 	if (opt_snapshot && opt_live_timer) {
@@ -367,6 +380,17 @@ static int create_session(void)
 		}
 		ret = lttng_create_session_snapshot(session_name, snapshot_url);
 	} else if (opt_live_timer) {
+		const char *pathname;
+
+		if (opt_relayd_path) {
+			pathname = opt_relayd_path;
+		} else {
+			pathname = INSTALL_BIN_PATH "/lttng-relayd";
+		}
+		if (!opt_url && !opt_data_url && !check_relayd() &&
+				spawn_relayd(pathname, 0) < 0) {
+			goto error;
+		}
 		ret = lttng_create_session_live(session_name, url, opt_live_timer);
 	} else {
 		ret = _lttng_create_session_ext(session_name, url, datetime, -1);
@@ -401,6 +425,10 @@ static int create_session(void)
 	MSG("Session %s created.", session_name);
 	if (print_str_url && !opt_snapshot) {
 		MSG("Traces will be written in %s", print_str_url);
+
+		if (opt_live_timer) {
+			MSG("Live timer set to %u usec", opt_live_timer);
+		}
 	} else if (opt_snapshot) {
 		if (print_str_url) {
 			MSG("Default snapshot output set to: %s", print_str_url);
@@ -457,6 +485,14 @@ int cmd_create(int argc, const char **argv)
 
 			errno = 0;
 			opt_arg = poptGetOptArg(pc);
+			if (!opt_arg) {
+				/* Set up default values. */
+				opt_live_timer = (uint32_t) DEFAULT_LTTNG_LIVE_TIMER;
+				DBG("Session live timer interval set to default value %d",
+						opt_live_timer);
+				break;
+			}
+
 			v = strtoul(opt_arg, NULL, 0);
 			if (errno != 0 || !isdigit(opt_arg[0])) {
 				ERR("Wrong value in --live parameter: %s", opt_arg);
@@ -479,6 +515,13 @@ int cmd_create(int argc, const char **argv)
 		}
 	}
 
+	/* TODO: mi support */
+	if (lttng_opt_mi) {
+		ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED;
+		ERR("mi option not supported");
+		goto end;
+	}
+
 	if (opt_no_consumer) {
 		MSG("The option --no-consumer is obsolete. Use --no-output now.");
 		ret = CMD_WARNING;