X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fcounter%2Fcounter.c;h=cff0d577d2ccdda2f3e1682b428716d194042cd3;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=db269e78e636b9b39d7df57167a35edb48cdea1a;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c index db269e78..cff0d577 100644 --- a/src/plugins/utils/counter/counter.c +++ b/src/plugins/utils/counter/counter.c @@ -23,14 +23,16 @@ #define BT_COMP_LOG_SELF_COMP (counter->self_comp) #define BT_LOG_OUTPUT_LEVEL (counter->log_level) #define BT_LOG_TAG "PLUGIN/FLT.UTILS.COUNTER" -#include "plugins/comp-logging.h" +#include "logging/comp-logging.h" #include #include "common/macros.h" #include "common/common.h" #include "common/assert.h" #include +#include #include +#include "plugins/common/param-validation/param-validation.h" #include "counter.h" @@ -53,8 +55,6 @@ uint64_t get_total_count(struct counter *counter) return counter->count.event + counter->count.stream_begin + counter->count.stream_end + - counter->count.stream_activity_begin + - counter->count.stream_activity_end + counter->count.packet_begin + counter->count.packet_end + counter->count.disc_events + @@ -71,8 +71,6 @@ void print_count(struct counter *counter) PRINTF_COUNT("Event", event); PRINTF_COUNT("Stream beginning", stream_begin); PRINTF_COUNT("Stream end", stream_end); - PRINTF_COUNT("Stream activity beginning", stream_activity_begin); - PRINTF_COUNT("Stream activity end", stream_activity_end); PRINTF_COUNT("Packet beginning", packet_begin); PRINTF_COUNT("Packet end", packet_end); PRINTF_COUNT("Discarded event", disc_events); @@ -116,10 +114,14 @@ void try_print_last(struct counter *counter) } } +static void destroy_private_counter_data(struct counter *counter) { - bt_self_component_port_input_message_iterator_put_ref(counter->msg_iter); - g_free(counter); + if (counter) { + bt_self_component_port_input_message_iterator_put_ref( + counter->msg_iter); + g_free(counter); + } } BT_HIDDEN @@ -136,21 +138,29 @@ void counter_finalize(bt_self_component_sink *comp) g_free(counter); } +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_init_method_status counter_init( +bt_component_class_initialize_method_status counter_init( bt_self_component_sink *component, + bt_self_component_sink_configuration *config, const bt_value *params, __attribute__((unused)) void *init_method_data) { - bt_component_class_init_method_status status = - BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK; + bt_component_class_initialize_method_status status; bt_self_component_add_port_status add_port_status; struct counter *counter = g_new0(struct counter, 1); const bt_value *step = NULL; const bt_value *hide_zero = NULL; + enum bt_param_validation_status validation_status; + gchar *validate_error = NULL; if (!counter) { - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR; + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; goto error; } @@ -160,56 +170,47 @@ bt_component_class_init_method_status counter_init( bt_self_component_as_component(counter->self_comp)); add_port_status = bt_self_component_sink_add_input_port(component, "in", NULL, NULL); - switch (add_port_status) { - case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR: - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR; + if (add_port_status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) { + status = (int) add_port_status; goto error; - case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR: - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR; + } + + validation_status = bt_param_validation_validate(params, + counter_params, &validate_error); + if (validation_status == BT_PARAM_VALIDATION_STATUS_MEMORY_ERROR) { + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; + goto error; + } else if (validation_status == BT_PARAM_VALIDATION_STATUS_VALIDATION_ERROR) { + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR; + BT_COMP_LOGE_APPEND_CAUSE(counter->self_comp, + "%s", validate_error); goto error; - default: - break; } counter->last_printed_total = -1ULL; counter->step = 10000; step = bt_value_map_borrow_entry_value_const(params, "step"); if (step) { - if (!bt_value_is_unsigned_integer(step)) { - BT_COMP_LOGE("`step` parameter: expecting an unsigned integer value: " - "type=%s", bt_common_value_type_string( - bt_value_get_type(step))); - goto error; - } - - counter->step = bt_value_unsigned_integer_get(step); + counter->step = bt_value_integer_unsigned_get(step); } hide_zero = bt_value_map_borrow_entry_value_const(params, "hide-zero"); if (hide_zero) { - if (!bt_value_is_bool(hide_zero)) { - BT_COMP_LOGE("`hide-zero` parameter: expecting a boolean value: " - "type=%s", bt_common_value_type_string( - bt_value_get_type(hide_zero))); - goto error; - } - counter->hide_zero = (bool) bt_value_bool_get(hide_zero); } bt_self_component_set_data( bt_self_component_sink_as_self_component(component), counter); + + status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; goto end; error: destroy_private_counter_data(counter); - if (status == BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) { - status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR; - } - end: + g_free(validate_error); return status; } @@ -218,25 +219,28 @@ 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_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK; + bt_component_class_sink_graph_is_configured_method_status status; + bt_self_component_port_input_message_iterator_create_from_sink_component_status + msg_iter_status; struct counter *counter; bt_self_component_port_input_message_iterator *iterator; counter = bt_self_component_get_data( bt_self_component_sink_as_self_component(comp)); BT_ASSERT(counter); - iterator = bt_self_component_port_input_message_iterator_create( - bt_self_component_sink_borrow_input_port_by_name(comp, - in_port_name)); - if (!iterator) { - status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_MEMORY_ERROR; + + msg_iter_status = bt_self_component_port_input_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) { + status = (int) msg_iter_status; goto end; } BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF( counter->msg_iter, iterator); + status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK; end: return status; } @@ -254,7 +258,7 @@ bt_component_class_sink_consume_method_status counter_consume( counter = bt_self_component_get_data( bt_self_component_sink_as_self_component(comp)); - BT_ASSERT(counter); + BT_ASSERT_DBG(counter); if (G_UNLIKELY(!counter->msg_iter)) { try_print_last(counter); @@ -278,7 +282,7 @@ bt_component_class_sink_consume_method_status counter_consume( 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++; @@ -298,12 +302,6 @@ bt_component_class_sink_consume_method_status counter_consume( case BT_MESSAGE_TYPE_STREAM_END: counter->count.stream_end++; break; - case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING: - counter->count.stream_activity_begin++; - break; - case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END: - counter->count.stream_activity_end++; - break; case BT_MESSAGE_TYPE_DISCARDED_EVENTS: counter->count.disc_events++; break;