bt_port_output_notification_iterator_create(): remove colander comp. name

This is an implementation detail. Just use a UUID that I just generated
to make it unique enough.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/include/babeltrace/graph/port-output-notification-iterator.h b/include/babeltrace/graph/port-output-notification-iterator.h
index a271a2125f76532cd8b2b7e9ba0b486d080e4a0a..ddfb3f912ffbcce9cb9a30236eeabb77cf70264b 100644 (file)
--- a/include/babeltrace/graph/port-output-notification-iterator.h
+++ b/include/babeltrace/graph/port-output-notification-iterator.h
@@ -52,8 +52,7 @@ bt_port_output_notification_iterator_as_notification_iterator(
 
 extern struct bt_port_output_notification_iterator *bt_port_output_notification_iterator_create(
                struct bt_private_graph *graph,
-               struct bt_port_output *output_port,
-               const char *colander_component_name);
+               struct bt_port_output *output_port);
 
 extern enum bt_notification_iterator_status
 bt_port_output_notification_iterator_next(

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index ca0c49d222553f584a6b824bd64c666dd61464b5..fd728ad7311febb651ac00f4ab8c178e352e338a 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -909,8 +909,7 @@ void bt_port_output_notification_iterator_destroy(struct bt_object *obj)
 struct bt_port_output_notification_iterator *
 bt_port_output_notification_iterator_create(
                struct bt_private_graph *priv_graph,
-               struct bt_port_output *output_port,
-               const char *colander_component_name)
+               struct bt_port_output *output_port)
 {
        struct bt_port_output_notification_iterator *iterator = NULL;
        struct bt_component_class_sink *colander_comp_cls = NULL;
@@ -918,7 +917,6 @@ bt_port_output_notification_iterator_create(
        struct bt_component_sink *colander_comp;
        struct bt_graph *graph = (void *) priv_graph;
        enum bt_graph_status graph_status;
-       const char *colander_comp_name;
        struct bt_port_input *colander_in_port = NULL;
        struct bt_component_class_sink_colander_data colander_data;
        int ret;
@@ -959,13 +957,14 @@ bt_port_output_notification_iterator_create(
        }
 
        iterator->graph = bt_object_get_ref(graph);
-       colander_comp_name =
-               colander_component_name ? colander_component_name : "colander";
        colander_data.notifs = (void *) iterator->base.notifs->pdata;
        colander_data.count_addr = &iterator->count;
+
+       /* Hope that nobody uses this very unique name */
        graph_status =
                bt_private_graph_add_sink_component_with_init_method_data(
-                       (void *) graph, colander_comp_cls, colander_comp_name,
+                       (void *) graph, colander_comp_cls,
+                       "colander-36ac3409-b1a8-4d60-ab1f-4fdf341a8fb1",
                        NULL, &colander_data, &iterator->colander);
        if (graph_status != BT_GRAPH_STATUS_OK) {
                BT_LIB_LOGW("Cannot add colander sink component to graph: "

diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c
index c0d25d0a213fc06ff94a3ad74dd60b2d9cb285d5..97cf0506e9c981efd33c74db26c6966cdf73a86a 100644 (file)
--- a/tests/lib/test_bt_notification_iterator.c
+++ b/tests/lib/test_bt_notification_iterator.c
@@ -861,7 +861,7 @@ void test_output_port_notification_iterator(void)
        upstream_port = bt_component_source_borrow_output_port_by_name(
                src_comp, "out");
        notif_iter = bt_port_output_notification_iterator_create(graph,
-               upstream_port, NULL);
+               upstream_port);
        ok(notif_iter, "bt_private_output_port_notification_iterator_create() succeeds");
 
        /* Consume the notification iterator */