X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.h;h=763136afef7be989fe7b2861f523c2179bbf7ba0;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=ba9718d689cdb5c0827c02ba81e251cfd213d5a6;hpb=ce75de140f82187fdaabd19e74a90baa797b8980;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index ba9718d6..763136af 100644
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -86,7 +86,7 @@ struct ctf_fs_trace {
 
 	/*
 	 * Weak. These are mostly used to generate log messages or to append
-	 * error causes. They are mutually exclusive, only one of them must is
+	 * error causes. They are mutually exclusive, only one of them must be
 	 * set.
 	 */
 	bt_self_component *self_comp;
@@ -129,6 +129,11 @@ struct ctf_fs_ds_index_entry {
 	 * (in ns since EPOCH).
 	 */
 	int64_t timestamp_begin_ns, timestamp_end_ns;
+
+	/*
+	 * Packet sequence number, or UINT64_MAX if not present in the index.
+	 */
+	uint64_t packet_seq_num;
 };
 
 struct ctf_fs_ds_index {
@@ -161,12 +166,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;
 };
@@ -186,19 +186,23 @@ 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;
 
 	/* Owned by this */
-	struct ctf_fs_ds_file *ds_file;
+	struct ctf_msg_iter *msg_iter;
 
-	/* Which file the iterator is _currently_ operating on */
-	size_t ds_file_info_index;
+	/*
+	 * 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_message_iterator_class_next_method_status next_saved_status;
+	const struct bt_error *next_saved_error;
 
-	/* Owned by this */
-	struct bt_msg_iter *msg_iter;
+	struct ctf_fs_ds_group_medops_data *msg_iter_medops_data;
 };
 
 BT_HIDDEN
@@ -218,23 +222,23 @@ bt_component_class_query_method_status ctf_fs_query(
 		void *method_data, const bt_value **result);
 
 BT_HIDDEN
-bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_init(
+bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_message_iterator_configuration *config,
-		bt_self_component_source *self_comp,
+		bt_self_component *self_comp,
 		bt_self_component_port_output *self_port);
 
 BT_HIDDEN
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
 
 BT_HIDDEN
-bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next(
+bt_message_iterator_class_next_method_status ctf_fs_iterator_next(
 		bt_self_message_iterator *iterator,
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count);
 
 BT_HIDDEN
-bt_component_class_message_iterator_seek_beginning_method_status ctf_fs_iterator_seek_beginning(
+bt_message_iterator_class_seek_beginning_method_status ctf_fs_iterator_seek_beginning(
 		bt_self_message_iterator *message_iterator);
 
 /* Create and initialize a new, empty ctf_fs_component. */