Bug 1002
PATCH v2 1/1 Bug 1002
In reply to a message not in the archiveHi Mathieu,
The following patches should make these changes more explicit. Thanks for pointing that out.
The main reason for the refactoring is that bug 1002[1] is caused by the presence of 2 code paths for snapshot recording: one for mi and one for normal execution. Since MSG macro are disabled with the presence of --mi on the command line, it is simpler to embed the mi code as done in other commands.
Bug 1002[1] also mention that a simple warning when attempting an empty snapshot record should not return an error to the command line. This is fixed in "Fix: do not return error on LTTNG_ERR_SNAPSHOT_NODATA".
[1] https://bugs.lttng.org/issues/1002
Cheers
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH v2 1/5 Fix: do not return error on LTTNG_ERR_SNAPSHOT_NODATA
In reply to a message not in the archiveA warning is fine since the user has no control on whether or not applications (or the kernel) have produced any event between the start of the tracing session and the recording of the snapshot.
MI wise the command is not a success since nothing was recorded. The command line return code is CMD_SUCCESS.
refs #1002
--- src/bin/lttng/commands/snapshot.c | 9 +++++++++ 1 file changed, 9 insertions(+)
src/bin/lttng/commands/snapshot.c +9 -0
@@ -725,6 +725,15 @@ int cmd_snapshot(int argc, const char **argv)break ;case LTTNG_ERR_SNAPSHOT_NODATA :WARN ("%s" ,lttng_strerror (command_ret)); + +/* A warning is fine since the user has no control on +* whether or not applications (or the kernel) have +* produced any event between the start of the tracing +* session and the recording of the snapshot. MI wise +* the command is not a success since nothing was +* recorded. +*/ + command_ret =0 ;break ;default :ERR ("%s" ,lttng_strerror (command_ret));
Signature · 6 lines
2.7.0 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH v2 2/5 Refactor: embed mi in "list_output" to remove code duplication
In reply to a message not in the archiveReduces the number of possible code paths and ensure a coherent return path.
--- src/bin/lttng/commands/snapshot.c | 83 +++++++++++++++------------------------ 1 file changed, 32 insertions(+), 51 deletions(-)
src/bin/lttng/commands/snapshot.c +32 -51
@@ -150,52 +150,6 @@ error_create:return NULL ; } -static int mi_list_output (void ) -{ -int ret; -struct lttng_snapshot_output *s_iter; -struct lttng_snapshot_output_list *list; - -assert (writer); - - ret =lttng_snapshot_list_output (current_session_name, &list); -if (ret <0 ) { - goto error; - } - - ret =mi_lttng_snapshot_output_session_name (writer, current_session_name); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - -while ((s_iter =lttng_snapshot_output_list_get_next (list)) !=NULL ) { - ret =mi_lttng_snapshot_list_output (writer, s_iter); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - } - - -/* Close snapshot snapshots element */ - ret =mi_lttng_writer_close_element (writer); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - -/* Close snapshot session element */ - ret =mi_lttng_writer_close_element (writer); -if (ret) { - ret =CMD_ERROR ; - } -end: -lttng_snapshot_output_list_destroy (list); -error: -return ret; -} -static int list_output (void ) {int ret, output_seen =0 ;
@@ -209,6 +163,15 @@ static int list_output(void)MSG ("Snapshot output list for session %s" , current_session_name); +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_output_session_name (writer, + current_session_name); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + } +while ((s_iter =lttng_snapshot_output_list_get_next (list)) !=NULL ) { MSG("%s[%" PRIu32 "] %s: %s (max-size: %" PRId64 ")", indent4, lttng_snapshot_output_get_id(s_iter),
@@ -216,8 +179,30 @@ static int list_output(void)lttng_snapshot_output_get_ctrl_url (s_iter), lttng_snapshot_output_get_maxsize(s_iter)); output_seen =1 ; +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_list_output (writer, s_iter); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + } } +if (lttng_opt_mi) { +/* Close snapshot snapshots element */ + ret =mi_lttng_writer_close_element (writer); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + +/* Close snapshot session element */ + ret =mi_lttng_writer_close_element (writer); +if (ret) { + ret =CMD_ERROR ; + } + } +end:lttng_snapshot_output_list_destroy (list);if (!output_seen) {
@@ -473,11 +458,7 @@ static int cmd_list_output(int argc, const char **argv) {int ret; -if (lttng_opt_mi) { - ret =mi_list_output (); - }else { - ret =list_output (); - } + ret =list_output ();return ret; }
Signature · 6 lines
2.7.0 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH v2 3/5 Refactor: embed mi in "record" to remove code duplication
In reply to a message not in the archiveReduces the number of possible code paths and ensure a coherent return path.
fixes #1002
--- src/bin/lttng/commands/snapshot.c | 52 ++++++++------------------------------- 1 file changed, 10 insertions(+), 42 deletions(-)
src/bin/lttng/commands/snapshot.c +10 -42
@@ -464,37 +464,6 @@ static int cmd_list_output(int argc, const char **argv) }/* -* Do a snapshot record with the URL if one is given (machine interface). -*/ -static int mi_record (const char *url) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; - - output =create_output_from_args (url); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - - ret =lttng_snapshot_record (current_session_name, output,0 ); -if (ret <0 ) { - ret =CMD_ERROR ; - goto error; - } - - ret =mi_lttng_snapshot_record (writer, current_session_name, url, - opt_ctrl_url, opt_data_url); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Do a snapshot record with the URL if one is given. */ static int record (const char *url)
@@ -525,6 +494,14 @@ static int record(const char *url) opt_data_url); } +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_record (writer, current_session_name, url, + opt_ctrl_url, opt_data_url); +if (ret) { + ret =CMD_ERROR ; + } + } + error:lttng_snapshot_output_destroy (output);return ret;
@@ -535,18 +512,9 @@ static int cmd_record(int argc, const char **argv)int ret;if (argc ==2 ) { -/* With a given URL */ -if (lttng_opt_mi) { - ret =mi_record (argv[1 ]); - }else { - ret =record (argv[1 ]); - } + ret =record (argv[1 ]); }else { -if (lttng_opt_mi) { - ret =mi_record (NULL ); - }else { - ret =record (NULL ); - } + ret =record (NULL ); }return ret;
Signature · 6 lines
2.7.0 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH v2 4/5 Refactor: embed mi in "del_record" to remove code duplication
In reply to a message not in the archiveReduces the number of possible code paths and ensure a coherent return path.
--- src/bin/lttng/commands/snapshot.c | 64 ++++++--------------------------------- 1 file changed, 10 insertions(+), 54 deletions(-)
src/bin/lttng/commands/snapshot.c +10 -54
@@ -214,50 +214,6 @@ error: }/* -* Delete output by ID (machine interface version). -*/ -static int mi_del_output (uint32_t id,const char *name) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; - -assert (writer); - - output =lttng_snapshot_output_create (); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - -if (name) { - ret =lttng_snapshot_output_set_name (name, output); - }else if (id !=UINT32_MAX ) { - ret =lttng_snapshot_output_set_id (id, output); - }else { - ret =CMD_ERROR ; - goto error; - } -if (ret <0 ) { - ret =CMD_FATAL ; - goto error; - } - - ret =lttng_snapshot_del_output (current_session_name, output); -if (ret <0 ) { - goto error; - } - - ret =mi_lttng_snapshot_del_output (writer, id, name, current_session_name); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Delete output by ID. */ static int del_output (uint32_t id,const char *name)
@@ -297,6 +253,14 @@ static int del_output(uint32_t id, const char *name) name, current_session_name); } +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_del_output (writer, id, name, + current_session_name); +if (ret) { + ret =CMD_ERROR ; + } + } + error:lttng_snapshot_output_destroy (output);return ret;
@@ -433,17 +397,9 @@ static int cmd_del_output(int argc, const char **argv) errno =0 ; id =strtol (argv[1 ], &name,10 );if (id ==0 && errno ==0 ) { -if (lttng_opt_mi) { - ret =mi_del_output (UINT32_MAX , name); - }else { - ret =del_output (UINT32_MAX , name); - } + ret =del_output (UINT32_MAX , name); }else if (errno ==0 && *name =='\0' ) { -if (lttng_opt_mi) { - ret =mi_del_output (id,NULL ); - }else { - ret =del_output (id,NULL ); - } + ret =del_output (id,NULL ); }else {ERR ("Argument %s not recognized" , argv[1 ]); ret =-1 ;
Signature · 6 lines
2.7.0 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH v2 5/5 Refactor: embed mi in "add_output "to remove code duplication
In reply to a message not in the archiveReduces the number of possible code paths and ensure a coherent return path.
--- src/bin/lttng/commands/snapshot.c | 62 +++++---------------------------------- 1 file changed, 8 insertions(+), 54 deletions(-)
src/bin/lttng/commands/snapshot.c +8 -54
@@ -267,55 +267,6 @@ error: }/* -* Add output from the user URL (machine interface). -*/ -static int mi_add_output (const char *url) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; -char name[NAME_MAX ]; -const char *n_ptr; - -if (!url && (!opt_data_url || !opt_ctrl_url)) { - ret =CMD_ERROR ; - goto error; - } - - output =create_output_from_args (url); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - -/* This call, if successful, populates the id of the output object. */ - ret =lttng_snapshot_add_output (current_session_name, output); -if (ret <0 ) { - goto error; - } - - n_ptr =lttng_snapshot_output_get_name (output); -if (*n_ptr =='\0' ) { -int pret; - pret =snprintf (name,sizeof (name),DEFAULT_SNAPSHOT_NAME "-%" PRIu32, -lttng_snapshot_output_get_id (output)); -if (pret <0 ) { -PERROR ("snprintf add output name" ); - } - n_ptr = name; - } - - ret =mi_lttng_snapshot_add_output (writer, current_session_name, n_ptr, - output); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Add output from the user URL. */ static int add_output (const char *url)
@@ -359,6 +310,13 @@ static int add_output(const char *url)lttng_snapshot_output_get_id (output), n_ptr,lttng_snapshot_output_get_ctrl_url (output), lttng_snapshot_output_get_maxsize(output)); +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_add_output (writer, current_session_name, + n_ptr, output); +if (ret) { + ret =CMD_ERROR ; + } + } error:lttng_snapshot_output_destroy (output);return ret;
@@ -373,11 +331,7 @@ static int cmd_add_output(int argc, const char **argv) goto end; } -if (lttng_opt_mi) { - ret =mi_add_output (argv[1 ]); - }else { - ret =add_output (argv[1 ]); - } + ret =add_output (argv[1 ]); end:return ret;
Signature · 6 lines
2.7.0 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau
AppliedRe: [PATCH lttng-tools v2 1/5] Fix: do not return error on LTTNG_ERR_SNAPSHOT_NODATA
In reply to a message not in the archiveMerged, thanks!
Jérémie
Quoted 38 lines · Jonathan Rajotte
A warning is fine since the user has no control on whether or not applications (or the kernel) have produced any event between the start of the tracing session and the recording of the snapshot.
MI wise the command is not a success since nothing was recorded. The command line return code is
CMD_SUCCESS.refs #1002
Signed-off-by Jonathan Rajotte <[email protected]>--- src/bin/lttng/commands/snapshot.c | 9 +++++++++ 1 file changed, 9 insertions(+)src/bin/lttng/commands/snapshot.c +9
-1@@ -725,6 +725,15 @@ int cmd_snapshot(int argc, const char **argv)break ;case LTTNG_ERR_SNAPSHOT_NODATA :WARN ("%s" ,lttng_strerror (command_ret)); + +/* A warning is fine since the user has no control on +* whether or not applications (or the kernel) have +* produced any event between the start of the tracing +* session and the recording of the snapshot. MI wise +* the command is not a success since nothing was +* recorded. +*/ + command_ret =0 ;break ;default :ERR ("%s" ,lttng_strerror (command_ret)); --2.7.0
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau
AppliedRe: [PATCH lttng-tools v2 2/5] Refactor: embed mi in "list_output" to remove code duplication
In reply to a message not in the archiveMerged, thanks!
Jérémie
Quoted 128 lines · Jonathan Rajotte
Reduces the number of possible code paths and ensure a coherent return path.
Signed-off-by Jonathan Rajotte <[email protected]>--- src/bin/lttng/commands/snapshot.c | 83 +++++++++++++++------------------------ 1 file changed, 32 insertions(+), 51 deletions(-)src/bin/lttng/commands/snapshot.c +32
-52@@ -150,52 +150,6 @@ error_create:return NULL ; } -static int mi_list_output (void ) -{ -int ret; -struct lttng_snapshot_output *s_iter; -struct lttng_snapshot_output_list *list; - -assert (writer); - - ret =lttng_snapshot_list_output (current_session_name, &list); -if (ret <0 ) { - goto error; - } - - ret =mi_lttng_snapshot_output_session_name (writer, current_session_name); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - -while ((s_iter =lttng_snapshot_output_list_get_next (list)) !=NULL ) { - ret =mi_lttng_snapshot_list_output (writer, s_iter); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - } - - -/* Close snapshot snapshots element */ - ret =mi_lttng_writer_close_element (writer); -if (ret) { - ret =CMD_ERROR ; - goto end; - } - -/* Close snapshot session element */ - ret =mi_lttng_writer_close_element (writer); -if (ret) { - ret =CMD_ERROR ; - } -end: -lttng_snapshot_output_list_destroy (list); -error: -return ret; -} -static int list_output (void ) {int ret, output_seen =0 ;@@ -209,6 +163,15 @@ static int list_output(void)MSG ("Snapshot output list for session %s" , current_session_name); +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_output_session_name (writer, + current_session_name); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + } +while ((s_iter =lttng_snapshot_output_list_get_next (list)) !=NULL ) { MSG("%s[%" PRIu32 "] %s: %s (max-size: %" PRId64 ")", indent4, lttng_snapshot_output_get_id(s_iter),@@ -216,8 +179,30 @@ static int list_output(void)lttng_snapshot_output_get_ctrl_url (s_iter), lttng_snapshot_output_get_maxsize(s_iter)); output_seen =1 ; +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_list_output (writer, s_iter); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + } } +if (lttng_opt_mi) { +/* Close snapshot snapshots element */ + ret =mi_lttng_writer_close_element (writer); +if (ret) { + ret =CMD_ERROR ; + goto end; + } + +/* Close snapshot session element */ + ret =mi_lttng_writer_close_element (writer); +if (ret) { + ret =CMD_ERROR ; + } + } +end:lttng_snapshot_output_list_destroy (list);if (!output_seen) {@@ -473,11 +458,7 @@ static int cmd_list_output(int argc, const char **argv) {int ret; -if (lttng_opt_mi) { - ret =mi_list_output (); - }else { - ret =list_output (); - } + ret =list_output ();return ret; } --2.7.0
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau
AppliedRe: [PATCH lttng-tools v2 3/5] Refactor: embed mi in "record" to remove code duplication
In reply to a message not in the archiveMerged, thanks!
Jérémie
Quoted 91 lines · Jonathan Rajotte
Reduces the number of possible code paths and ensure a coherent return path.
fixes #1002
Signed-off-by Jonathan Rajotte <[email protected]>--- src/bin/lttng/commands/snapshot.c | 52 ++++++++------------------------------- 1 file changed, 10 insertions(+), 42 deletions(-)src/bin/lttng/commands/snapshot.c +10
-43@@ -464,37 +464,6 @@ static int cmd_list_output(int argc, const char **argv) }/* -* Do a snapshot record with the URL if one is given (machine interface). -*/ -static int mi_record (const char *url) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; - - output =create_output_from_args (url); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - - ret =lttng_snapshot_record (current_session_name, output,0 ); -if (ret <0 ) { - ret =CMD_ERROR ; - goto error; - } - - ret =mi_lttng_snapshot_record (writer, current_session_name, url, - opt_ctrl_url, opt_data_url); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Do a snapshot record with the URL if one is given. */ static int record (const char *url)@@ -525,6 +494,14 @@ static int record(const char *url) opt_data_url); } +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_record (writer, current_session_name, url, + opt_ctrl_url, opt_data_url); +if (ret) { + ret =CMD_ERROR ; + } + } + error:lttng_snapshot_output_destroy (output);return ret;@@ -535,18 +512,9 @@ static int cmd_record(int argc, const char **argv)int ret;if (argc ==2 ) { -/* With a given URL */ -if (lttng_opt_mi) { - ret =mi_record (argv[1 ]); - }else { - ret =record (argv[1 ]); - } + ret =record (argv[1 ]); }else { -if (lttng_opt_mi) { - ret =mi_record (NULL ); - }else { - ret =record (NULL ); - } + ret =record (NULL ); }return ret; --2.7.0
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau
AppliedRe: [PATCH lttng-tools v2 4/5] Refactor: embed mi in "del_record" to remove code duplication
In reply to a message not in the archiveMerged, thanks!
Jérémie
Quoted 101 lines · Jonathan Rajotte
Reduces the number of possible code paths and ensure a coherent return path.
Signed-off-by Jonathan Rajotte <[email protected]>--- src/bin/lttng/commands/snapshot.c | 64 ++++++--------------------------------- 1 file changed, 10 insertions(+), 54 deletions(-)src/bin/lttng/commands/snapshot.c +10
-55@@ -214,50 +214,6 @@ error: }/* -* Delete output by ID (machine interface version). -*/ -static int mi_del_output (uint32_t id,const char *name) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; - -assert (writer); - - output =lttng_snapshot_output_create (); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - -if (name) { - ret =lttng_snapshot_output_set_name (name, output); - }else if (id !=UINT32_MAX ) { - ret =lttng_snapshot_output_set_id (id, output); - }else { - ret =CMD_ERROR ; - goto error; - } -if (ret <0 ) { - ret =CMD_FATAL ; - goto error; - } - - ret =lttng_snapshot_del_output (current_session_name, output); -if (ret <0 ) { - goto error; - } - - ret =mi_lttng_snapshot_del_output (writer, id, name, current_session_name); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Delete output by ID. */ static int del_output (uint32_t id,const char *name)@@ -297,6 +253,14 @@ static int del_output(uint32_t id, const char *name) name, current_session_name); } +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_del_output (writer, id, name, + current_session_name); +if (ret) { + ret =CMD_ERROR ; + } + } + error:lttng_snapshot_output_destroy (output);return ret;@@ -433,17 +397,9 @@ static int cmd_del_output(int argc, const char **argv) errno =0 ; id =strtol (argv[1 ], &name,10 );if (id ==0 && errno ==0 ) { -if (lttng_opt_mi) { - ret =mi_del_output (UINT32_MAX , name); - }else { - ret =del_output (UINT32_MAX , name); - } + ret =del_output (UINT32_MAX , name); }else if (errno ==0 && *name =='\0' ) { -if (lttng_opt_mi) { - ret =mi_del_output (id,NULL ); - }else { - ret =del_output (id,NULL ); - } + ret =del_output (id,NULL ); }else {ERR ("Argument %s not recognized" , argv[1 ]); ret =-1 ; --2.7.0
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau
AppliedRe: [PATCH lttng-tools v2 5/5] Refactor: embed mi in "add_output "to remove code duplication
In reply to a message not in the archiveMerged, thanks!
Jérémie
Quoted 98 lines · Jonathan Rajotte
Reduces the number of possible code paths and ensure a coherent return path.
Signed-off-by Jonathan Rajotte <[email protected]>--- src/bin/lttng/commands/snapshot.c | 62 +++++---------------------------------- 1 file changed, 8 insertions(+), 54 deletions(-)src/bin/lttng/commands/snapshot.c +8
-55@@ -267,55 +267,6 @@ error: }/* -* Add output from the user URL (machine interface). -*/ -static int mi_add_output (const char *url) -{ -int ret; -struct lttng_snapshot_output *output =NULL ; -char name[NAME_MAX ]; -const char *n_ptr; - -if (!url && (!opt_data_url || !opt_ctrl_url)) { - ret =CMD_ERROR ; - goto error; - } - - output =create_output_from_args (url); -if (!output) { - ret =CMD_FATAL ; - goto error; - } - -/* This call, if successful, populates the id of the output object. */ - ret =lttng_snapshot_add_output (current_session_name, output); -if (ret <0 ) { - goto error; - } - - n_ptr =lttng_snapshot_output_get_name (output); -if (*n_ptr =='\0' ) { -int pret; - pret =snprintf (name,sizeof (name),DEFAULT_SNAPSHOT_NAME "-%" PRIu32, -lttng_snapshot_output_get_id (output)); -if (pret <0 ) { -PERROR ("snprintf add output name" ); - } - n_ptr = name; - } - - ret =mi_lttng_snapshot_add_output (writer, current_session_name, n_ptr, - output); -if (ret) { - ret =CMD_ERROR ; - } - -error: -lttng_snapshot_output_destroy (output); -return ret; -} - -/* * Add output from the user URL. */ static int add_output (const char *url)@@ -359,6 +310,13 @@ static int add_output(const char *url)lttng_snapshot_output_get_id (output), n_ptr,lttng_snapshot_output_get_ctrl_url (output), lttng_snapshot_output_get_maxsize(output)); +if (lttng_opt_mi) { + ret =mi_lttng_snapshot_add_output (writer, current_session_name, + n_ptr, output); +if (ret) { + ret =CMD_ERROR ; + } + } error:lttng_snapshot_output_destroy (output);return ret;@@ -373,11 +331,7 @@ static int cmd_add_output(int argc, const char **argv) goto end; } -if (lttng_opt_mi) { - ret =mi_add_output (argv[1 ]); - }else { - ret =add_output (argv[1 ]); - } + ret =add_output (argv[1 ]); end:return ret; --2.7.0
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev