From 98e0892f4c700a5ce5b637473f4cd8554fe9d2df Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 4 Jul 2016 15:25:54 -0400 Subject: [PATCH] Allow optional snapshot name and max_size Generate a default name and give the default max size if not defined. --- src/common/config/session-config.c | 14 +++++++++++++- src/common/config/session.xsd | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) 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; diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd index 9ea83243f..569e4b011 100644 --- a/src/common/config/session.xsd +++ b/src/common/config/session.xsd @@ -296,8 +296,8 @@ elementFormDefault="qualified" version="3.0"> - - + + -- 2.34.1