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 63216f8839b624052dd4c6b07a7bc53e45fad921..a6594b1c234ab603e9998349cf0ec794ccac55e6 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -84,8 +84,13 @@ struct ctf_fs_component {
 struct ctf_fs_trace {
        bt_logging_level log_level;
 
-       /* Weak */
+       /*
+        * Weak. These are mostly used to generate log messages or to append
+        * error causes. They are mutually exclusive, only one of them must be
+        * set.
+        */
        bt_self_component *self_comp;
+       bt_self_component_class *self_comp_class;
 
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
@@ -127,7 +132,7 @@ struct ctf_fs_ds_index_entry {
 };
 
 struct ctf_fs_ds_index {
-       /* Array of pointer to struct ctf_fs_fd_index_entry. */
+       /* Array of pointer to struct ctf_fs_ds_index_entry. */
        GPtrArray *entries;
 };
 
@@ -156,12 +161,7 @@ struct ctf_fs_ds_file_group {
        struct ctf_fs_trace *ctf_fs_trace;
 
        /*
-        * Owned by this. May be NULL.
-        *
-        * A stream cannot be assumed to be indexed as the indexing might have
-        * been skipped. Moreover, the index's fields may not all be available
-        * depending on the producer (e.g. timestamp_begin/end are not
-        * mandatory).
+        * Owned by this.
         */
        struct ctf_fs_ds_index *index;
 };
@@ -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