X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdetails%2Fwrite.c;h=51490a14d8b92b149966c5bdbdb9f57a475dd7ce;hp=faf59f362d4729a7b02626ca21fd67e96b546981;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=498e7994d60bd0e9f63c3d5c0fd00eec77ba7c34 diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c index faf59f36..51490a14 100644 --- a/src/plugins/text/details/write.c +++ b/src/plugins/text/details/write.c @@ -1,23 +1,7 @@ /* - * Copyright 2019 Philippe Proulx - * - * 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: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * 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 2019 Philippe Proulx */ #include @@ -215,7 +199,8 @@ static inline void write_obj_type_name(struct details_write_ctx *ctx, const char *name) { g_string_append_printf(ctx->str, "%s%s%s%s", - color_fg_yellow(ctx), color_bold(ctx), name, color_reset(ctx)); + color_bold(ctx), color_fg_bright_yellow(ctx), name, + color_reset(ctx)); } static inline @@ -244,7 +229,7 @@ static inline void write_none_prop_value(struct details_write_ctx *ctx, const char *value) { g_string_append_printf(ctx->str, "%s%s%s%s", - color_bold(ctx), color_fg_magenta(ctx), + color_bold(ctx), color_fg_bright_magenta(ctx), value, color_reset(ctx)); } @@ -327,10 +312,10 @@ void write_bool_prop_value(struct details_write_ctx *ctx, bt_bool prop_value) g_string_append(ctx->str, color_bold(ctx)); if (prop_value) { - g_string_append(ctx->str, color_fg_green(ctx)); + g_string_append(ctx->str, color_fg_bright_green(ctx)); str = "Yes"; } else { - g_string_append(ctx->str, color_fg_red(ctx)); + g_string_append(ctx->str, color_fg_bright_red(ctx)); str = "No"; } @@ -369,14 +354,14 @@ gint compare_strings(const char **a, const char **b) } static -bt_bool map_value_foreach_add_key_to_array(const char *key, - const bt_value *object, void *data) +bt_value_map_foreach_entry_const_func_status map_value_foreach_add_key_to_array( + const char *key, const bt_value *object, void *data) { GPtrArray *keys = data; BT_ASSERT_DBG(keys); g_ptr_array_add(keys, (void *) key); - return BT_TRUE; + return BT_VALUE_MAP_FOREACH_ENTRY_CONST_FUNC_STATUS_OK; } static @@ -1690,7 +1675,8 @@ void write_time_str(struct details_write_ctx *ctx, const char *str) } g_string_append_printf(ctx->str, "[%s%s%s%s]", - color_bold(ctx), color_fg_blue(ctx), str, color_reset(ctx)); + color_bold(ctx), color_fg_bright_blue(ctx), str, + color_reset(ctx)); if (ctx->details_comp->cfg.compact) { write_sp(ctx); @@ -1715,7 +1701,7 @@ void write_time(struct details_write_ctx *ctx, const bt_clock_snapshot *cs) format_uint(buf, bt_clock_snapshot_get_value(cs), 10); g_string_append_printf(ctx->str, "[%s%s%s%s%s", - color_bold(ctx), color_fg_blue(ctx), buf, + color_bold(ctx), color_fg_bright_blue(ctx), buf, color_reset(ctx), ctx->details_comp->cfg.compact ? "" : " cycles"); cs_status = bt_clock_snapshot_get_ns_from_origin(cs, &ns_from_origin); @@ -1723,7 +1709,7 @@ void write_time(struct details_write_ctx *ctx, const bt_clock_snapshot *cs) format_int(buf, ns_from_origin, 10); g_string_append_printf(ctx->str, "%s %s%s%s%s%s", ctx->details_comp->cfg.compact ? "" : ",", - color_bold(ctx), color_fg_blue(ctx), buf, + color_bold(ctx), color_fg_bright_blue(ctx), buf, color_reset(ctx), ctx->details_comp->cfg.compact ? "" : " ns from origin"); } @@ -1756,22 +1742,25 @@ int write_message_follow_tag(struct details_write_ctx *ctx, if (ctx->details_comp->cfg.compact) { g_string_append_printf(ctx->str, - "%s{%s%" PRIu64 " %" PRIu64 " %" PRIu64 "%s%s}%s ", + "%s{%s%s%" PRIu64 " %" PRIu64 " %" PRIu64 "%s%s}%s ", color_fg_cyan(ctx), color_bold(ctx), + color_fg_bright_cyan(ctx), unique_trace_id, bt_stream_class_get_id(sc), bt_stream_get_id(stream), color_reset(ctx), color_fg_cyan(ctx), color_reset(ctx)); } else { g_string_append_printf(ctx->str, - "%s{Trace %s%" PRIu64 "%s%s, Stream class ID %s%" PRIu64 "%s%s, Stream ID %s%" PRIu64 "%s%s}%s\n", + "%s{Trace %s%s%" PRIu64 "%s%s, Stream class ID %s%s%" PRIu64 "%s%s, Stream ID %s%s%" PRIu64 "%s%s}%s\n", + color_fg_cyan(ctx), + color_bold(ctx), color_fg_bright_cyan(ctx), + unique_trace_id, color_reset(ctx), + color_fg_cyan(ctx), + color_bold(ctx), color_fg_bright_cyan(ctx), + bt_stream_class_get_id(sc), color_reset(ctx), color_fg_cyan(ctx), - color_bold(ctx), unique_trace_id, - color_reset(ctx), color_fg_cyan(ctx), - color_bold(ctx), bt_stream_class_get_id(sc), - color_reset(ctx), color_fg_cyan(ctx), - color_bold(ctx), bt_stream_get_id(stream), - color_reset(ctx), color_fg_cyan(ctx), - color_reset(ctx)); + color_bold(ctx), color_fg_bright_cyan(ctx), + bt_stream_get_id(stream), color_reset(ctx), + color_fg_cyan(ctx), color_reset(ctx)); } end: @@ -2507,7 +2496,7 @@ int write_message_iterator_inactivity_message(struct details_write_ctx *ctx, { int ret = 0; const bt_clock_snapshot *cs = - bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const( + bt_message_message_iterator_inactivity_borrow_clock_snapshot_const( msg); /* Write time */