/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2016 Jérémie Galarneau <jeremie.galarneau@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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * 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 "lib/assert-cond.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_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE(comp, name);
+
/* 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_ASSERT_PRE_INPUT_PORT_NAME_UNIQUE(comp, name);
+
/* 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: