/*
- * Copyright 2018 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
*
- * 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 2018 Philippe Proulx <pproulx@efficios.com>
*/
-/*
- * This is just to satisfy the preprocessor check in "lib/logging.h":
- * this file does not log anything.
- */
-#define BT_LOG_TAG ""
+#define BT_LOG_TAG "LIB/LIB-LOGGING"
+#include "lib/logging.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
+#include <stdbool.h>
#include <stdint.h>
#include <wchar.h>
#include <glib.h>
#include "common/common.h"
-#include <babeltrace2/trace-ir/event-const.h>
-#include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/stream-const.h>
+#include "common/uuid.h"
+#include <babeltrace2/babeltrace.h>
#include "logging.h"
-#include "assert-pre.h"
-#include "assert-post.h"
+#include "assert-cond.h"
#include "value.h"
+#include "integer-range-set.h"
#include "object-pool.h"
+#include "graph/interrupter.h"
#include "graph/component-class.h"
-#include "graph/component-class-sink-colander.h"
#include "graph/component-filter.h"
#include "graph/component.h"
#include "graph/component-sink.h"
#include "graph/message/message.h"
#include "graph/message/message-iterator-inactivity.h"
#include "graph/message/packet.h"
-#include "graph/message/stream-activity.h"
#include "graph/message/stream.h"
#include "graph/port.h"
#include "plugin/plugin.h"
#include "trace-ir/trace.h"
#include "trace-ir/utils.h"
#include "error.h"
-#include "assert-pre.h"
#define LIB_LOGGING_BUF_SIZE (4096 * 4)
#define PRFIELD_GSTRING(_expr) PRFIELD((_expr) ? (_expr)->str : NULL)
-#define TMP_PREFIX_LEN 64
+#define TMP_PREFIX_LEN 128
#define SET_TMP_PREFIX(_prefix2) \
do { \
- snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s", \
- prefix, (_prefix2)); \
+ int snprintf_ret = \
+ snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s", \
+ prefix, (_prefix2)); \
+ \
+ if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
+ bt_common_abort(); \
+ } \
+ \
tmp_prefix[TMP_PREFIX_LEN - 1] = '\0'; \
} while (0)
static inline void format_uuid(char **buf_ch, bt_uuid uuid)
{
- BUF_APPEND("\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"",
- (unsigned int) uuid[0],
- (unsigned int) uuid[1],
- (unsigned int) uuid[2],
- (unsigned int) uuid[3],
- (unsigned int) uuid[4],
- (unsigned int) uuid[5],
- (unsigned int) uuid[6],
- (unsigned int) uuid[7],
- (unsigned int) uuid[8],
- (unsigned int) uuid[9],
- (unsigned int) uuid[10],
- (unsigned int) uuid[11],
- (unsigned int) uuid[12],
- (unsigned int) uuid[13],
- (unsigned int) uuid[14],
- (unsigned int) uuid[15]);
+ BUF_APPEND("\"" BT_UUID_FMT "\"", BT_UUID_FMT_VALUES(uuid));
}
static inline void format_object_pool(char **buf_ch, bool extended,
}
switch (field_class->type) {
- case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
- case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
+ case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
{
- format_integer_field_class(buf_ch, extended, prefix, field_class);
+ const struct bt_field_class_bit_array *ba_fc =
+ (const void *) field_class;
+
+ BUF_APPEND(", %slength=%" PRIu64, PRFIELD(ba_fc->length));
break;
}
- case BT_FIELD_CLASS_TYPE_REAL:
+ case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+ case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
{
- const struct bt_field_class_real *real_fc = (void *) field_class;
-
- BUF_APPEND(", %sis-single-precision=%d",
- PRFIELD(real_fc->is_single_precision));
+ format_integer_field_class(buf_ch, extended, prefix, field_class);
break;
}
case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
{
- const struct bt_field_class_static_array *array_fc =
+ const struct bt_field_class_array_static *array_fc =
(const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
break;
}
- case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
{
- const struct bt_field_class_dynamic_array *array_fc =
+ const struct bt_field_class_array_dynamic *array_fc =
(const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+ {
+ const struct bt_field_class_option *opt_fc =
+ (const void *) field_class;
+
+ BUF_APPEND(", %scontent-fc-addr=%p, %scontent-fc-type=%s",
+ PRFIELD(opt_fc->content_fc),
+ PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
+
+ if (field_class->type !=
+ BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) {
+ const struct bt_field_class_option_with_selector_field *opt_with_sel_fc =
+ (const void *) field_class;
+
+ if (opt_with_sel_fc->selector_fc) {
+ SET_TMP_PREFIX("selector-fc-");
+ format_field_class(buf_ch, extended, tmp_prefix,
+ opt_with_sel_fc->selector_fc);
+ }
+
+ if (opt_with_sel_fc->selector_field_path) {
+ SET_TMP_PREFIX("selector-field-path-");
+ format_field_path(buf_ch, extended, tmp_prefix,
+ opt_with_sel_fc->selector_field_path);
+ }
+ }
+
+ break;
+ }
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
{
const struct bt_field_class_variant *var_fc =
(const void *) field_class;
PRFIELD(var_fc->common.named_fcs->len));
}
- if (var_fc->selector_fc) {
- SET_TMP_PREFIX("selector-fc-");
- format_field_class(buf_ch, extended, tmp_prefix,
- var_fc->selector_fc);
- }
+ if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
+ field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+ const struct bt_field_class_variant_with_selector_field *var_with_sel_fc =
+ (const void *) var_fc;
- if (var_fc->selector_field_path) {
- SET_TMP_PREFIX("selector-field-path-");
- format_field_path(buf_ch, extended, tmp_prefix,
- var_fc->selector_field_path);
+ if (var_with_sel_fc->selector_fc) {
+ SET_TMP_PREFIX("selector-fc-");
+ format_field_class(buf_ch, extended, tmp_prefix,
+ var_with_sel_fc->selector_fc);
+ }
+
+ if (var_with_sel_fc->selector_field_path) {
+ SET_TMP_PREFIX("selector-field-path-");
+ format_field_path(buf_ch, extended, tmp_prefix,
+ var_with_sel_fc->selector_field_path);
+ }
}
break;
fmt = ", %svalue=%" PRIx64;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
if (field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) {
if (!fmt) {
BUF_APPEND(fmt, PRFIELD(integer->value.u));
}
+#pragma GCC diagnostic pop
}
static inline void format_field(char **buf_ch, bool extended,
}
switch (field->class->type) {
+ case BT_FIELD_CLASS_TYPE_BOOL:
+ {
+ const struct bt_field_bool *bool_field = (const void *) field;
+
+ BUF_APPEND(", %svalue=%d", PRFIELD(bool_field->value));
+ break;
+ }
+ case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+ {
+ const struct bt_field_bit_array *ba_field = (const void *) field;
+
+ BUF_APPEND(", %svalue-as-int=%" PRIx64,
+ PRFIELD(ba_field->value_as_int));
+ break;
+ }
case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
format_field_integer_extended(buf_ch, prefix, field);
break;
}
- case BT_FIELD_CLASS_TYPE_REAL:
+ case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+ case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
{
const struct bt_field_real *real_field = (const void *) field;
break;
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
- case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
{
const struct bt_field_array *array_field = (const void *) field;
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
{
const struct bt_field_variant *var_field = (const void *) field;
BUF_APPEND("%s", ", <CUR>");
break;
default:
- abort();
+ bt_common_abort();
}
}
static inline void format_trace_class(char **buf_ch, bool extended,
const char *prefix, const struct bt_trace_class *trace_class)
{
- if (trace_class->name.value) {
- BUF_APPEND(", %sname=\"%s\"",
- PRFIELD(trace_class->name.value));
- }
-
if (!extended) {
return;
}
BUF_APPEND(", %sis-frozen=%d", PRFIELD(trace_class->frozen));
- if (trace_class->uuid.value) {
- BUF_APPEND_UUID(trace_class->uuid.value);
- }
-
if (trace_class->stream_classes) {
BUF_APPEND(", %sstream-class-count=%u",
PRFIELD(trace_class->stream_classes->len));
return;
}
+ if (trace->uuid.value) {
+ BUF_APPEND_UUID(trace->uuid.value);
+ }
+
BUF_APPEND(", %sis-frozen=%d", PRFIELD(trace->frozen));
if (trace->streams) {
}
BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
- "%spackets-have-default-beginning-cs=%d, "
- "%spackets-have-default-end-cs=%d, "
+ "%ssupports-packets=%d, "
+ "%spackets-have-begin-default-cs=%d, "
+ "%spackets-have-end-default-cs=%d, "
"%ssupports-discarded-events=%d, "
"%sdiscarded-events-have-default-cs=%d, "
"%ssupports-discarded-packets=%d, "
"%sdiscarded-packets-have-default-cs=%d",
PRFIELD(stream_class->assigns_automatic_event_class_id),
PRFIELD(stream_class->assigns_automatic_stream_id),
+ PRFIELD(stream_class->supports_packets),
PRFIELD(stream_class->packets_have_beginning_default_clock_snapshot),
PRFIELD(stream_class->packets_have_end_default_clock_snapshot),
PRFIELD(stream_class->supports_discarded_events),
static inline void format_event(char **buf_ch, bool extended,
const char *prefix, const struct bt_event *event)
{
- const struct bt_packet *packet;
- const struct bt_stream *stream;
const struct bt_trace_class *trace_class;
const struct bt_stream_class *stream_class;
char tmp_prefix[TMP_PREFIX_LEN];
}
}
- packet = bt_event_borrow_packet_const(event);
- if (!packet) {
- return;
+ if (event->stream) {
+ BUF_APPEND(", %sstream-addr=%p", PRFIELD(event->stream));
+ SET_TMP_PREFIX("stream-");
+ format_stream(buf_ch, false, tmp_prefix, event->stream);
}
- BUF_APPEND(", %spacket-addr=%p", PRFIELD(packet));
- SET_TMP_PREFIX("packet-");
- format_packet(buf_ch, false, tmp_prefix, packet);
- stream = bt_packet_borrow_stream_const(packet);
- if (!stream) {
- return;
+ if (event->packet) {
+ BUF_APPEND(", %spacket-addr=%p", PRFIELD(event->packet));
+ SET_TMP_PREFIX("packet-");
+ format_packet(buf_ch, false, tmp_prefix, event->packet);
}
-
- BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream));
- SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, false, tmp_prefix, stream);
}
static inline void format_clock_class(char **buf_ch, bool extended,
}
}
+static inline void format_interrupter(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_interrupter *intr)
+{
+ BUF_APPEND(", %sis-set=%d", PRFIELD(intr->is_set));
+}
+
static inline void format_value(char **buf_ch, bool extended,
const char *prefix, const struct bt_value *value)
{
case BT_VALUE_TYPE_UNSIGNED_INTEGER:
{
BUF_APPEND(", %svalue=%" PRIu64,
- PRFIELD(bt_value_unsigned_integer_get(value)));
+ PRFIELD(bt_value_integer_unsigned_get(value)));
break;
}
case BT_VALUE_TYPE_SIGNED_INTEGER:
{
BUF_APPEND(", %svalue=%" PRId64,
- PRFIELD(bt_value_signed_integer_get(value)));
+ PRFIELD(bt_value_integer_signed_get(value)));
break;
}
case BT_VALUE_TYPE_REAL:
}
case BT_VALUE_TYPE_ARRAY:
{
- int64_t count = bt_value_array_get_size(value);
+ uint64_t count = bt_value_array_get_length(value);
- BT_ASSERT(count >= 0);
BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
break;
}
}
}
+static inline void format_integer_range_set(char **buf_ch, bool extended,
+ const char *prefix,
+ const struct bt_integer_range_set *range_set)
+{
+ BUF_APPEND(", %srange-count=%u", PRFIELD(range_set->ranges->len));
+
+ if (!extended) {
+ return;
+ }
+
+ BUF_APPEND(", %sis-frozen=%d", PRFIELD(range_set->frozen));
+}
+
static inline void format_message(char **buf_ch, bool extended,
const char *prefix, const struct bt_message *msg)
{
char tmp_prefix[TMP_PREFIX_LEN];
BUF_APPEND(", %stype=%s",
- PRFIELD(bt_message_type_string(msg->type)));
+ PRFIELD(bt_common_message_type_string(msg->type)));
if (!extended) {
return;
msg_stream->stream);
}
- break;
- }
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
- {
- const struct bt_message_stream_activity *msg_stream_activity =
- (const void *) msg;
-
- if (msg_stream_activity->stream) {
- SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, true, tmp_prefix,
- msg_stream_activity->stream);
- }
-
BUF_APPEND(", %sdefault-cs-state=%s",
- PRFIELD(bt_message_stream_activity_clock_snapshot_state_string(
- msg_stream_activity->default_cs_state)));
+ PRFIELD(bt_message_stream_clock_snapshot_state_string(
+ msg_stream->default_cs_state)));
- if (msg_stream_activity->default_cs) {
+ if (msg_stream->default_cs_state == BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN) {
SET_TMP_PREFIX("default-cs-");
format_clock_snapshot(buf_ch, true, tmp_prefix,
- msg_stream_activity->default_cs);
+ msg_stream->default_cs);
}
break;
}
if (msg_disc_items->default_begin_cs) {
- SET_TMP_PREFIX("default-begin-cs-");
+ SET_TMP_PREFIX("begin-default-cs-");
format_clock_snapshot(buf_ch, true, tmp_prefix,
msg_disc_items->default_begin_cs);
}
if (msg_disc_items->default_end_cs) {
- SET_TMP_PREFIX("default-end-cs-");
+ SET_TMP_PREFIX("end-default-cs-");
format_clock_snapshot(buf_ch, true, tmp_prefix,
msg_disc_items->default_end_cs);
}
char tmp_prefix[TMP_PREFIX_LEN];
BUF_APPEND(", %stype=%s, %sname=\"%s\"",
- PRFIELD(bt_component_class_type_string(comp_class->type)),
+ PRFIELD(bt_common_component_class_type_string(comp_class->type)),
PRFIELD_GSTRING(comp_class->name));
if (comp_class->description) {
{
char tmp_prefix[TMP_PREFIX_LEN];
- BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
- "%sconfig-state=%s",
- PRFIELD(graph->canceled),
+ BUF_APPEND(", %scan-consume=%d, %sconfig-state=%s",
PRFIELD(graph->can_consume),
PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
&graph->packet_end_msg_pool);
}
+static inline void format_message_iterator_class(char **buf_ch,
+ bool extended, const char *prefix,
+ const struct bt_message_iterator_class *iterator_class)
+{
+ /* Empty, the address is automatically printed. */
+}
+
static inline void format_message_iterator(char **buf_ch,
bool extended, const char *prefix,
const struct bt_message_iterator *iterator)
{
- const char *type;
char tmp_prefix[TMP_PREFIX_LEN];
+ const struct bt_message_iterator *
+ port_in_iter = (const void *) iterator;
- if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT) {
- type = "BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT";
- } else if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT) {
- type = "BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT";
- } else {
- type = "(unknown)";
+ if (port_in_iter->upstream_component) {
+ SET_TMP_PREFIX("upstream-comp-");
+ format_component(buf_ch, false, tmp_prefix,
+ port_in_iter->upstream_component);
}
- BUF_APPEND(", %stype=%s", PRFIELD(type));
-
- switch (iterator->type) {
- case BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT:
- {
- const struct bt_self_component_port_input_message_iterator *
- port_in_iter = (const void *) iterator;
-
- if (port_in_iter->upstream_component) {
- SET_TMP_PREFIX("upstream-comp-");
- format_component(buf_ch, false, tmp_prefix,
- port_in_iter->upstream_component);
- }
-
- if (port_in_iter->upstream_port) {
- SET_TMP_PREFIX("upstream-port-");
- format_port(buf_ch, false, tmp_prefix,
- port_in_iter->upstream_port);
- }
-
- if (port_in_iter->connection) {
- SET_TMP_PREFIX("upstream-conn-");
- format_connection(buf_ch, false, tmp_prefix,
- port_in_iter->connection);
- }
- break;
+ if (!extended) {
+ goto end;
}
- case BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT:
- {
- const struct bt_port_output_message_iterator *port_out_iter =
- (const void *) iterator;
-
- if (port_out_iter->graph) {
- SET_TMP_PREFIX("graph-");
- format_graph(buf_ch, false, tmp_prefix,
- port_out_iter->graph);
- }
-
- if (port_out_iter->colander) {
- SET_TMP_PREFIX("colander-comp-");
- format_component(buf_ch, false, tmp_prefix,
- (void *) port_out_iter->colander);
- }
- break;
+ if (port_in_iter->upstream_port) {
+ SET_TMP_PREFIX("upstream-port-");
+ format_port(buf_ch, false, tmp_prefix,
+ port_in_iter->upstream_port);
}
- default:
- break;
+
+ if (port_in_iter->connection) {
+ SET_TMP_PREFIX("upstream-conn-");
+ format_connection(buf_ch, false, tmp_prefix,
+ port_in_iter->connection);
}
+
+end:
+ return;
}
static inline void format_plugin(char **buf_ch, bool extended,
if (comp_class_id) {
BUF_APPEND(", %scomp-cls-type=%s, %scomp-cls-name=\"%s\", "
"%splugin-name=\"%s\"",
- PRFIELD(bt_component_class_type_string(
+ PRFIELD(bt_common_component_class_type_string(
comp_class_id->type)),
PRFIELD_GSTRING(comp_class_id->name),
PRFIELD_GSTRING(comp_class_id->plugin_name));
case 'v':
format_value(buf_ch, extended, prefix, obj);
break;
+ case 'R':
+ format_integer_range_set(buf_ch, extended, prefix, obj);
+ break;
case 'n':
format_message(buf_ch, extended, prefix, obj);
break;
+ case 'I':
+ format_message_iterator_class(buf_ch, extended, prefix, obj);
+ break;
case 'i':
format_message_iterator(buf_ch, extended, prefix, obj);
break;
case 'g':
format_graph(buf_ch, extended, prefix, obj);
break;
+ case 'z':
+ format_interrupter(buf_ch, extended, prefix, obj);
+ break;
case 'o':
format_object_pool(buf_ch, extended, prefix, obj);
break;
format_error_cause(buf_ch, extended, prefix, obj);
break;
default:
- abort();
+ bt_common_abort();
}
update_fmt:
*out_fmt_ch = fmt_ch;
}
+/*
+ * This function would normally not be BT_EXPORTed, but it is used by the
+ * Python plugin provider, which is conceptually part of libbabeltrace2, but
+ * implemented as a separate shared object, for modularity. It is therefore
+ * exposed, but not part of the public ABI.
+ */
+BT_EXPORT
+void bt_lib_log_v(const char *func, const char *file, unsigned line,
+ int lvl, const char *tag, const char *fmt, va_list *args)
+{
+ BT_ASSERT(fmt);
+ bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!',
+ handle_conversion_specifier_bt, NULL, fmt, args);
+ _bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf);
+}
+
+/*
+ * This function would normally not be BT_EXPORTed, but it is used by the
+ * Python plugin provider, which is conceptually part of libbabeltrace2, but
+ * implemented as a separate shared object, for modularity. It is therefore
+ * exposed, but not part of the public ABI.
+ */
+BT_EXPORT
void bt_lib_log(const char *func, const char *file, unsigned line,
int lvl, const char *tag, const char *fmt, ...)
{
va_list args;
+ BT_ASSERT(fmt);
+ va_start(args, fmt);
+ bt_lib_log_v(func, file, line, lvl, tag, fmt, &args);
+ va_end(args);
+}
+
+/*
+ * This function would normally not be BT_EXPORTed, but it is used by the
+ * Python plugin provider, which is conceptually part of libbabeltrace2, but
+ * implemented as a separate shared object, for modularity. It is therefore
+ * exposed, but not part of the ABI.
+ */
+BT_EXPORT
+void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,
+ unsigned line, int lvl, const char *tag,
+ const char *fmt, ...)
+{
+ va_list args;
+ bt_current_thread_error_append_cause_status status;
+
BT_ASSERT(fmt);
va_start(args, fmt);
bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!',
handle_conversion_specifier_bt, NULL, fmt, &args);
va_end(args);
- _bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf);
+
+ /* Log conditionally, but always append the error cause */
+ if (BT_LOG_ON(lvl)) {
+ _bt_log_write_d(func, file, line, lvl, tag, "%s",
+ lib_logging_buf);
+ }
+
+ status = bt_current_thread_error_append_cause_from_unknown(
+ BT_LIB_LOG_LIBBABELTRACE2_NAME, file, line, "%s",
+ lib_logging_buf);
+ if (status) {
+ /*
+ * Worst case: this error cause is not appended to the
+ * current thread's error.
+ *
+ * We can accept this as it's an almost impossible
+ * scenario and returning an error here would mean you
+ * need to check the return value of each
+ * BT_LIB_LOG*_APPEND_CAUSE() macro and that would be
+ * cumbersome.
+ */
+ BT_LOGE("Cannot append error cause to current thread's "
+ "error object: status=%s",
+ bt_common_func_status_string(status));
+ }
}