/*
- * Copyright 2017 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 Philippe Proulx <pproulx@efficios.com>
*/
#define BT_COMP_LOG_SELF_COMP (counter->self_comp)
#include "common/common.h"
#include "common/assert.h"
#include <inttypes.h>
+#include <stdbool.h>
#include <stdint.h>
#include "plugins/common/param-validation/param-validation.h"
}
}
+static
void destroy_private_counter_data(struct counter *counter)
{
if (counter) {
- bt_self_component_port_input_message_iterator_put_ref(
+ bt_message_iterator_put_ref(
counter->msg_iter);
g_free(counter);
}
}
-BT_HIDDEN
void counter_finalize(bt_self_component_sink *comp)
{
struct counter *counter;
bt_self_component_sink_as_self_component(comp));
BT_ASSERT(counter);
try_print_last(counter);
- bt_self_component_port_input_message_iterator_put_ref(counter->msg_iter);
+ bt_message_iterator_put_ref(counter->msg_iter);
g_free(counter);
}
+static
struct bt_param_validation_map_value_entry_descr counter_params[] = {
{ "step", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_UNSIGNED_INTEGER } },
{ "hide-zero", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END
};
-BT_HIDDEN
bt_component_class_initialize_method_status counter_init(
bt_self_component_sink *component,
- bt_self_component_sink_configuration *config,
+ bt_self_component_sink_configuration *config __attribute__((unused)),
const bt_value *params,
- __attribute__((unused)) void *init_method_data)
+ void *init_method_data __attribute__((unused)))
{
bt_component_class_initialize_method_status status;
bt_self_component_add_port_status add_port_status;
return status;
}
-BT_HIDDEN
bt_component_class_sink_graph_is_configured_method_status
counter_graph_is_configured(
bt_self_component_sink *comp)
{
bt_component_class_sink_graph_is_configured_method_status status;
- bt_self_component_port_input_message_iterator_create_from_sink_component_status
+ bt_message_iterator_create_from_sink_component_status
msg_iter_status;
struct counter *counter;
- bt_self_component_port_input_message_iterator *iterator;
+ bt_message_iterator *iterator;
counter = bt_self_component_get_data(
bt_self_component_sink_as_self_component(comp));
BT_ASSERT(counter);
- msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+ msg_iter_status = bt_message_iterator_create_from_sink_component(
comp, bt_self_component_sink_borrow_input_port_by_name(comp,
in_port_name), &iterator);
- if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+ if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
status = (int) msg_iter_status;
goto end;
}
- BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
+ BT_MESSAGE_ITERATOR_MOVE_REF(
counter->msg_iter, iterator);
status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
return status;
}
-BT_HIDDEN
bt_component_class_sink_consume_method_status counter_consume(
bt_self_component_sink *comp)
{
- bt_component_class_sink_consume_method_status status =
- BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
struct counter *counter;
bt_message_iterator_next_status next_status;
uint64_t msg_count;
bt_message_array_const msgs;
+ bt_self_component *self_comp =
+ bt_self_component_sink_as_self_component(comp);
- counter = bt_self_component_get_data(
- bt_self_component_sink_as_self_component(comp));
- BT_ASSERT(counter);
-
- if (G_UNLIKELY(!counter->msg_iter)) {
- try_print_last(counter);
- status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_END;
- goto end;
- }
+ counter = bt_self_component_get_data(self_comp);
+ BT_ASSERT_DBG(counter);
+ BT_ASSERT_DBG(counter->msg_iter);
/* Consume messages */
- next_status = bt_self_component_port_input_message_iterator_next(
+ next_status = bt_message_iterator_next(
counter->msg_iter, &msgs, &msg_count);
- if (next_status < 0) {
- status = (int) next_status;
- goto end;
- }
switch (next_status) {
case BT_MESSAGE_ITERATOR_NEXT_STATUS_OK:
for (i = 0; i < msg_count; i++) {
const bt_message *msg = msgs[i];
- BT_ASSERT(msg);
+ BT_ASSERT_DBG(msg);
switch (bt_message_get_type(msg)) {
case BT_MESSAGE_TYPE_EVENT:
counter->count.event++;
bt_message_put_ref(msg);
}
- status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
+ try_print_count(counter, msg_count);
break;
}
- case BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN:
- status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_AGAIN;
- goto end;
case BT_MESSAGE_ITERATOR_NEXT_STATUS_END:
try_print_last(counter);
- status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_END;
- goto end;
+ break;
+ case BT_MESSAGE_ITERATOR_NEXT_STATUS_ERROR:
case BT_MESSAGE_ITERATOR_NEXT_STATUS_MEMORY_ERROR:
- status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_MEMORY_ERROR;
- goto end;
+ BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(self_comp,
+ "Failed to get messages from upstream component");
+ break;
default:
break;
}
- try_print_count(counter, msg_count);
-
-end:
- return status;
+ return (int) next_status;
}
projects / babeltrace.git / blobdiff