lib: remove self component param. from msg. iterator init. method

Since a3f0c7db ("lib: introduce bt_message_iterator_class"), the
`self_component` parameter of
`bt_message_iterator_class_initialize_method` is useless because you can
access the equivalent with bt_self_message_iterator_borrow_component().

Remove it.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I81e967acfd99b6ef3a2e01ae2ee19008a3c60408
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2761
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>

diff --git a/include/babeltrace2/graph/message-iterator-class.h b/include/babeltrace2/graph/message-iterator-class.h
index c52fcd72dc7df970ed8faf9be585a039edc009b8..3ee9c0da5ed2d161efc40446831b60859d580fe0 100644 (file)
--- a/include/babeltrace2/graph/message-iterator-class.h
+++ b/include/babeltrace2/graph/message-iterator-class.h
@@ -81,7 +81,6 @@ typedef bt_message_iterator_class_initialize_method_status
 (*bt_message_iterator_class_initialize_method)(
                bt_self_message_iterator *message_iterator,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_component,
                bt_self_component_port_output *port);
 
 typedef void

diff --git a/src/bindings/python/bt2/bt2/native_bt_component_class.i.h b/src/bindings/python/bt2/bt2/native_bt_component_class.i.h
index 1f193685d101d5152fa94592e03164494a0b95ff..f0ba04258d2a331705d3586a67b5c247162e2b7b 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_component_class.i.h
+++ b/src/bindings/python/bt2/bt2/native_bt_component_class.i.h
@@ -1083,7 +1083,6 @@ bt_message_iterator_class_initialize_method_status
 component_class_message_iterator_init(
                bt_self_message_iterator *self_message_iterator,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_component,
                bt_self_component_port_output *self_component_port_output)
 {
        bt_message_iterator_class_initialize_method_status status = __BT_FUNC_STATUS_OK;
@@ -1095,6 +1094,9 @@ component_class_message_iterator_init(
        PyObject *py_init_method_result = NULL;
        PyObject *py_iter = NULL;
        PyObject *py_comp;
+       bt_self_component *self_component =
+               bt_self_message_iterator_borrow_component(
+                       self_message_iterator);
        bt_logging_level log_level = get_self_component_log_level(
                self_component);
 

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index c0ca8f8675f69e90767aba0c5b76590256bf43a1..615373196063f1b9b53243a61412edf6cf609830 100644 (file)
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -427,7 +427,6 @@ int create_self_component_input_port_message_iterator(
                iter_status = init_method(
                        (struct bt_self_message_iterator *) iterator,
                        &iterator->config,
-                       (struct bt_self_component *) upstream_comp,
                        (struct bt_self_component_port_output *) upstream_port);
                BT_LOGD("User method returned: status=%s",
                        bt_common_func_status_string(iter_status));

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index a6712cb74ab9ae2a419728cc4088f169c4a7b752..e87523a37c0f70ae4a7ee2e49ea059831de4f8dd 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -211,7 +211,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        struct ctf_fs_port_data *port_data;
@@ -219,6 +218,8 @@ bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
        bt_message_iterator_class_initialize_method_status status;
        bt_logging_level log_level;
        enum ctf_msg_iter_medium_status medium_status;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        port_data = bt_self_component_port_get_data(
                bt_self_component_port_output_as_self_component_port(

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index 763136afef7be989fe7b2861f523c2179bbf7ba0..ef9cdaa48a88be146c9e4b6beec9e35079958f5c 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -225,7 +225,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port);
 
 BT_HIDDEN

diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 6d77035b3ecde36fedcfac32db8fb097bef84980..d812e818f24c2177672400946ab5f7e852f9328c 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -1567,7 +1567,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status lttng_live_msg_iter_init(
                bt_self_message_iterator *self_msg_it,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        bt_message_iterator_class_initialize_method_status status;
@@ -1575,8 +1574,8 @@ bt_message_iterator_class_initialize_method_status lttng_live_msg_iter_init(
        struct lttng_live_msg_iter *lttng_live_msg_iter;
        enum lttng_live_viewer_status viewer_status;
        bt_logging_level log_level;
-
-       BT_ASSERT(self_msg_it);
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_it);
 
        lttng_live = bt_self_component_get_data(self_comp);
        log_level = lttng_live->log_level;

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index 39bc5abc5a39b67dbcb8f3b5e869790725ec582f..80c40de2ab95399cc14702b05f747e352a510fcb 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -301,7 +301,6 @@ bt_message_iterator_class_next_method_status lttng_live_msg_iter_next(
 bt_message_iterator_class_initialize_method_status lttng_live_msg_iter_init(
                bt_self_message_iterator *self_msg_it,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port);
 
 void lttng_live_msg_iter_finalize(bt_self_message_iterator *it);

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index 7b6ea383548b2e8296cfe2fd844bdf5988d27fe9..36af5aa2c30dd129398e06d0cc2fd03a7da59ffa 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/debug-info.c
+++ b/src/plugins/lttng-utils/debug-info/debug-info.c
@@ -1984,7 +1984,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status debug_info_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        bt_message_iterator_class_initialize_method_status status;
@@ -1995,6 +1994,8 @@ bt_message_iterator_class_initialize_method_status debug_info_msg_iter_init(
        struct debug_info_msg_iter *debug_info_msg_iter = NULL;
        gchar *debug_info_field_name;
        int ret;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
        bt_logging_level log_level = bt_component_get_logging_level(
                bt_self_component_as_component(self_comp));
 

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.h b/src/plugins/lttng-utils/debug-info/debug-info.h
index 13fc0ff8cc110ddfcf3efc241146b5296f10e127..071ef379d9ced8fbbc1101a7c48558eef9310594 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/debug-info.h
+++ b/src/plugins/lttng-utils/debug-info/debug-info.h
@@ -50,7 +50,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status debug_info_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port);
 
 BT_HIDDEN

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 65718d326b0f5e75eb9dd13f72087bdecaad4cbc..50ceb7e64454d87833bd46cb8034a0f1eb370e72 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -665,9 +665,10 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status dmesg_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
        struct dmesg_component *dmesg_comp = bt_self_component_get_data(self_comp);
        struct dmesg_msg_iter *dmesg_msg_iter =
                g_new0(struct dmesg_msg_iter, 1);

diff --git a/src/plugins/text/dmesg/dmesg.h b/src/plugins/text/dmesg/dmesg.h
index c73999ed3716c76e34de5b623a6c2668b3809bd7..b94397e1c235072456d95ace846fb913ab335fe5 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.h
+++ b/src/plugins/text/dmesg/dmesg.h
@@ -40,7 +40,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status dmesg_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port);
 
 BT_HIDDEN

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index db8b86bd817c94c7d5a6dd9a56dc433c0554421a..2554d2705a561c23b64ff6c2162d53bc62f642dc 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -1276,12 +1276,13 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status muxer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *port)
 {
        struct muxer_comp *muxer_comp = NULL;
        struct muxer_msg_iter *muxer_msg_iter = NULL;
        bt_message_iterator_class_initialize_method_status status;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        muxer_comp = bt_self_component_get_data(self_comp);
        BT_ASSERT(muxer_comp);

diff --git a/src/plugins/utils/muxer/muxer.h b/src/plugins/utils/muxer/muxer.h
index aa9a21dd6546a6bc053a99566cbdadcc222afbfe..f20366312c379f7105e3788406239f567d4a70a7 100644 (file)
--- a/src/plugins/utils/muxer/muxer.h
+++ b/src/plugins/utils/muxer/muxer.h
@@ -41,7 +41,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status muxer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port);
 
 BT_HIDDEN

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 2fc365c9650d82ca320acfb6a342fd2ee59de236..e46884de389590eb4d810e01042dde3a0ad88246 100644 (file)
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -699,13 +699,14 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status trimmer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *port)
 {
        bt_message_iterator_class_initialize_method_status status;
        bt_message_iterator_create_from_message_iterator_status
                msg_iter_status;
        struct trimmer_iterator *trimmer_it;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        trimmer_it = g_new0(struct trimmer_iterator, 1);
        if (!trimmer_it) {

diff --git a/src/plugins/utils/trimmer/trimmer.h b/src/plugins/utils/trimmer/trimmer.h
index 678aca290d2f283c614d5732b5af572795439719..a7100b677caab24ba0b7b3a6f896fad4482cbf85 100644 (file)
--- a/src/plugins/utils/trimmer/trimmer.h
+++ b/src/plugins/utils/trimmer/trimmer.h
@@ -43,7 +43,6 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status trimmer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *port);
 
 BT_HIDDEN

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index a425b7a763e030f1d9e4510abf86cea2eec9377f..4c0c7acbb13b4403e4bb9c244163a0c84b6a7fda 100644 (file)
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -28,7 +28,6 @@ static bt_message_iterator_class_initialize_method_status
 src_dummy_iterator_init_method(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
@@ -38,7 +37,6 @@ static bt_message_iterator_class_initialize_method_status
 flt_dummy_iterator_init_method(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;