lib: rename "begin" to "beginning" when used as a noun

[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 26e796a73bedeaf1dc263879233e3954da9c92c3..5619e1b25517aa3b26f0b53de114b1b5ac85f804 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;
+       struct bt_trace_class *trace_class;
 
        /* Weak (owned by `decoder` above) */
        struct ctf_trace_class *tc;
@@ -70,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;
@@ -85,6 +85,9 @@ struct ctf_fs_trace {
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
 
+       /* Owned by this */
+       struct bt_trace *trace;
+
        /* Array of struct ctf_fs_ds_file_group *, owned by this */
        GPtrArray *ds_file_groups;
 
@@ -133,7 +136,7 @@ struct ctf_fs_port_data {
 
 struct ctf_fs_notif_iter_data {
        /* Weak */
-       struct bt_private_connection_private_notification_iterator *pc_notif_iter;
+       struct bt_self_notification_iterator *pc_notif_iter;
 
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;
@@ -147,26 +150,28 @@ struct ctf_fs_notif_iter_data {
        /* Owned by this */
        struct bt_notif_iter *notif_iter;
 
-       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */
+       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGINNING 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_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);
+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_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);
@@ -178,16 +183,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_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,
-               bt_notification_array notifs, uint64_t capacity,
+enum bt_self_notification_iterator_status ctf_fs_iterator_next(
+               struct bt_self_notification_iterator *iterator,
+               bt_notification_array_const notifs, uint64_t capacity,
                uint64_t *count);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */