Rename <babeltrace/component/...> -> <babeltrace/graph/...>

[babeltrace.git] / plugins / utils / dummy / dummy.c

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index 79b8f5bad557df62f248bdeef39fb3f122eab376..df4b5a3b936e11a7491888b4d0bc7ca94fbb1e54 100644 (file)
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -21,10 +21,14 @@
  */
 
 #include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/component/component.h>
-#include <babeltrace/component/component-sink.h>
-#include <babeltrace/component/notification/iterator.h>
-#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-port.h>
+#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/private-connection.h>
+#include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/notification-iterator.h>
+#include <babeltrace/graph/notification.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include "dummy.h"
@@ -38,17 +42,17 @@ void destroy_private_dummy_data(struct dummy *dummy)
        g_free(dummy);
 }
 
-void dummy_destroy(struct bt_component *component)
+void dummy_finalize(struct bt_private_component *component)
 {
        struct dummy *dummy;
 
        assert(component);
-       dummy = bt_component_get_private_data(component);
+       dummy = bt_private_component_get_user_data(component);
        assert(dummy);
        destroy_private_dummy_data(dummy);
 }
 
-enum bt_component_status dummy_init(struct bt_component *component,
+enum bt_component_status dummy_init(struct bt_private_component *component,
                struct bt_value *params, UNUSED_VAR void *init_method_data)
 {
        enum bt_component_status ret;
@@ -66,7 +70,7 @@ enum bt_component_status dummy_init(struct bt_component *component,
                goto end;
        }
 
-       ret = bt_component_set_private_data(component, dummy);
+       ret = bt_private_component_set_user_data(component, dummy);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
@@ -77,21 +81,24 @@ error:
        return ret;
 }
 
-enum bt_component_status dummy_accept_port_connection(struct bt_component *component,
-               struct bt_port *self_port)
+enum bt_component_status dummy_accept_port_connection(
+               struct bt_private_component *component,
+               struct bt_private_port *self_port,
+               struct bt_port *other_port)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct dummy *dummy;
-       struct bt_connection *connection;
        struct bt_notification_iterator *iterator;
+       struct bt_private_connection *connection;
 
-       dummy = bt_component_get_private_data(component);
+       dummy = bt_private_component_get_user_data(component);
        assert(dummy);
 
-       connection = bt_port_get_connection(self_port);
+       connection = bt_private_port_get_private_connection(self_port);
        assert(connection);
 
-       iterator = bt_connection_create_notification_iterator(connection);
+       iterator = bt_private_connection_create_notification_iterator(
+               connection);
        if (!iterator) {
                ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
@@ -103,14 +110,14 @@ end:
        return ret;
 }
 
-enum bt_component_status dummy_consume(struct bt_component *component)
+enum bt_component_status dummy_consume(struct bt_private_component *component)
 {
        enum bt_component_status ret;
        struct bt_notification *notif = NULL;
        size_t i;
        struct dummy *dummy;
 
-       dummy = bt_component_get_private_data(component);
+       dummy = bt_private_component_get_user_data(component);
        assert(dummy);
 
        /* Consume one notification from each iterator. */