plugins/ctf: Remove unused uuid-related fields in struct ctf_fs_metadata

[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..e254aeb4416345b224dd0b31fec4e40df4b6610e 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,19 +50,25 @@ struct ctf_fs_file {
 
 struct ctf_fs_metadata {
        /* Owned by this */
-       struct bt_ctf_trace *trace;
+       struct ctf_metadata_decoder *decoder;
+
+       /* Owned by this */
+       bt_trace_class *trace_class;
+
+       /* Weak (owned by `decoder` above) */
+       struct ctf_trace_class *tc;
+
+       /* Owned by this */
 
        /* Owned by this */
        char *text;
 
-       uint8_t uuid[16];
-       bool is_uuid_set;
        int bo;
 };
 
 struct ctf_fs_component {
        /* Weak, guaranteed to exist */
-       struct bt_private_component *priv_comp;
+       bt_self_component_source *self_comp;
 
        /* Array of struct ctf_fs_port_data *, owned by this */
        GPtrArray *port_data;
@@ -78,7 +84,7 @@ struct ctf_fs_trace {
        struct ctf_fs_metadata *metadata;
 
        /* Owned by this */
-       struct bt_clock_class_priority_map *cc_prio_map;
+       bt_trace *trace;
 
        /* Array of struct ctf_fs_ds_file_group *, owned by this */
        GPtrArray *ds_file_groups;
@@ -88,6 +94,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 +107,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 ctf_stream_class *sc;
+
+       /* Owned by this */
+       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 +127,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 {
+struct ctf_fs_msg_iter_data {
+       /* Weak */
+       bt_self_message_iterator *pc_msg_iter;
+
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;
 
@@ -125,22 +146,27 @@ struct ctf_fs_notif_iter_data {
        size_t ds_file_info_index;
 
        /* Owned by this */
-       struct bt_ctf_notif_iter *notif_iter;
+       struct bt_msg_iter *msg_iter;
 };
 
 BT_HIDDEN
-enum bt_component_status ctf_fs_init(struct bt_private_component *source,
-               struct bt_value *params, void *init_method_data);
+bt_self_component_status ctf_fs_init(
+               bt_self_component_source *source,
+               const bt_value *params, void *init_method_data);
 
 BT_HIDDEN
-void ctf_fs_finalize(struct bt_private_component *component);
+void ctf_fs_finalize(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);
+bt_query_status ctf_fs_query(
+               bt_self_component_class_source *comp_class,
+               const bt_query_executor *query_exec,
+               const char *object, const bt_value *params,
+               const bt_value **result);
 
 BT_HIDDEN
-struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
+struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp,
+               const char *path, const char *name,
                struct ctf_fs_metadata_config *config);
 
 BT_HIDDEN
@@ -153,14 +179,22 @@ 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);
+bt_self_message_iterator_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);
+
+BT_HIDDEN
+void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
+
 BT_HIDDEN
-void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
+bt_self_message_iterator_status ctf_fs_iterator_next(
+               bt_self_message_iterator *iterator,
+               bt_message_array_const msgs, uint64_t capacity,
+               uint64_t *count);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
-               struct bt_private_notification_iterator *iterator);
+bt_self_message_iterator_status ctf_fs_iterator_seek_beginning(
+               bt_self_message_iterator *message_iterator);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */