/*
- * Copyright 2017-2019 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
- * 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.
+ * SPDX-License-Identifier: MIT
*
- * 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.
+ * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
*/
#define BT_LOG_TAG "LIB/COMPONENT-CLASS-SINK-SIMPLE"
#include "common/common.h"
#include "lib/assert-pre.h"
#include "lib/object.h"
-#include <babeltrace2/graph/component-class-sink.h>
-#include <babeltrace2/graph/self-component-sink.h>
+#include <babeltrace2/graph/component-class.h>
#include <babeltrace2/graph/self-component-port.h>
-#include <babeltrace2/graph/self-component-port-input-message-iterator.h>
#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/message-iterator.h>
#include <glib.h>
#include "component-class-sink-simple.h"
struct bt_component_class_sink *simple_comp_cls;
struct simple_sink_data {
- bt_self_component_port_input_message_iterator *msg_iter;
+ bt_message_iterator *msg_iter;
struct simple_sink_init_method_data init_method_data;
};
static
-enum bt_component_class_init_method_status simple_sink_init(
- struct bt_self_component_sink *self_comp,
+enum bt_component_class_initialize_method_status simple_sink_init(
+ bt_self_component_sink *self_comp,
+ bt_self_component_sink_configuration *config,
const struct bt_value *params, void *init_method_data)
{
int status = BT_FUNC_STATUS_OK;
simple_sink_graph_is_configured(
bt_self_component_sink *self_comp)
{
- int status = BT_FUNC_STATUS_OK;
+ bt_component_class_sink_graph_is_configured_method_status status;
+ bt_message_iterator_create_from_sink_component_status
+ msg_iter_status;
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
BT_LIB_LOGE_APPEND_CAUSE(
"Simple sink component's input port is not connected: "
"%![comp-]+c, %![port-]+p", self_comp, self_port);
- status = BT_FUNC_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
goto end;
}
BT_ASSERT(data);
- data->msg_iter =
- bt_self_component_port_input_message_iterator_create_from_sink_component(
- self_comp, self_port);
- if (!data->msg_iter) {
+ msg_iter_status = bt_message_iterator_create_from_sink_component(
+ self_comp, self_port, &data->msg_iter);
+ if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
BT_LIB_LOGE_APPEND_CAUSE(
"Cannot create input port message iterator: "
"%![comp-]+c, %![port-]+p", self_comp, self_port);
- status = BT_FUNC_STATUS_MEMORY_ERROR;
+ status = (int) msg_iter_status;
goto end;
}
if (data->init_method_data.init_func) {
+ bt_graph_simple_sink_component_initialize_func_status init_status;
+
/* Call user's initialization function */
- status = data->init_method_data.init_func(data->msg_iter,
+ init_status = data->init_method_data.init_func(data->msg_iter,
data->init_method_data.user_data);
- if (status != BT_FUNC_STATUS_OK) {
+ if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK) {
BT_LIB_LOGW_APPEND_CAUSE(
"Simple sink component's user's initialization function failed: "
"status=%s, %![comp-]+c, %![port-]+p",
- bt_common_func_status_string(status),
+ bt_common_func_status_string(init_status),
self_comp, self_port);
+ status = (int) init_status;
goto end;
}
}
+ status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
end:
return status;
}
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
- BT_ASSERT(data);
- BT_ASSERT(data->init_method_data.consume_func);
- BT_ASSERT(data->msg_iter);
+ BT_ASSERT_DBG(data);
+ BT_ASSERT_DBG(data->init_method_data.consume_func);
+ BT_ASSERT_DBG(data->msg_iter);
/* Call user's "consume" function */
status = data->init_method_data.consume_func(data->msg_iter,
data->init_method_data.user_data);
- if (status != BT_FUNC_STATUS_OK) {
+ if (status < 0) {
BT_LIB_LOGW_APPEND_CAUSE(
"Simple sink component's user's \"consume\" function failed: "
"status=%s, %![comp-]+c",
{
enum bt_component_class_set_method_status set_method_status;
+ BT_ASSERT_PRE_NO_ERROR();
+
if (simple_comp_cls) {
goto end;
}
goto end;
}
- set_method_status = bt_component_class_sink_set_init_method(
+ set_method_status = bt_component_class_sink_set_initialize_method(
simple_comp_cls, simple_sink_init);
BT_ASSERT(set_method_status == BT_FUNC_STATUS_OK);
set_method_status = bt_component_class_sink_set_finalize_method(
projects / babeltrace.git / blobdiff