X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Fdummy%2Fdummy.c;h=5e6987934c614cc0f600ef3a43fd747d39206aba;hb=d19348b68954786e1f46aefe26be9220b960dcc4;hp=df4b5a3b936e11a7491888b4d0bc7ca94fbb1e54;hpb=b2e0c9076135f47110af2d96dfaee397c597bc90;p=babeltrace.git

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index df4b5a3b..5e698793 100644
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -21,24 +21,24 @@
  */
 
 #include <babeltrace/plugin/plugin-dev.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);
 }
 
@@ -63,10 +63,9 @@ enum bt_component_status dummy_init(struct bt_private_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;
 	}
 
@@ -74,89 +73,79 @@ enum bt_component_status dummy_init(struct bt_private_component *component,
 	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_accept_port_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 dummy *dummy;
 	struct bt_notification_iterator *iterator;
 	struct bt_private_connection *connection;
+	enum bt_connection_status conn_status;
 
 	dummy = bt_private_component_get_user_data(component);
 	assert(dummy);
-
 	connection = bt_private_port_get_private_connection(self_port);
 	assert(connection);
-
-	iterator = bt_private_connection_create_notification_iterator(
-		connection);
-	if (!iterator) {
-		ret = BT_COMPONENT_STATUS_ERROR;
+	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(connection);
-	return ret;
 }
 
 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_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;