Re-organize sources

[babeltrace.git] / tests / lib / test_graph_topo.c

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index cf73109a356a74d653cb6a2fcc7fdb4c190fb89b..7a85f511cfa4584718cb036e7365670d52dfc52f 100644 (file)
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include "common/assert.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
@@ -418,8 +418,9 @@ bt_self_component_status sink_consume(
 }
 
 static
-void graph_src_output_port_added(const bt_component_source *comp,
-               const bt_port_output *port, void *data)
+bt_graph_listener_status graph_src_output_port_added(
+               const bt_component_source *comp, const bt_port_output *port,
+               void *data)
 {
        struct event event = {
                .type = GRAPH_SRC_OUTPUT_PORT_ADDED,
@@ -430,11 +431,14 @@ void graph_src_output_port_added(const bt_component_source *comp,
        };
 
        append_event(&event);
+
+       return BT_GRAPH_LISTENER_STATUS_OK;
 }
 
 static
-void graph_sink_input_port_added(const bt_component_sink *comp,
-               const bt_port_input *port, void *data)
+bt_graph_listener_status graph_sink_input_port_added(
+               const bt_component_sink *comp, const bt_port_input *port,
+               void *data)
 {
        struct event event = {
                .type = GRAPH_SINK_INPUT_PORT_ADDED,
@@ -445,10 +449,13 @@ void graph_sink_input_port_added(const bt_component_sink *comp,
        };
 
        append_event(&event);
+
+       return BT_GRAPH_LISTENER_STATUS_OK;
 }
 
 static
-void graph_src_sink_ports_connected(const bt_component_source *upstream_comp,
+bt_graph_listener_status graph_src_sink_ports_connected(
+               const bt_component_source *upstream_comp,
                const bt_component_sink *downstream_comp,
                const bt_port_output *upstream_port,
                const bt_port_input *downstream_port, void *data)
@@ -468,6 +475,8 @@ void graph_src_sink_ports_connected(const bt_component_source *upstream_comp,
        };
 
        append_event(&event);
+
+       return BT_GRAPH_LISTENER_STATUS_OK;
 }
 
 static