Simplify sink.utils.dummy: only one upstream notification iterator
[babeltrace.git] / plugins / utils / dummy / dummy.c
index d9ce97af03fac11a691ac1656d2e285a4c068e6a..5e6987934c614cc0f600ef3a43fd747d39206aba 100644 (file)
  */
 
 #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/connection.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-component-sink.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 <babeltrace/babeltrace-internal.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include "dummy.h"
 
-static
 void destroy_private_dummy_data(struct dummy *dummy)
 {
-       if (dummy->iterators) {
-               g_ptr_array_free(dummy->iterators, TRUE);
-       }
+       bt_put(dummy->notif_iter);
        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;
@@ -59,97 +63,89 @@ enum bt_component_status dummy_init(struct bt_component *component,
                goto end;
        }
 
-       dummy->iterators = g_ptr_array_new_with_free_func(
-                       (GDestroyNotify) bt_put);
-       if (!dummy->iterators) {
-               ret = BT_COMPONENT_STATUS_NOMEM;
+       ret = bt_private_component_sink_add_input_private_port(component,
+               "in", NULL, NULL);
+       if (ret != BT_COMPONENT_STATUS_OK) {
                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;
        }
-end:
-       return ret;
+
+       goto end;
+
 error:
        destroy_private_dummy_data(dummy);
+
+end:
        return ret;
 }
 
-enum bt_component_status dummy_new_connection(struct bt_port *own_port,
-               struct bt_connection *connection)
+void dummy_port_connected(
+               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 bt_component *component;
        struct dummy *dummy;
        struct bt_notification_iterator *iterator;
+       struct bt_private_connection *connection;
+       enum bt_connection_status conn_status;
 
-       component = bt_port_get_component(own_port);
-       assert(component);
-
-       dummy = bt_component_get_private_data(component);
+       dummy = bt_private_component_get_user_data(component);
        assert(dummy);
-
-       iterator = bt_connection_create_notification_iterator(connection);
-       if (!iterator) {
-               ret = BT_COMPONENT_STATUS_ERROR;
+       connection = bt_private_port_get_private_connection(self_port);
+       assert(connection);
+       conn_status = bt_private_connection_create_notification_iterator(
+               connection, NULL, &iterator);
+       if (conn_status != BT_CONNECTION_STATUS_OK) {
+               dummy->error = true;
                goto end;
        }
 
-       g_ptr_array_add(dummy->iterators, iterator);
+       BT_MOVE(dummy->notif_iter, iterator);
+
 end:
-       bt_put(component);
-       return ret;
+       bt_put(connection);
 }
 
-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;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct bt_notification *notif = NULL;
-       size_t i;
        struct dummy *dummy;
+       enum bt_notification_iterator_status it_ret;
 
-       dummy = bt_component_get_private_data(component);
+       dummy = bt_private_component_get_user_data(component);
        assert(dummy);
 
-       /* Consume one notification from each iterator. */
-       for (i = 0; i < dummy->iterators->len; i++) {
-               struct bt_notification_iterator *it;
-               enum bt_notification_iterator_status it_ret;
-
-               it = g_ptr_array_index(dummy->iterators, i);
-
-               it_ret = bt_notification_iterator_next(it);
-               switch (it_ret) {
-               case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
-                       ret = BT_COMPONENT_STATUS_ERROR;
-                       goto end;
-               case BT_NOTIFICATION_ITERATOR_STATUS_END:
-                       ret = BT_COMPONENT_STATUS_END;
-                       g_ptr_array_remove_index(dummy->iterators, i);
-                       i--;
-                       continue;
-               default:
-                       break;
-               }
-
-               notif = bt_notification_iterator_get_notification(it);
-               if (!notif) {
-                       ret = BT_COMPONENT_STATUS_ERROR;
-                       goto end;
-               }
-
-               /*
-                * Dummy! I'm doing nothing with this notification,
-                * NOTHING.
-                */
-               BT_PUT(notif);
+       if (unlikely(dummy->error)) {
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
+       }
+
+       if (unlikely(!dummy->notif_iter)) {
+               ret = BT_COMPONENT_STATUS_END;
+               goto end;
        }
 
-       if (dummy->iterators->len == 0) {
+       /* Consume one notification  */
+       it_ret = bt_notification_iterator_next(dummy->notif_iter);
+       switch (it_ret) {
+       case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
+       case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+               ret = BT_COMPONENT_STATUS_AGAIN;
+               goto end;
+       case BT_NOTIFICATION_ITERATOR_STATUS_END:
                ret = BT_COMPONENT_STATUS_END;
+               goto end;
+       default:
+               break;
        }
+
 end:
        bt_put(notif);
        return ret;
This page took 0.026003 seconds and 4 git commands to generate.