Make API CTF-agnostic

[babeltrace.git] / plugins / ctf / fs-src / fs.h

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 64eab95b921bb9c45871edf8b496a69d7d1d14c2..c72be5e03dd3000b065ef1521384be843d7a5cfc 100644 (file)
--- 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;
@@ -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 {
@@ -103,7 +111,13 @@ struct ctf_fs_ds_file_group {
        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_private_connection_private_notification_iterator *pc_notif_iter;
+
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;
 
@@ -125,7 +145,10 @@ struct ctf_fs_notif_iter_data {
        size_t ds_file_info_index;
 
        /* Owned by this */
-       struct bt_ctf_notif_iter *notif_iter;
+       struct bt_notif_iter *notif_iter;
+
+       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */
+       bool skip_stream_begin_notifs;
 };
 
 BT_HIDDEN
@@ -136,12 +159,14 @@ BT_HIDDEN
 void ctf_fs_finalize(struct bt_private_component *component);
 
 BT_HIDDEN
-struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return ctf_fs_query(
+               struct bt_component_class *comp_class,
+               struct bt_query_executor *query_exec,
                const char *object, struct bt_value *params);
 
 BT_HIDDEN
 struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
-               struct ctf_fs_metadata_config *config);
+               struct ctf_fs_metadata_config *config, struct bt_graph *graph);
 
 BT_HIDDEN
 void ctf_fs_trace_destroy(struct ctf_fs_trace *trace);
@@ -154,13 +179,15 @@ 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_connection_private_notification_iterator *it,
                struct bt_private_port *port);
 BT_HIDDEN
-void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
+void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
-               struct bt_private_notification_iterator *iterator);
+enum bt_notification_iterator_status ctf_fs_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator,
+               bt_notification_array notifs, uint64_t capacity,
+               uint64_t *count);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */