* SOFTWARE.
*/
-#define BT_LOG_TAG "COMP-FILTER"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/COMPONENT-FILTER"
+#include "lib/logging.h"
#include "common/assert.h"
#include "lib/assert-pre.h"
#include "compat/compiler.h"
#include <babeltrace2/value.h>
-#include <babeltrace2/graph/self-component-filter.h>
-#include <babeltrace2/graph/component-filter-const.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/component.h>
#include <babeltrace2/graph/graph.h>
#include "component-filter.h"
#include "component.h"
#include "component-class.h"
+#include "lib/func-status.h"
BT_HIDDEN
void bt_component_filter_destroy(struct bt_component *component)
{
struct bt_component_filter *filter = NULL;
+ BT_ASSERT_PRE_NO_ERROR();
+
filter = g_new0(struct bt_component_filter, 1);
if (!filter) {
- BT_LOGE_STR("Failed to allocate one filter component.");
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one filter component.");
goto end;
}
{
struct bt_component_class *cls;
- BT_ASSERT_PRE_NON_NULL(component, "Component");
+ BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
cls = component->parent.class;
- BT_ASSERT(cls);
- BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
+ BT_ASSERT_DBG(cls);
+ BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
return (bt_component_class_filter *) cls;
}
(void *) comp, index);
}
-enum bt_self_component_status bt_self_component_filter_add_output_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
struct bt_self_component_filter *self_comp,
const char *name, void *user_data,
struct bt_self_component_port_output **self_port)
{
struct bt_component *comp = (void *) self_comp;
- enum bt_self_component_status status;
+ enum bt_self_component_add_port_status status;
struct bt_port *port = NULL;
+ BT_ASSERT_PRE_NO_ERROR();
+
/* bt_component_add_output_port() logs details and errors */
status = bt_component_add_output_port(comp, name, user_data, &port);
- if (status != BT_SELF_COMPONENT_STATUS_OK) {
+ if (status != BT_FUNC_STATUS_OK) {
goto end;
}
if (self_port) {
/* Move reference to user */
*self_port = (void *) port;
- port = NULL;
}
end:
(void *) component, index);
}
-enum bt_self_component_status bt_self_component_filter_add_input_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
struct bt_self_component_filter *self_comp,
const char *name, void *user_data,
struct bt_self_component_port_input **self_port)
{
- enum bt_self_component_status status;
+ enum bt_self_component_add_port_status status;
struct bt_port *port = NULL;
struct bt_component *comp = (void *) self_comp;
+ BT_ASSERT_PRE_NO_ERROR();
+
/* bt_component_add_input_port() logs details/errors */
status = bt_component_add_input_port(comp, name, user_data, &port);
- if (status != BT_SELF_COMPONENT_STATUS_OK) {
+ if (status != BT_FUNC_STATUS_OK) {
goto end;
}
if (self_port) {
/* Move reference to user */
*self_port = (void *) port;
- port = NULL;
}
end: