X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fpretty.c;h=77d982ef153a0787d901bc65929aba1f915f9a73;hb=f6ccaed94e575af57fe6bf38154771bee4871a2a;hp=88fc521d60cd3562d054687721cfefaca6cc7b0a;hpb=dfa6653cbc3357f3c5509cc8c6d2f0471e51e08f;p=babeltrace.git diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c index 88fc521d..77d982ef 100644 --- a/plugins/text/pretty/pretty.c +++ b/plugins/text/pretty/pretty.c @@ -27,17 +27,7 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -45,14 +35,16 @@ #include #include #include -#include +#include #include "pretty.h" +GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN]; + static const char *plugin_options[] = { "color", - "output-path", + "path", "no-delta", "clock-cycles", "clock-seconds", @@ -79,7 +71,15 @@ static void destroy_pretty_data(struct pretty_component *pretty) { bt_put(pretty->input_iterator); - (void) g_string_free(pretty->string, TRUE); + + if (pretty->string) { + (void) g_string_free(pretty->string, TRUE); + } + + if (pretty->tmp_string) { + (void) g_string_free(pretty->tmp_string, TRUE); + } + if (pretty->out != stdout) { int ret; @@ -105,6 +105,10 @@ struct pretty_component *create_pretty(void) if (!pretty->string) { goto error; } + pretty->tmp_string = g_string_new(""); + if (!pretty->tmp_string) { + goto error; + } end: return pretty; @@ -127,10 +131,26 @@ enum bt_component_status handle_notification(struct pretty_component *pretty, { enum bt_component_status ret = BT_COMPONENT_STATUS_OK; - assert(pretty); + BT_ASSERT(pretty); - if (bt_notification_get_type(notification) == BT_NOTIFICATION_TYPE_EVENT) { + switch (bt_notification_get_type(notification)) { + case BT_NOTIFICATION_TYPE_EVENT: ret = pretty_print_event(pretty, notification); + break; + case BT_NOTIFICATION_TYPE_INACTIVITY: + fprintf(stderr, "Inactivity notification\n"); + break; + case BT_NOTIFICATION_TYPE_PACKET_BEGIN: + case BT_NOTIFICATION_TYPE_PACKET_END: + case BT_NOTIFICATION_TYPE_STREAM_BEGIN: + case BT_NOTIFICATION_TYPE_STREAM_END: + break; + case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS: + case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS: + ret = pretty_print_discarded_elements(pretty, notification); + break; + default: + fprintf(stderr, "Unhandled notification type\n"); } return ret; @@ -142,18 +162,24 @@ void pretty_port_connected( struct bt_private_port *self_port, struct bt_port *other_port) { + enum bt_connection_status conn_status; struct bt_private_connection *connection; struct pretty_component *pretty; + static const enum bt_notification_type notif_types[] = { + BT_NOTIFICATION_TYPE_EVENT, + BT_NOTIFICATION_TYPE_DISCARDED_PACKETS, + BT_NOTIFICATION_TYPE_DISCARDED_EVENTS, + BT_NOTIFICATION_TYPE_SENTINEL, + }; pretty = bt_private_component_get_user_data(component); - assert(pretty); - assert(!pretty->input_iterator); + BT_ASSERT(pretty); + BT_ASSERT(!pretty->input_iterator); connection = bt_private_port_get_private_connection(self_port); - assert(connection); - pretty->input_iterator = - bt_private_connection_create_notification_iterator(connection); - - if (!pretty->input_iterator) { + BT_ASSERT(connection); + conn_status = bt_private_connection_create_notification_iterator( + connection, notif_types, &pretty->input_iterator); + if (conn_status != BT_CONNECTION_STATUS_OK) { pretty->error = true; } @@ -179,9 +205,6 @@ enum bt_component_status pretty_consume(struct bt_private_component *component) it_ret = bt_notification_iterator_next(it); switch (it_ret) { - case BT_NOTIFICATION_ITERATOR_STATUS_ERROR: - ret = BT_COMPONENT_STATUS_ERROR; - goto end; case BT_NOTIFICATION_ITERATOR_STATUS_END: ret = BT_COMPONENT_STATUS_END; BT_PUT(pretty->input_iterator); @@ -197,7 +220,7 @@ enum bt_component_status pretty_consume(struct bt_private_component *component) } notification = bt_notification_iterator_get_notification(it); - assert(notification); + BT_ASSERT(notification); ret = handle_notification(pretty, notification); end: @@ -229,7 +252,7 @@ end: } static -bool check_param_exists(const char *key, struct bt_value *object, void *data) +bt_bool check_param_exists(const char *key, struct bt_value *object, void *data) { struct pretty_component *pretty = data; struct bt_value *plugin_opt_map = pretty->plugin_opt_map; @@ -238,7 +261,7 @@ bool check_param_exists(const char *key, struct bt_value *object, void *data) fprintf(pretty->err, "[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key); } - return true; + return BT_TRUE; } static @@ -281,12 +304,13 @@ enum bt_component_status apply_one_bool(const char *key, enum bt_component_status ret = BT_COMPONENT_STATUS_OK; struct bt_value *value = NULL; enum bt_value_status status; + bt_bool bool_val; value = bt_value_map_get(params, key); if (!value) { goto end; } - status = bt_value_bool_get(value, option); + status = bt_value_bool_get(value, &bool_val); switch (status) { case BT_VALUE_STATUS_OK: break; @@ -294,6 +318,7 @@ enum bt_component_status apply_one_bool(const char *key, ret = BT_COMPONENT_STATUS_ERROR; goto end; } + *option = (bool) bool_val; if (found) { *found = true; } @@ -387,9 +412,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty, bt_put(color_value); } - ret = apply_one_string("output-path", - params, - &pretty->options.output_path); + ret = apply_one_string("path", params, &pretty->options.output_path); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } @@ -713,6 +736,12 @@ enum bt_component_status pretty_init( goto end; } + ret = bt_private_component_sink_add_input_private_port(component, + "in", NULL, NULL); + if (ret != BT_COMPONENT_STATUS_OK) { + goto end; + } + pretty->out = stdout; pretty->err = stderr; @@ -728,7 +757,6 @@ enum bt_component_status pretty_init( } set_use_colors(pretty); - ret = bt_private_component_set_user_data(component, pretty); if (ret != BT_COMPONENT_STATUS_OK) { goto error;