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

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 13b0d07c..4b4dcc01 100644
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -30,10 +30,10 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
+#include "../common/metadata/decoder.h"
 
 BT_HIDDEN
 extern bool ctf_fs_debug;
@@ -50,7 +50,15 @@ struct ctf_fs_file {
 
 struct ctf_fs_metadata {
 	/* Owned by this */
-	struct bt_ctf_trace *trace;
+	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;
@@ -62,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;
@@ -77,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;
 
@@ -88,6 +93,9 @@ struct ctf_fs_trace {
 
 	/* Owned by this */
 	GString *name;
+
+	/* Next automatic stream ID when not provided by packet header */
+	uint64_t next_stream_id;
 };
 
 struct ctf_fs_ds_file_group {
@@ -98,12 +106,18 @@ 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;
 
 	/* Owned by this */
-	struct bt_ctf_stream *stream;
+	struct bt_stream_class *stream_class;
+
+	/* Owned by this */
+	struct bt_stream *stream;
+
+	/* Stream (instance) ID; -1ULL means none */
+	uint64_t stream_id;
 
 	/* Weak, belongs to component */
 	struct ctf_fs_trace *ctf_fs_trace;
@@ -112,9 +126,15 @@ struct ctf_fs_ds_file_group {
 struct ctf_fs_port_data {
 	/* Weak, belongs to ctf_fs_trace */
 	struct ctf_fs_ds_file_group *ds_file_group;
+
+	/* Weak */
+	struct ctf_fs_component *ctf_fs;
 };
 
 struct ctf_fs_notif_iter_data {
+	/* Weak */
+	struct bt_self_notification_iterator *pc_notif_iter;
+
 	/* Weak, belongs to ctf_fs_trace */
 	struct ctf_fs_ds_file_group *ds_file_group;
 
@@ -123,18 +143,28 @@ struct ctf_fs_notif_iter_data {
 
 	/* Which file the iterator is _currently_ operating on */
 	size_t ds_file_info_index;
+
+	/* Owned by this */
+	struct bt_notif_iter *notif_iter;
+
+	/* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */
+	bool skip_stream_begin_notifs;
 };
 
 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_value *ctf_fs_query(struct bt_component_class *comp_class,
-		const char *object, struct bt_value *params);
+enum bt_query_status ctf_fs_query(
+		struct bt_self_component_class_source *comp_class,
+		struct bt_query_executor *query_exec,
+		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,
@@ -150,14 +180,18 @@ 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_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_notification_iterator *it);
+void ctf_fs_iterator_finalize(struct bt_self_notification_iterator *it);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
-		struct bt_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);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */