X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=4b4dcc018741ace1f159d7fd1d412b6ea0745d54;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=534cb6b513cc2ec7afeaa6a485970d31e31ecc3a;hpb=d4393e0875e7b08f6ee97d617cc5f2c9286742a4;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 534cb6b5..4b4dcc01 100644
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -33,6 +33,7 @@
 #include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
+#include "../common/metadata/decoder.h"
 
 BT_HIDDEN
 extern bool ctf_fs_debug;
@@ -48,9 +49,17 @@ struct ctf_fs_file {
 };
 
 struct ctf_fs_metadata {
+	/* Owned by this */
+	struct ctf_metadata_decoder *decoder;
+
 	/* Owned by this */
 	struct bt_trace *trace;
 
+	/* Weak (owned by `decoder` above) */
+	struct ctf_trace_class *tc;
+
+	/* Owned by this */
+
 	/* Owned by this */
 	char *text;
 
@@ -61,7 +70,7 @@ struct ctf_fs_metadata {
 
 struct ctf_fs_component {
 	/* Weak, guaranteed to exist */
-	struct bt_private_component *priv_comp;
+	struct bt_self_component_source *self_comp;
 
 	/* Array of struct ctf_fs_port_data *, owned by this */
 	GPtrArray *port_data;
@@ -76,9 +85,6 @@ struct ctf_fs_trace {
 	/* Owned by this */
 	struct ctf_fs_metadata *metadata;
 
-	/* Owned by this */
-	struct bt_clock_class_priority_map *cc_prio_map;
-
 	/* Array of struct ctf_fs_ds_file_group *, owned by this */
 	GPtrArray *ds_file_groups;
 
@@ -100,7 +106,7 @@ struct ctf_fs_ds_file_group {
 	 * belong to this group (a single stream instance).
 	 *
 	 * You can call ctf_fs_ds_file_create() with one of those paths
-	 * and the CTF IR stream below.
+	 * and the trace IR stream below.
 	 */
 	GPtrArray *ds_file_infos;
 
@@ -127,7 +133,7 @@ struct ctf_fs_port_data {
 
 struct ctf_fs_notif_iter_data {
 	/* Weak */
-	struct bt_graph *graph;
+	struct bt_self_notification_iterator *pc_notif_iter;
 
 	/* Weak, belongs to ctf_fs_trace */
 	struct ctf_fs_ds_file_group *ds_file_group;
@@ -146,21 +152,23 @@ struct ctf_fs_notif_iter_data {
 };
 
 BT_HIDDEN
-enum bt_component_status ctf_fs_init(struct bt_private_component *source,
-		struct bt_value *params, void *init_method_data);
+enum bt_self_component_status ctf_fs_init(
+		struct bt_self_component_source *source,
+		const struct bt_value *params, void *init_method_data);
 
 BT_HIDDEN
-void ctf_fs_finalize(struct bt_private_component *component);
+void ctf_fs_finalize(struct bt_self_component_source *component);
 
 BT_HIDDEN
-struct bt_component_class_query_method_return ctf_fs_query(
-		struct bt_component_class *comp_class,
+enum bt_query_status ctf_fs_query(
+		struct bt_self_component_class_source *comp_class,
 		struct bt_query_executor *query_exec,
-		const char *object, struct bt_value *params);
+		const char *object, const struct bt_value *params,
+		const struct bt_value **result);
 
 BT_HIDDEN
 struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
-		struct ctf_fs_metadata_config *config, struct bt_graph *graph);
+		struct ctf_fs_metadata_config *config);
 
 BT_HIDDEN
 void ctf_fs_trace_destroy(struct ctf_fs_trace *trace);
@@ -172,15 +180,17 @@ BT_HIDDEN
 GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
 
 BT_HIDDEN
-enum bt_notification_iterator_status ctf_fs_iterator_init(
-		struct bt_private_connection_private_notification_iterator *it,
-		struct bt_private_port *port);
+enum bt_self_notification_iterator_status ctf_fs_iterator_init(
+		struct bt_self_notification_iterator *self_notif_iter,
+		struct bt_self_component_source *self_comp,
+		struct bt_self_component_port_output *self_port);
+
 BT_HIDDEN
-void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
+void ctf_fs_iterator_finalize(struct bt_self_notification_iterator *it);
 
 BT_HIDDEN
-enum bt_notification_iterator_status ctf_fs_iterator_next(
-		struct bt_private_connection_private_notification_iterator *iterator,
+enum bt_self_notification_iterator_status ctf_fs_iterator_next(
+		struct bt_self_notification_iterator *iterator,
 		bt_notification_array notifs, uint64_t capacity,
 		uint64_t *count);