#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 <babeltrace2/current-thread.h>
+#include "common/uuid.h"
+#include <babeltrace2/babeltrace.h>
#include "logging.h"
#include "assert-pre.h"
#include "assert-post.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"
#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) { \
+ 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,
}
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);
}
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- 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_VARIANT_WITHOUT_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
{
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_SELECTOR ||
+ field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+ const struct bt_field_class_variant_with_selector *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;
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
{
const struct bt_field_variant *var_field = (const void *) field;
}
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:
}
}
+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)
{
}
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(", %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)));
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 '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;
projects / babeltrace.git / blobdiff