X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=750eb948b96bfa6f9f8d69a9793c66bf0f21520c;hb=98e0892f4c700a5ce5b637473f4cd8554fe9d2df;hp=e5afc4abc185e1f62007f20439cea188375ab27f;hpb=00df7c2fc0f2ffe7bb35a209c30f3e0dcdd85476;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index e5afc4abc..750eb948b 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -1218,7 +1218,7 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node)
 			snapshot_output_node; snapshot_output_node =
 			xmlNextElementSibling(snapshot_output_node)) {
 		char *name = NULL;
-		uint64_t max_size = UINT64_MAX;
+		uint64_t max_size = DEFAULT_SNAPSHOT_MAX_SIZE;
 		struct consumer_output output = { 0 };
 		struct lttng_snapshot_output *snapshot_output = NULL;
 
@@ -1262,6 +1262,18 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node)
 			goto error_snapshot_output;
 		}
 
+		if (!name) {
+			/* Generate a default name */
+			int pret;
+			pret = asprintf(&name, DEFAULT_SNAPSHOT_NAME "-%" PRIu32,
+					lttng_snapshot_output_get_id(snapshot_output));
+			if (pret < 0) {
+				name = NULL;
+				PERROR("snprintf output name");
+				goto error_snapshot_output;
+			}
+		}
+
 		ret = lttng_snapshot_output_set_name(name, snapshot_output);
 		if (ret) {
 			goto error_snapshot_output;