/*
- * Copyright 2019 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:
+ * 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 <pproulx@efficios.com>
*/
#include <babeltrace2/babeltrace.h>
+#include <stdbool.h>
#include <stdio.h>
#include <string.h>
break;
default:
- abort();
+ bt_common_abort();
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
sprintf(buf_start, spec, value);
+#pragma GCC diagnostic pop
if (sep_digits) {
bt_common_sep_digits(buf_start, digits_per_group, sep);
break;
default:
- abort();
+ bt_common_abort();
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
sprintf(buf_start, spec, abs_value);
+#pragma GCC diagnostic pop
if (sep_digits) {
bt_common_sep_digits(buf_start, digits_per_group, sep);
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
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));
}
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";
}
}
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
break;
}
default:
- abort();
+ bt_common_abort();
}
g_ptr_array_free(keys, TRUE);
write_uint_prop_value(ctx, 16);
break;
default:
- abort();
+ bt_common_abort();
}
if (close) {
write_str_prop_value(ctx, "Event payload");
break;
default:
- abort();
+ bt_common_abort();
}
g_string_append(ctx->str, ": ");
write_str_prop_value(ctx, "<current>");
break;
default:
- abort();
+ bt_common_abort();
}
}
type = "Variant (signed integer selector)";
break;
default:
- abort();
+ bt_common_abort();
}
g_string_append_printf(ctx->str, "%s%s%s",
ll_str = "Debug";
break;
default:
- abort();
+ bt_common_abort();
}
write_str_prop_line(ctx, "Log level", ll_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);
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);
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");
}
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:
fmt_base = 16;
break;
default:
- abort();
+ bt_common_abort();
}
if (bt_field_class_type_is(fc_type,
bt_field_variant_borrow_selected_option_field_const(
field), NULL);
} else {
- abort();
+ bt_common_abort();
}
}
write_str_prop_value(ctx,
bt_value_string_get(value));
} else {
- abort();
+ bt_common_abort();
}
write_nl(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 */
ret = write_discarded_packets_message(&ctx, msg);
break;
default:
- abort();
+ bt_common_abort();
}
/*