Refactor: embed mi in "record" to remove code duplication

[lttng-tools.git] / src / bin / lttng / commands / snapshot.c

diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index abdf1890198b1653a2a3a2ab0bc5bc0599d584aa..ce63e5e875c858fc749a1e63199605469c5fc87a 100644 (file)
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -150,65 +150,28 @@ error_create:
        return NULL;
 }
 
-static int mi_list_output(void)
+static int list_output(void)
 {
-       int ret;
+       int ret, output_seen = 0;
        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;
-       }
+       MSG("Snapshot output list for session %s", current_session_name);
 
-       while ((s_iter = lttng_snapshot_output_list_get_next(list)) != NULL) {
-               ret = mi_lttng_snapshot_list_output(writer, s_iter);
+       if (lttng_opt_mi) {
+               ret = mi_lttng_snapshot_output_session_name(writer,
+                               current_session_name);
                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;
-       struct lttng_snapshot_output *s_iter;
-       struct lttng_snapshot_output_list *list;
-
-       ret = lttng_snapshot_list_output(current_session_name, &list);
-       if (ret < 0) {
-               goto error;
-       }
-
-       MSG("Snapshot output list for session %s", current_session_name);
-
        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,43 +458,8 @@ static int cmd_list_output(int argc, const char **argv)
 {
        int ret;
 
-       if (lttng_opt_mi) {
-               ret = mi_list_output();
-       } else {
-               ret = list_output();
-       }
-
-       return ret;
-}
-
-/*
- * 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 = list_output();
 
-       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;
 }
 
@@ -544,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;
@@ -554,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;
@@ -725,6 +674,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));