/*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
#define BT_LOG_TAG "COLANDER"
#include <babeltrace/lib-logging-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/private-component-class-sink.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/graph/component-class-sink.h>
#include <babeltrace/graph/self-component-sink.h>
#include <babeltrace/graph/self-component-port.h>
#include <babeltrace/graph/self-component-port-input-notification-iterator.h>
#include <babeltrace/graph/self-component.h>
#include <babeltrace/graph/component-class-sink-colander-internal.h>
-#include <babeltrace/assert-internal.h>
#include <glib.h>
static
-struct bt_private_component_class_sink *colander_comp_cls;
+struct bt_component_class_sink *colander_comp_cls;
struct colander_data {
- bt_notification_array notifs;
+ bt_notification_array_const notifs;
uint64_t *count_addr;
struct bt_self_component_port_input_notification_iterator *notif_iter;
};
static
enum bt_self_component_status colander_init(
struct bt_self_component_sink *self_comp,
- struct bt_value *params, void *init_method_data)
+ const struct bt_value *params, void *init_method_data)
{
enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct colander_data *colander_data = NULL;
enum bt_self_component_status colander_input_port_connected(
struct bt_self_component_sink *self_comp,
struct bt_self_component_port_input *self_port,
- struct bt_port_output *other_port)
+ const struct bt_port_output *other_port)
{
enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct colander_data *colander_data =
struct colander_data *colander_data =
bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
- bt_notification_array notifs;
+ bt_notification_array_const notifs;
BT_ASSERT(colander_data);
goto end;
}
- colander_comp_cls = bt_private_component_class_sink_create(
- "colander", colander_consume);
+ colander_comp_cls = bt_component_class_sink_create("colander",
+ colander_consume);
if (!colander_comp_cls) {
BT_LOGE_STR("Cannot create sink colander component class.");
goto end;
}
- (void) bt_private_component_class_sink_set_init_method(
+ (void) bt_component_class_sink_set_init_method(
colander_comp_cls, colander_init);
- (void) bt_private_component_class_sink_set_finalize_method(
+ (void) bt_component_class_sink_set_finalize_method(
colander_comp_cls, colander_finalize);
- (void) bt_private_component_class_sink_set_input_port_connected_method(
+ (void) bt_component_class_sink_set_input_port_connected_method(
colander_comp_cls, colander_input_port_connected);
end: