From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 5 Dec 2023 04:29:51 +0000 (+0000)
Subject: src.ctf.fs: use ctf_msg_iter_up in decode_clock_snapshot_after_event
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=6d4acae340bb510ad4aefcc66fa4633a728f4db6

src.ctf.fs: use ctf_msg_iter_up in decode_clock_snapshot_after_event

Change-Id: I4f230d16b96764d5097cb30b8a063d41268bb237
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8278
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12316
Tested-by: jenkins <jenkins@lttng.org>
---

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 6b16533c..d6d6bf53 100644
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -1089,7 +1089,7 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
                                              int64_t *ts_ns)
 {
     enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
-    struct ctf_msg_iter *msg_iter = NULL;
+    ctf_msg_iter_up msg_iter;
     int ret = 0;
 
     BT_ASSERT(ctf_fs_trace);
@@ -1108,10 +1108,9 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
     BT_ASSERT(ctf_fs_trace->metadata->tc);
 
     msg_iter = ctf_msg_iter_create(
-                   ctf_fs_trace->metadata->tc,
-                   bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
-                   ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger)
-                   .release();
+        ctf_fs_trace->metadata->tc,
+        bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
+        ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger);
     if (!msg_iter) {
         /* ctf_msg_iter_create() logs errors. */
         ret = -1;
@@ -1122,10 +1121,10 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
      * Turn on dry run mode to prevent the creation and usage of Babeltrace
      * library objects (bt_field, bt_message_*, etc.).
      */
-    ctf_msg_iter_set_dry_run(msg_iter, true);
+    ctf_msg_iter_set_dry_run(msg_iter.get(), true);
 
     /* Seek to the beginning of the target packet. */
-    iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset.bytes());
+    iter_status = ctf_msg_iter_seek(msg_iter.get(), index_entry->offset.bytes());
     if (iter_status) {
         /* ctf_msg_iter_seek() logs errors. */
         ret = -1;
@@ -1139,11 +1138,11 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
          * the first event. To extract the first event's clock
          * snapshot.
          */
-        iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter, cs);
+        iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter.get(), cs);
         break;
     case LAST_EVENT:
         /* Decode the packet to extract the last event's clock snapshot. */
-        iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter, cs);
+        iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter.get(), cs);
         break;
     default:
         bt_common_abort();
@@ -1163,10 +1162,6 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
     }
 
 end:
-    if (msg_iter) {
-        ctf_msg_iter_destroy(msg_iter);
-    }
-
     return ret;
 }