static
void destroy_pretty_data(struct pretty_component *pretty)
{
- bt_self_component_port_input_message_iterator_put_ref(pretty->iterator);
+ if (!pretty) {
+ goto end;
+ }
+
+ bt_message_iterator_put_ref(pretty->iterator);
if (pretty->string) {
(void) g_string_free(pretty->string, TRUE);
}
g_free(pretty->options.output_path);
g_free(pretty);
+
+end:
+ return;
}
static
}
static
-bt_component_class_message_iterator_next_method_status handle_message(
+bt_message_iterator_class_next_method_status handle_message(
struct pretty_component *pretty,
const bt_message *message)
{
- bt_component_class_message_iterator_next_method_status ret =
- BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ bt_message_iterator_class_next_method_status ret =
+ BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
- BT_ASSERT(pretty);
+ BT_ASSERT_DBG(pretty);
switch (bt_message_get_type(message)) {
case BT_MESSAGE_TYPE_EVENT:
if (pretty_print_event(pretty, message)) {
- ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ ret = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
}
break;
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
if (pretty_print_discarded_items(pretty, message)) {
- ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ ret = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
}
break;
default:
pretty_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 pretty_component *pretty;
bt_self_component_sink_as_self_component(comp));
BT_ASSERT(pretty);
BT_ASSERT(!pretty->iterator);
- 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), &pretty->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_component_class_sink_consume_method_status ret =
BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
bt_message_array_const msgs;
- bt_self_component_port_input_message_iterator *it;
+ bt_message_iterator *it;
struct pretty_component *pretty = bt_self_component_get_data(
bt_self_component_sink_as_self_component(comp));
bt_message_iterator_next_status next_status;
uint64_t i = 0;
it = pretty->iterator;
- next_status = bt_self_component_port_input_message_iterator_next(it,
+ next_status = bt_message_iterator_next(it,
&msgs, &count);
switch (next_status) {
goto end;
case BT_MESSAGE_ITERATOR_NEXT_STATUS_END:
ret = (int) next_status;
- BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+ BT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
pretty->iterator);
goto end;
default:
goto end;
}
- BT_ASSERT(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
+ BT_ASSERT_DBG(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
for (i = 0; i < count; i++) {
ret = (int) handle_message(pretty, msgs[i]);
static const char *color_choices[] = { "never", "auto", "always", NULL };
static const char *show_hide_choices[] = { "show", "hide", NULL };
+static
struct bt_param_validation_map_value_entry_descr pretty_params[] = {
{ "color", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { BT_VALUE_TYPE_STRING, .string = {
.choices = color_choices,
pretty->options.print_scope_field_names = false;
break;
default:
- abort();
+ bt_common_abort();
}
apply_one_bool_if_specified("name-payload", params,
pretty->options.print_callsite_field = false;
break;
default:
- abort();
+ bt_common_abort();
}
apply_one_bool_if_specified("field-trace", params,
apply_one_bool_if_specified("field-callsite", params,
&pretty->options.print_callsite_field);
+ pretty_print_init();
status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
end: