* SOFTWARE.
*/
-#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.h>
#include <babeltrace/babeltrace-internal.h>
#include <plugins-common.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include "dummy.h"
-static
void destroy_private_dummy_data(struct dummy *dummy)
{
- if (dummy->iterators) {
- g_ptr_array_free(dummy->iterators, TRUE);
- }
+ bt_object_put_ref(dummy->notif_iter);
g_free(dummy);
}
{
struct dummy *dummy;
- assert(component);
+ BT_ASSERT(component);
dummy = bt_private_component_get_user_data(component);
- assert(dummy);
+ BT_ASSERT(dummy);
destroy_private_dummy_data(dummy);
}
goto end;
}
- dummy->iterators = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_put);
- if (!dummy->iterators) {
- ret = BT_COMPONENT_STATUS_NOMEM;
- goto end;
- }
-
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;
}
-void dummy_port_connected(
+enum bt_component_status dummy_port_connected(
struct bt_private_component *component,
struct bt_private_port *self_port,
struct bt_port *other_port)
{
+ enum bt_component_status status = 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);
+ BT_ASSERT(dummy);
connection = bt_private_port_get_private_connection(self_port);
- assert(connection);
+ BT_ASSERT(connection);
conn_status = bt_private_connection_create_notification_iterator(
- connection, NULL, &iterator);
+ connection, &iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
- dummy->error = true;
+ status = BT_COMPONENT_STATUS_ERROR;
goto end;
}
- g_ptr_array_add(dummy->iterators, iterator);
+ BT_OBJECT_MOVE_REF(dummy->notif_iter, iterator);
end:
- bt_put(connection);
+ bt_object_put_ref(connection);
+ return status;
}
enum bt_component_status dummy_consume(struct bt_private_component *component)
{
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
- struct bt_notification *notif = NULL;
- size_t i;
+ bt_notification_array notifs;
+ uint64_t count;
struct dummy *dummy;
+ enum bt_notification_iterator_status it_ret;
+ uint64_t i;
dummy = bt_private_component_get_user_data(component);
- assert(dummy);
+ BT_ASSERT(dummy);
- if (unlikely(dummy->error)) {
- ret = BT_COMPONENT_STATUS_ERROR;
+ if (unlikely(!dummy->notif_iter)) {
+ ret = BT_COMPONENT_STATUS_END;
goto end;
}
- /* 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_AGAIN:
- ret = BT_COMPONENT_STATUS_AGAIN;
- goto end;
- case BT_NOTIFICATION_ITERATOR_STATUS_END:
- g_ptr_array_remove_index(dummy->iterators, i);
- i--;
- continue;
- default:
- break;
+ /* Consume one notification */
+ it_ret = bt_private_connection_notification_iterator_next(
+ dummy->notif_iter, ¬ifs, &count);
+ switch (it_ret) {
+ case BT_NOTIFICATION_ITERATOR_STATUS_OK:
+ ret = BT_COMPONENT_STATUS_OK;
+
+ for (i = 0; i < count; i++) {
+ bt_object_put_ref(notifs[i]);
}
- }
- if (dummy->iterators->len == 0) {
+ break;
+ 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;
+ case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto end;
+ default:
+ break;
}
+
end:
- bt_put(notif);
return ret;
}