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 83cf3a9c261dde0465e9e87a1bb3741ee2a65f98..e254aeb4416345b224dd0b31fec4e40df4b6610e 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -53,7 +53,7 @@ struct ctf_fs_metadata {
        struct ctf_metadata_decoder *decoder;
 
        /* Owned by this */
-       struct bt_trace *trace;
+       bt_trace_class *trace_class;
 
        /* Weak (owned by `decoder` above) */
        struct ctf_trace_class *tc;
@@ -63,14 +63,12 @@ struct ctf_fs_metadata {
        /* 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_self_component_source *self_comp;
+       bt_self_component_source *self_comp;
 
        /* Array of struct ctf_fs_port_data *, owned by this */
        GPtrArray *port_data;
@@ -85,6 +83,9 @@ struct ctf_fs_trace {
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
 
+       /* Owned by this */
+       bt_trace *trace;
+
        /* Array of struct ctf_fs_ds_file_group *, owned by this */
        GPtrArray *ds_file_groups;
 
@@ -111,10 +112,10 @@ struct ctf_fs_ds_file_group {
        GPtrArray *ds_file_infos;
 
        /* Owned by this */
-       struct bt_stream_class *stream_class;
+       struct ctf_stream_class *sc;
 
        /* Owned by this */
-       struct bt_stream *stream;
+       bt_stream *stream;
 
        /* Stream (instance) ID; -1ULL means none */
        uint64_t stream_id;
@@ -131,9 +132,9 @@ struct ctf_fs_port_data {
        struct ctf_fs_component *ctf_fs;
 };
 
-struct ctf_fs_notif_iter_data {
+struct ctf_fs_msg_iter_data {
        /* Weak */
-       struct bt_self_notification_iterator *pc_notif_iter;
+       bt_self_message_iterator *pc_msg_iter;
 
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;
@@ -145,29 +146,27 @@ struct ctf_fs_notif_iter_data {
        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;
+       struct bt_msg_iter *msg_iter;
 };
 
 BT_HIDDEN
-enum bt_self_component_status ctf_fs_init(
-               struct bt_self_component_source *source,
-               const 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_self_component_source *component);
+void ctf_fs_finalize(bt_self_component_source *component);
 
 BT_HIDDEN
-enum bt_query_status ctf_fs_query(
-               struct bt_self_component_class_source *comp_class,
-               const struct bt_query_executor *query_exec,
-               const char *object, const struct bt_value *params,
-               const struct bt_value **result);
+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
@@ -180,18 +179,22 @@ BT_HIDDEN
 GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
 
 BT_HIDDEN
-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_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(struct bt_self_notification_iterator *it);
+void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
 
 BT_HIDDEN
-enum bt_self_notification_iterator_status ctf_fs_iterator_next(
-               struct bt_self_notification_iterator *iterator,
-               bt_notification_array_const notifs, uint64_t capacity,
+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
+bt_self_message_iterator_status ctf_fs_iterator_seek_beginning(
+               bt_self_message_iterator *message_iterator);
+
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */