X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fload.c;h=2a3c6579574b27224a1296cde2956b92d06a6c30;hb=efbb2bae642da1b855903de297d525e38bd733c6;hp=1d0e42bdc5f4ed1c60667ebb72cfbdcea297201d;hpb=279d6193584da91b968c0232dd9b2ab5c722656b;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index 1d0e42bdc..2a3c65795 100644
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -55,10 +55,14 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "usage: lttng load [OPTIONS] [SESSION]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
-	fprintf(ofp, "  -h, --help           Show this help\n");
-	fprintf(ofp, "  -a, --all            Load all sessions (default)\n");
-	fprintf(ofp, "  -i, --input-path     Input path of the session configuration(s)\n");
-	fprintf(ofp, "  -f, --force          Override existing session configuration(s)\n");
+	fprintf(ofp, "  -h, --help               Show this help\n");
+	fprintf(ofp, "  -a, --all                Load all sessions (default)\n");
+	fprintf(ofp, "  -i, --input-path PATH    Input path of the session file(s).\n");
+	fprintf(ofp, "                           If a directory, load all files in it\n");
+	fprintf(ofp, "                           else try to load the given file.\n");
+	fprintf(ofp, "  -f, --force              Override existing session(s).\n");
+	fprintf(ofp, "                           This will destroy existing session(s)\n");
+	fprintf(ofp, "                           before creating new one(s).\n");
 }
 
 /*
@@ -93,23 +97,26 @@ int cmd_load(int argc, const char **argv)
 
 	if (!opt_load_all) {
 		session_name = poptGetArg(pc);
-		if (!session_name) {
-			ERR("A session name must be provided if the \"all\" option is not used.");
-			ret = CMD_ERROR;
-			goto end;
+		if (session_name) {
+			DBG2("Loading session name: %s", session_name);
 		}
-		DBG2("Loading session name: %s", session_name);
 	}
 
-	ret = config_load_session(opt_input_path, session_name, opt_force);
+	ret = config_load_session(opt_input_path, session_name, opt_force, 0);
 	if (ret) {
 		ERR("%s", lttng_strerror(ret));
 		ret = -ret;
 	} else {
 		if (opt_load_all) {
 			MSG("All sessions have been loaded successfully");
-		} else {
+		} else if (session_name) {
+			ret = config_init((char *)session_name);
+			if (ret < 0) {
+				ret = CMD_WARNING;
+			}
 			MSG("Session %s has been loaded successfully", session_name);
+		} else {
+			MSG("Session has been loaded successfully");
 		}
 	}
 end: