X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.h;h=be035606e293870757bda19f6dc586b4364a9f89;hb=d4393e0875e7b08f6ee97d617cc5f2c9286742a4;hp=56397dff46d31c351be035119ad14967706b9049;hpb=2f5a009b5615db990687d0775038fdc82bbe8071;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index 56397dff..be035606 100644
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #include "../common/notif-iter/notif-iter.h"
 #include "lttng-index.h"
@@ -85,17 +85,20 @@ struct ctf_fs_ds_file_info {
 };
 
 struct ctf_fs_ds_file {
+	/* Weak */
+	struct bt_graph *graph;
+
 	/* Owned by this */
 	struct ctf_fs_file *file;
 
 	/* Owned by this */
-	struct bt_ctf_stream *stream;
+	struct bt_stream *stream;
 
 	/* Owned by this */
 	struct bt_clock_class_priority_map *cc_prio_map;
 
 	/* Weak */
-	struct bt_ctf_notif_iter *notif_iter;
+	struct bt_notif_iter *notif_iter;
 
 	void *mmap_addr;
 
@@ -105,12 +108,9 @@ struct ctf_fs_ds_file {
 	 */
 	size_t mmap_max_len;
 
-	/* Length of the current mapping. */
+	/* Length of the current mapping. Never exceeds the file's length. */
 	size_t mmap_len;
 
-	/* Length of the current mapping which *exists* in the backing file. */
-	size_t mmap_valid_len;
-
 	/* Offset in the file where the current mapping starts. */
 	off_t mmap_offset;
 
@@ -126,21 +126,23 @@ 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_ctf_notif_iter *notif_iter,
-		struct bt_ctf_stream *stream, const char *path);
+		struct bt_graph *graph,
+		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_ctf_field **packet_header_field,
-		struct bt_ctf_field **packet_context_field);
+		struct bt_field **packet_header_field,
+		struct bt_field **packet_context_field);
 
 BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_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(
@@ -149,6 +151,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
 BT_HIDDEN
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
-extern struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops;
+extern struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops;
 
 #endif /* CTF_FS_DS_FILE_H */