X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.h;h=a02501c6074a1c006559880c79e5f991fc8a62bd;hb=7b53201cfb06ec02f4203e28458dfbcf53d87988;hp=093f360bc8892694d1f0f51a5be305a7e7e2561f;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index 093f360b..a02501c6 100644
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -81,19 +81,24 @@ struct ctf_fs_ds_file_info {
 	GString *path;
 
 	/* Guaranteed to be set, as opposed to the index. */
-	uint64_t begin_ns;
+	int64_t begin_ns;
 };
 
+struct ctf_fs_metadata;
+
 struct ctf_fs_ds_file {
+	/* Weak */
+	struct ctf_fs_metadata *metadata;
+
+	/* Weak */
+	struct bt_self_notification_iterator *pc_notif_iter;
+
 	/* Owned by this */
 	struct ctf_fs_file *file;
 
 	/* Owned by this */
 	struct bt_stream *stream;
 
-	/* Owned by this */
-	struct bt_clock_class_priority_map *cc_prio_map;
-
 	/* Weak */
 	struct bt_notif_iter *notif_iter;
 
@@ -123,11 +128,12 @@ struct ctf_fs_ds_file {
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		struct ctf_fs_trace *ctf_fs_trace,
+		struct bt_self_notification_iterator *pc_notif_iter,
 		struct bt_notif_iter *notif_iter,
 		struct bt_stream *stream, const char *path);
 
 BT_HIDDEN
-int ctf_fs_ds_file_get_packet_header_context_fields(
+int ctf_fs_ds_file_borrow_packet_header_context_fields(
 		struct ctf_fs_ds_file *ds_file,
 		struct bt_field **packet_header_field,
 		struct bt_field **packet_context_field);
@@ -136,8 +142,9 @@ BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_method_return ctf_fs_ds_file_next(
-		struct ctf_fs_ds_file *stream);
+enum bt_notification_iterator_status ctf_fs_ds_file_next(
+		struct ctf_fs_ds_file *ds_file,
+		struct bt_notification **notif);
 
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(