From 912b632deff820abddf4ab67055f23f2e6d4e05a Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 14 Jun 2016 14:53:56 -0400 Subject: [PATCH] Honor omit_name and omit_output options in sessiond save command MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/save.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c index 9ac7712cb..7c72ff790 100644 --- a/src/bin/lttng-sessiond/save.c +++ b/src/bin/lttng-sessiond/save.c @@ -1856,6 +1856,7 @@ int save_session(struct ltt_session *session, struct config_writer *writer = NULL; size_t session_name_len; const char *provided_path; + bool omit_name, omit_output; assert(session); assert(attr); @@ -1871,6 +1872,18 @@ int save_session(struct ltt_session *session, goto end; } + ret = lttng_save_session_attr_get_omit_name(attr); + if (ret < 0) { + goto end; + } + omit_name = !!ret; + + ret = lttng_save_session_attr_get_omit_output(attr); + if (ret < 0) { + goto end; + } + omit_output = !!ret; + provided_path = lttng_save_session_attr_get_output_url(attr); if (provided_path) { DBG3("Save session in provided path %s", provided_path); @@ -1963,11 +1976,13 @@ int save_session(struct ltt_session *session, goto end; } - ret = config_writer_write_element_string(writer, config_element_name, - session->name); - if (ret) { - ret = LTTNG_ERR_SAVE_IO_FAIL; - goto end; + if (!omit_name) { + ret = config_writer_write_element_string(writer, + config_element_name, session->name); + if (ret) { + ret = LTTNG_ERR_SAVE_IO_FAIL; + goto end; + } } if(session->shm_path[0] != '\0') { @@ -2023,9 +2038,11 @@ int save_session(struct ltt_session *session, } } - ret = save_session_output(writer, session); - if (ret) { - goto end; + if (!omit_output) { + ret = save_session_output(writer, session); + if (ret) { + goto end; + } } /* /session */ -- 2.34.1