X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.h;h=5ba3d571436ed11ef5de121243f737183119fce9;hb=bf012bdeed813d8cb261a630655887080388f465;hp=8819f018775dd443b442e553a426d4ea24ff1098;hpb=4c65a157ea67009b883f7d9069c710385fff90bd;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index 8819f018..5ba3d571 100644
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -63,8 +63,6 @@ struct ctf_fs_metadata {
 	/* Weak (owned by `decoder` above) */
 	struct ctf_trace_class *tc;
 
-	/* Owned by this */
-
 	/* Owned by this */
 	char *text;
 
@@ -115,6 +113,9 @@ struct ctf_fs_trace {
 };
 
 struct ctf_fs_ds_index_entry {
+	/* Weak, belongs to ctf_fs_ds_file_info. */
+	const char *path;
+
 	/* Position, in bytes, of the packet from the beginning of the file. */
 	uint64_t offset;
 
@@ -205,7 +206,7 @@ struct ctf_fs_msg_iter_data {
 };
 
 BT_HIDDEN
-bt_self_component_status ctf_fs_init(
+bt_component_class_init_method_status ctf_fs_init(
 		bt_self_component_source *source,
 		const bt_value *params, void *init_method_data);
 
@@ -213,15 +214,14 @@ BT_HIDDEN
 void ctf_fs_finalize(bt_self_component_source *component);
 
 BT_HIDDEN
-bt_query_status ctf_fs_query(
+bt_component_class_query_method_status ctf_fs_query(
 		bt_self_component_class_source *comp_class,
-		const bt_query_executor *query_exec,
+		bt_private_query_executor *priv_query_exec,
 		const char *object, const bt_value *params,
-		bt_logging_level log_level,
-		const bt_value **result);
+		void *method_data, const bt_value **result);
 
 BT_HIDDEN
-bt_self_message_iterator_status ctf_fs_iterator_init(
+bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_component_source *self_comp,
 		bt_self_component_port_output *self_port);
@@ -230,13 +230,13 @@ BT_HIDDEN
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
 
 BT_HIDDEN
-bt_self_message_iterator_status ctf_fs_iterator_next(
+bt_component_class_message_iterator_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_self_message_iterator_status ctf_fs_iterator_seek_beginning(
+bt_component_class_message_iterator_seek_beginning_method_status ctf_fs_iterator_seek_beginning(
 		bt_self_message_iterator *message_iterator);
 
 /* Create and initialize a new, empty ctf_fs_component. */