Refactoring: introduce lttng_tracker_ids data structure

[lttng-tools.git] / src / bin / lttng-sessiond / save.c

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 59715d0b9d4324152641ff7b620112ad9f62bad1..b95ee2df0f4bbbb27e2281fd694df51bbaee0455 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1836,9 +1836,13 @@ static int save_id_tracker(struct config_writer *writer,
                enum lttng_tracker_type tracker_type)
 {
        int ret = LTTNG_OK;
-       ssize_t nr_ids = 0, i;
-       struct lttng_tracker_id *ids = NULL;
+       size_t nr_ids = 0, i;
+       struct lttng_tracker_ids *ids = NULL;
        const char *element_id_tracker, *element_target_id, *element_id;
+       const struct lttng_tracker_id *id;
+       enum lttng_tracker_id_status status;
+       int value;
+       const char *string;
 
        switch (tracker_type) {
        case LTTNG_TRACKER_PID:
@@ -1879,9 +1883,9 @@ static int save_id_tracker(struct config_writer *writer,
        switch (domain) {
        case LTTNG_DOMAIN_KERNEL:
        {
-               nr_ids = kernel_list_tracker_ids(
+               ret = kernel_list_tracker_ids(
                                tracker_type, sess->kernel_session, &ids);
-               if (nr_ids < 0) {
+               if (ret != LTTNG_OK) {
                        ret = LTTNG_ERR_KERN_LIST_FAIL;
                        goto end;
                }
@@ -1889,9 +1893,9 @@ static int save_id_tracker(struct config_writer *writer,
        }
        case LTTNG_DOMAIN_UST:
        {
-               nr_ids = trace_ust_list_tracker_ids(
+               ret = trace_ust_list_tracker_ids(
                                tracker_type, sess->ust_session, &ids);
-               if (nr_ids < 0) {
+               if (ret != LTTNG_OK) {
                        ret = LTTNG_ERR_UST_LIST_FAIL;
                        goto end;
                }
@@ -1905,10 +1909,15 @@ static int save_id_tracker(struct config_writer *writer,
                goto end;
        }
 
-       if (nr_ids == 1 && ids[0].type == LTTNG_ID_ALL) {
-               /* Tracking all, nothing to output. */
-               ret = LTTNG_OK;
-               goto end;
+       nr_ids = lttng_tracker_ids_get_count(ids);
+
+       if (nr_ids == 1) {
+               id = lttng_tracker_ids_get_at_index(ids, 0);
+               if (id && lttng_tracker_id_get_type(id) == LTTNG_ID_ALL) {
+                       /* Tracking all, nothing to output. */
+                       ret = LTTNG_OK;
+                       goto end;
+               }
        }
 
        ret = config_writer_open_element(writer, element_id_tracker);
@@ -1940,7 +1949,12 @@ static int save_id_tracker(struct config_writer *writer,
        } else {
                /* Tracking list. */
                for (i = 0; i < nr_ids; i++) {
-                       switch (ids[i].type) {
+                       id = lttng_tracker_ids_get_at_index(ids, i);
+                       if (!id) {
+                               ret = LTTNG_ERR_SAVE_IO_FAIL;
+                               goto end;
+                       }
+                       switch (lttng_tracker_id_get_type(id)) {
                        case LTTNG_ID_VALUE:
                                ret = config_writer_open_element(
                                                writer, element_target_id);
@@ -1948,9 +1962,9 @@ static int save_id_tracker(struct config_writer *writer,
                                        ret = LTTNG_ERR_SAVE_IO_FAIL;
                                        goto end;
                                }
+                               status = lttng_tracker_id_get_value(id, &value);
                                ret = config_writer_write_element_unsigned_int(
-                                               writer, element_id,
-                                               ids[i].value);
+                                               writer, element_id, value);
                                break;
                        case LTTNG_ID_STRING:
                                ret = config_writer_open_element(
@@ -1959,9 +1973,10 @@ static int save_id_tracker(struct config_writer *writer,
                                        ret = LTTNG_ERR_SAVE_IO_FAIL;
                                        goto end;
                                }
+                               status = lttng_tracker_id_get_string(
+                                               id, &string);
                                ret = config_writer_write_element_string(writer,
-                                               config_element_name,
-                                               ids[i].string);
+                                               config_element_name, string);
                                break;
                        default:
                                /* Unexpected. */
@@ -1972,6 +1987,10 @@ static int save_id_tracker(struct config_writer *writer,
                                ret = LTTNG_ERR_SAVE_IO_FAIL;
                                goto end;
                        }
+                       if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                               ret = LTTNG_ERR_SAVE_IO_FAIL;
+                               goto end;
+                       }
 
                        /* /$element_target_id */
                        ret = config_writer_close_element(writer);
@@ -1998,7 +2017,7 @@ static int save_id_tracker(struct config_writer *writer,
 
        ret = LTTNG_OK;
 end:
-       free(ids);
+       lttng_tracker_ids_destroy(ids);
        return ret;
 }