lib: move trace class's name, UUID, and environment props to trace API

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

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index d4dec888933aae08cfc722c8bb7ad2033f88cfc6..8e7ca952797454849756735c0c1805ebb951b527 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -41,6 +41,9 @@ extern bool ctf_fs_debug;
 struct ctf_fs_file {
        bt_logging_level log_level;
 
+       /* Weak */
+       bt_self_component *self_comp;
+
        /* Owned by this */
        GString *path;
 
@@ -60,8 +63,6 @@ struct ctf_fs_metadata {
        /* Weak (owned by `decoder` above) */
        struct ctf_trace_class *tc;
 
-       /* Owned by this */
-
        /* Owned by this */
        char *text;
 
@@ -72,7 +73,10 @@ struct ctf_fs_component {
        bt_logging_level log_level;
 
        /* Weak, guaranteed to exist */
-       bt_self_component_source *self_comp;
+       bt_self_component_source *self_comp_src;
+
+       /* Weak */
+       bt_self_component *self_comp;
 
        /* Array of struct ctf_fs_port_data *, owned by this */
        GPtrArray *port_data;
@@ -86,6 +90,9 @@ struct ctf_fs_component {
 struct ctf_fs_trace {
        bt_logging_level log_level;
 
+       /* Weak */
+       bt_self_component *self_comp;
+
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
 
@@ -176,6 +183,9 @@ struct ctf_fs_port_data {
 struct ctf_fs_msg_iter_data {
        bt_logging_level log_level;
 
+       /* Weak */
+       bt_self_component *self_comp;
+
        /* Weak */
        bt_self_message_iterator *pc_msg_iter;
 
@@ -193,7 +203,7 @@ struct ctf_fs_msg_iter_data {
 };
 
 BT_HIDDEN
-bt_self_component_status ctf_fs_init(
+bt_component_class_init_method_status ctf_fs_init(
                bt_self_component_source *source,
                const bt_value *params, void *init_method_data);
 
@@ -201,7 +211,7 @@ BT_HIDDEN
 void ctf_fs_finalize(bt_self_component_source *component);
 
 BT_HIDDEN
-bt_query_status ctf_fs_query(
+bt_component_class_query_method_status ctf_fs_query(
                bt_self_component_class_source *comp_class,
                const bt_query_executor *query_exec,
                const char *object, const bt_value *params,
@@ -209,7 +219,7 @@ bt_query_status ctf_fs_query(
                const bt_value **result);
 
 BT_HIDDEN
-bt_self_message_iterator_status ctf_fs_iterator_init(
+bt_component_class_message_iterator_init_method_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);
@@ -218,19 +228,20 @@ BT_HIDDEN
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
 
 BT_HIDDEN
-bt_self_message_iterator_status ctf_fs_iterator_next(
+bt_component_class_message_iterator_next_method_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_component_class_message_iterator_seek_beginning_method_status ctf_fs_iterator_seek_beginning(
                bt_self_message_iterator *message_iterator);
 
 /* Create and initialize a new, empty ctf_fs_component. */
 
 BT_HIDDEN
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level);
+struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
+               bt_self_component *self_comp);
 
 /*
  * Search recursively under all paths in `paths_value` (an array of strings),