lib: remove bt_self_port{,_input,_output}

They are equivalent to/redundant with

- bt_self_component_port
- bt_self_component_port_input
- bt_self_component_port_output

Change-Id: I2c466d829f2fecd3567aea195aa08045be9b6f53
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2030
CI-Build: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>

diff --git a/include/babeltrace2/graph/self-message-iterator.h b/include/babeltrace2/graph/self-message-iterator.h
index 025eb278a8dfb311e40f3196b467051f7f63d6d1..ad528e49ff02f5771947b3012e619bde89fb1702 100644 (file)
--- a/include/babeltrace2/graph/self-message-iterator.h
+++ b/include/babeltrace2/graph/self-message-iterator.h
@@ -40,7 +40,7 @@ extern bt_self_component *
 bt_self_message_iterator_borrow_component(
                bt_self_message_iterator *message_iterator);
 
-extern bt_self_port_output *
+extern bt_self_component_port_output *
 bt_self_message_iterator_borrow_port(
                bt_self_message_iterator *message_iterator);
 

diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h
index 55fba0edfbefaf7eba286b89321baa619ed3640d..3e61f325069cb1eb052b8240eff6ad6d8e3c349e 100644 (file)
--- a/include/babeltrace2/types.h
+++ b/include/babeltrace2/types.h
@@ -146,9 +146,6 @@ typedef struct bt_self_component_sink bt_self_component_sink;
 typedef struct bt_self_component_source bt_self_component_source;
 typedef struct bt_self_message_iterator bt_self_message_iterator;
 typedef struct bt_self_plugin bt_self_plugin;
-typedef struct bt_self_port bt_self_port;
-typedef struct bt_self_port_input bt_self_port_input;
-typedef struct bt_self_port_output bt_self_port_output;
 typedef struct bt_stream bt_stream;
 typedef struct bt_stream_class bt_stream_class;
 typedef struct bt_trace bt_trace;

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index 81f7dd9d37a18451dfdcc0838048ec4b5e2ee5c6..3ebe11f866438c70acdb65abd87303551a14b0eb 100644 (file)
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -951,7 +951,7 @@ struct bt_self_component *bt_self_message_iterator_borrow_component(
        return (void *) iterator->upstream_component;
 }
 
-struct bt_self_port_output *bt_self_message_iterator_borrow_port(
+struct bt_self_component_port_output *bt_self_message_iterator_borrow_port(
                struct bt_self_message_iterator *self_iterator)
 {
        struct bt_self_component_port_input_message_iterator *iterator =