Save and restore error in ctf_fs_iterator_next, muxer_msg_iter_do_next

[babeltrace.git] / src / plugins / ctf / fs-src / fs.h

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index e645f17706b68026a2fd99b81067e0f8b3d96d1e..a6594b1c234ab603e9998349cf0ec794ccac55e6 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -181,7 +181,7 @@ struct ctf_fs_msg_iter_data {
        bt_self_component *self_comp;
 
        /* Weak */
-       bt_self_message_iterator *pc_msg_iter;
+       bt_self_message_iterator *self_msg_iter;
 
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;
@@ -193,7 +193,15 @@ struct ctf_fs_msg_iter_data {
        size_t ds_file_info_index;
 
        /* Owned by this */
-       struct bt_msg_iter *msg_iter;
+       struct ctf_msg_iter *msg_iter;
+
+       /*
+        * Saved error.  If we hit an error in the _next method, but have some
+        * messages ready to return, we save the error here and return it on
+        * the next _next call.
+        */
+       bt_component_class_message_iterator_next_method_status next_saved_status;
+       const struct bt_error *next_saved_error;
 };
 
 BT_HIDDEN