#include <stdint.h>
#include <wchar.h>
#include <glib.h>
+#include <babeltrace/lib-logging-internal.h>
+#include <babeltrace/assert-pre-internal.h>
#include <babeltrace/common-internal.h>
#include <babeltrace/lib-logging-internal.h>
-#include <babeltrace/values-internal.h>
-#include <babeltrace/values-internal.h>
+#include <babeltrace/value-internal.h>
+#include <babeltrace/value-internal.h>
#include <babeltrace/object-pool-internal.h>
-#include <babeltrace/trace-ir/field-classes-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-class-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
#include <babeltrace/trace-ir/event-class-internal.h>
+#include <babeltrace/trace-ir/event-const.h>
#include <babeltrace/trace-ir/event-internal.h>
+#include <babeltrace/trace-ir/packet-const.h>
#include <babeltrace/trace-ir/packet-internal.h>
#include <babeltrace/trace-ir/stream-class-internal.h>
#include <babeltrace/trace-ir/stream-internal.h>
+#include <babeltrace/trace-ir/stream-const.h>
#include <babeltrace/trace-ir/trace-internal.h>
+#include <babeltrace/trace-ir/trace-class-internal.h>
#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
+#include <babeltrace/trace-ir/clock-snapshot-internal.h>
#include <babeltrace/trace-ir/field-path-internal.h>
#include <babeltrace/trace-ir/utils-internal.h>
#include <babeltrace/graph/component-class-internal.h>
#include <babeltrace/graph/component-source-internal.h>
#include <babeltrace/graph/connection-internal.h>
#include <babeltrace/graph/graph-internal.h>
-#include <babeltrace/graph/notification-event-internal.h>
-#include <babeltrace/graph/notification-inactivity-internal.h>
-#include <babeltrace/graph/notification-internal.h>
-#include <babeltrace/graph/notification-iterator-internal.h>
-#include <babeltrace/graph/notification-packet-internal.h>
-#include <babeltrace/graph/notification-stream-internal.h>
+#include <babeltrace/graph/message-event-internal.h>
+#include <babeltrace/graph/message-message-iterator-inactivity-internal.h>
+#include <babeltrace/graph/message-internal.h>
+#include <babeltrace/graph/message-iterator-internal.h>
+#include <babeltrace/graph/message-packet-internal.h>
+#include <babeltrace/graph/message-stream-internal.h>
+#include <babeltrace/graph/message-stream-activity-internal.h>
+#include <babeltrace/graph/message-discarded-items-internal.h>
#include <babeltrace/graph/port-internal.h>
#include <babeltrace/plugin/plugin-internal.h>
#include <babeltrace/plugin/plugin-so-internal.h>
#define LIB_LOGGING_BUF_SIZE (4096 * 4)
-static char __thread lib_logging_buf[LIB_LOGGING_BUF_SIZE];
+static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
#define BUF_APPEND(_fmt, ...) \
do { \
} while (0)
static inline void format_component(char **buf_ch, bool extended,
- const char *prefix, struct bt_component *component);
+ const char *prefix, const struct bt_component *component);
static inline void format_port(char **buf_ch, bool extended,
- const char *prefix, struct bt_port *port);
+ const char *prefix, const struct bt_port *port);
static inline void format_connection(char **buf_ch, bool extended,
- const char *prefix, struct bt_connection *connection);
+ const char *prefix, const struct bt_connection *connection);
-static inline void format_clock_value(char **buf_ch, bool extended,
- const char *prefix, struct bt_clock_value *clock_value);
+static inline void format_clock_snapshot(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_clock_snapshot *clock_snapshot);
static inline void format_field_path(char **buf_ch, bool extended,
- const char *prefix, struct bt_field_path *field_path);
+ const char *prefix, const struct bt_field_path *field_path);
static inline void format_object(char **buf_ch, bool extended,
- const char *prefix, struct bt_object *obj)
+ const char *prefix, const struct bt_object *obj)
{
BUF_APPEND(", %sref-count=%llu", prefix, obj->ref_count);
}
}
static inline void format_object_pool(char **buf_ch, bool extended,
- const char *prefix, struct bt_object_pool *pool)
+ const char *prefix, const struct bt_object_pool *pool)
{
BUF_APPEND(", %ssize=%zu", PRFIELD(pool->size));
static inline void format_integer_field_class(char **buf_ch,
bool extended, const char *prefix,
- struct bt_field_class *field_class)
+ const struct bt_field_class *field_class)
{
- struct bt_field_class_integer *int_fc = (void *) field_class;
+ const struct bt_field_class_integer *int_fc =
+ (const void *) field_class;
BUF_APPEND(", %srange-size=%" PRIu64 ", %sbase=%s",
PRFIELD(int_fc->range),
static inline void format_array_field_class(char **buf_ch,
bool extended, const char *prefix,
- struct bt_field_class *field_class)
+ const struct bt_field_class *field_class)
{
- struct bt_field_class_array *array_fc = (void *) field_class;
+ const struct bt_field_class_array *array_fc =
+ (const void *) field_class;
BUF_APPEND(", %selement-fc-addr=%p, %selement-fc-type=%s",
PRFIELD(array_fc->element_fc),
}
static inline void format_field_class(char **buf_ch, bool extended,
- const char *prefix, struct bt_field_class *field_class)
+ const char *prefix, const struct bt_field_class *field_class)
{
char tmp_prefix[64];
if (extended) {
BUF_APPEND(", %sis-frozen=%d", PRFIELD(field_class->frozen));
- BUF_APPEND(", %sis-part-of-trace=%d",
- PRFIELD(field_class->part_of_trace));
+ BUF_APPEND(", %sis-part-of-trace-class=%d",
+ PRFIELD(field_class->part_of_trace_class));
} else {
return;
}
}
case BT_FIELD_CLASS_TYPE_REAL:
{
- struct bt_field_class_real *real_fc = (void *) field_class;
+ const struct bt_field_class_real *real_fc = (void *) field_class;
BUF_APPEND(", %sis-single-precision=%d",
PRFIELD(real_fc->is_single_precision));
case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
{
- struct bt_field_class_enumeration *enum_fc =
- (void *) field_class;
+ const struct bt_field_class_enumeration *enum_fc =
+ (const void *) field_class;
format_integer_field_class(buf_ch, extended, prefix, field_class);
BUF_APPEND(", %smapping-count=%u",
}
case BT_FIELD_CLASS_TYPE_STRUCTURE:
{
- struct bt_field_class_structure *struct_fc =
- (void *) field_class;
+ const struct bt_field_class_structure *struct_fc =
+ (const void *) field_class;
if (struct_fc->common.named_fcs) {
BUF_APPEND(", %smember-count=%u",
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
{
- struct bt_field_class_static_array *array_fc =
- (void *) field_class;
+ const struct bt_field_class_static_array *array_fc =
+ (const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
}
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- struct bt_field_class_dynamic_array *array_fc =
- (void *) field_class;
+ const struct bt_field_class_dynamic_array *array_fc =
+ (const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
}
case BT_FIELD_CLASS_TYPE_VARIANT:
{
- struct bt_field_class_variant *var_fc = (void *) field_class;
+ const struct bt_field_class_variant *var_fc =
+ (const void *) field_class;
if (var_fc->common.named_fcs) {
BUF_APPEND(", %soption-count=%u",
}
static inline void format_field_integer_extended(char **buf_ch,
- const char *prefix, struct bt_field *field)
+ const char *prefix, const struct bt_field *field)
{
- struct bt_field_integer *integer = (void *) field;
- struct bt_field_class_integer *field_class = (void *) field->class;
+ const struct bt_field_integer *integer = (void *) field;
+ const struct bt_field_class_integer *field_class =
+ (void *) field->class;
const char *fmt = NULL;
BT_ASSERT(field_class);
}
static inline void format_field(char **buf_ch, bool extended,
- const char *prefix, struct bt_field *field)
+ const char *prefix, const struct bt_field *field)
{
BUF_APPEND(", %sis-set=%d", PRFIELD(field->is_set));
}
case BT_FIELD_CLASS_TYPE_REAL:
{
- struct bt_field_real *real_field = (void *) field;
+ const struct bt_field_real *real_field = (const void *) field;
BUF_APPEND(", %svalue=%f", PRFIELD(real_field->value));
break;
}
case BT_FIELD_CLASS_TYPE_STRING:
{
- struct bt_field_string *str = (void *) field;
+ const struct bt_field_string *str = (const void *) field;
if (str->buf) {
BT_ASSERT(str->buf->data);
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- struct bt_field_array *array_field = (void *) field;
+ const struct bt_field_array *array_field = (const void *) field;
BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_field->length));
}
case BT_FIELD_CLASS_TYPE_VARIANT:
{
- struct bt_field_variant *var_field = (void *) field;
+ const struct bt_field_variant *var_field = (const void *) field;
BUF_APPEND(", %sselected-field-index=%" PRIu64,
PRFIELD(var_field->selected_index));
}
static inline void format_field_path(char **buf_ch, bool extended,
- const char *prefix, struct bt_field_path *field_path)
+ const char *prefix, const struct bt_field_path *field_path)
{
uint64_t i;
- if (field_path->indexes) {
- BT_ASSERT(field_path->indexes);
- BUF_APPEND(", %sindex-count=%u",
- PRFIELD(field_path->indexes->len));
+ if (field_path->items) {
+ BT_ASSERT(field_path->items);
+ BUF_APPEND(", %sitem-count=%u",
+ PRFIELD(field_path->items->len));
}
- if (!extended || !field_path->indexes) {
+ if (!extended || !field_path->items) {
return;
}
BUF_APPEND(", %spath=[%s",
PRFIELD(bt_common_scope_string(field_path->root)));
- for (i = 0; i < field_path->indexes->len; i++) {
- uint64_t index = bt_field_path_get_index_by_index_inline(
- field_path, i);
-
- BUF_APPEND(", %" PRIu64, index);
+ for (i = 0; i < bt_field_path_get_item_count(field_path); i++) {
+ const struct bt_field_path_item *fp_item =
+ bt_field_path_borrow_item_by_index_const(field_path, i);
+
+ switch (bt_field_path_item_get_type(fp_item)) {
+ case BT_FIELD_PATH_ITEM_TYPE_INDEX:
+ BUF_APPEND(", %" PRIu64,
+ bt_field_path_item_index_get_index(fp_item));
+ break;
+ case BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT:
+ BUF_APPEND("%s", ", <CUR>");
+ break;
+ default:
+ abort();
+ }
}
BUF_APPEND("%s", "]");
}
+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));
+ }
+
+ BUF_APPEND(", %sassigns-auto-sc-id=%d",
+ PRFIELD(trace_class->assigns_automatic_stream_class_id));
+}
+
static inline void format_trace(char **buf_ch, bool extended,
- const char *prefix, struct bt_trace *trace)
+ const char *prefix, const struct bt_trace *trace)
{
char tmp_prefix[64];
BUF_APPEND(", %sis-frozen=%d", PRFIELD(trace->frozen));
- if (trace->uuid.value) {
- BUF_APPEND_UUID(trace->uuid.value);
- }
-
- if (trace->stream_classes) {
- BUF_APPEND(", %sstream-class-count=%u",
- PRFIELD(trace->stream_classes->len));
- }
-
if (trace->streams) {
BUF_APPEND(", %sstream-count=%u",
PRFIELD(trace->streams->len));
}
- BUF_APPEND(", %spacket-header-fc-addr=%p, %sis-static=%d, "
- "%sassigns-auto-sc-id=%d",
- PRFIELD(trace->packet_header_fc),
- PRFIELD(trace->is_static),
- PRFIELD(trace->assigns_automatic_stream_class_id));
- SET_TMP_PREFIX("phf-pool-");
- format_object_pool(buf_ch, extended, prefix,
- &trace->packet_header_field_pool);
+ if (!trace->class) {
+ return;
+ }
+
+ BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace->class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix, trace->class);
}
static inline void format_stream_class(char **buf_ch, bool extended,
- const char *prefix, struct bt_stream_class *stream_class)
+ const char *prefix,
+ const struct bt_stream_class *stream_class)
{
- struct bt_trace *trace;
+ const struct bt_trace_class *trace_class;
char tmp_prefix[64];
BUF_APPEND(", %sid=%" PRIu64, PRFIELD(stream_class->id));
}
BUF_APPEND(", %spacket-context-fc-addr=%p, "
- "%sevent-header-fc-addr=%p, %sevent-common-context-fc-addr=%p",
+ "%sevent-common-context-fc-addr=%p",
PRFIELD(stream_class->packet_context_fc),
- PRFIELD(stream_class->event_header_fc),
PRFIELD(stream_class->event_common_context_fc));
- trace = bt_stream_class_borrow_trace_inline(stream_class);
- if (!trace) {
+ trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
+ if (!trace_class) {
return;
}
- BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
- "%spackets-have-discarded-ev-counter-snapshot=%d, "
- "%spackets-have-packet-counter-snapshot=%d, "
- "%spackets-have-default-begin-cv=%d, "
- "%spackets-have-default-end-cv=%d",
+ BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d",
PRFIELD(stream_class->assigns_automatic_event_class_id),
- PRFIELD(stream_class->assigns_automatic_stream_id),
- PRFIELD(stream_class->packets_have_discarded_event_counter_snapshot),
- PRFIELD(stream_class->packets_have_packet_counter_snapshot),
- PRFIELD(stream_class->packets_have_default_beginning_cv),
- PRFIELD(stream_class->packets_have_default_end_cv));
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
- SET_TMP_PREFIX("ehf-pool-");
- format_object_pool(buf_ch, extended, prefix,
- &stream_class->event_header_field_pool);
+ PRFIELD(stream_class->assigns_automatic_stream_id));
+ BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix, trace_class);
SET_TMP_PREFIX("pcf-pool-");
- format_object_pool(buf_ch, extended, prefix,
+ format_object_pool(buf_ch, extended, tmp_prefix,
&stream_class->packet_context_field_pool);
}
static inline void format_event_class(char **buf_ch, bool extended,
- const char *prefix, struct bt_event_class *event_class)
+ const char *prefix, const struct bt_event_class *event_class)
{
- struct bt_stream_class *stream_class;
- struct bt_trace *trace;
+ const struct bt_stream_class *stream_class;
+ const struct bt_trace_class *trace_class;
char tmp_prefix[64];
BUF_APPEND(", %sid=%" PRIu64, PRFIELD(event_class->id));
PRFIELD(event_class->specific_context_fc),
PRFIELD(event_class->payload_fc));
- stream_class = bt_event_class_borrow_stream_class(event_class);
+ stream_class = bt_event_class_borrow_stream_class_const(event_class);
if (!stream_class) {
return;
}
BUF_APPEND(", %sstream-class-addr=%p", PRFIELD(stream_class));
SET_TMP_PREFIX("stream-class-");
format_stream_class(buf_ch, false, tmp_prefix, stream_class);
- trace = bt_stream_class_borrow_trace_inline(stream_class);
- if (!trace) {
+ trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
+ if (!trace_class) {
return;
}
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
+ BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix, trace_class);
SET_TMP_PREFIX("event-pool-");
- format_object_pool(buf_ch, extended, prefix, &event_class->event_pool);
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &event_class->event_pool);
}
static inline void format_stream(char **buf_ch, bool extended,
- const char *prefix, struct bt_stream *stream)
+ const char *prefix, const struct bt_stream *stream)
{
- struct bt_stream_class *stream_class;
- struct bt_trace *trace;
+ const struct bt_stream_class *stream_class;
+ const struct bt_trace_class *trace_class = NULL;
+ const struct bt_trace *trace = NULL;
char tmp_prefix[64];
BUF_APPEND(", %sid=%" PRIu64, PRFIELD(stream->id));
return;
}
- stream_class = bt_stream_borrow_class(stream);
- if (!stream_class) {
- return;
+ stream_class = bt_stream_borrow_class_const(stream);
+ if (stream_class) {
+ BUF_APPEND(", %sstream-class-addr=%p", PRFIELD(stream_class));
+ SET_TMP_PREFIX("stream-class-");
+ format_stream_class(buf_ch, false, tmp_prefix, stream_class);
+ trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
}
- BUF_APPEND(", %sstream-class-addr=%p", PRFIELD(stream_class));
- SET_TMP_PREFIX("stream-class-");
- format_stream_class(buf_ch, false, tmp_prefix, stream_class);
- trace = bt_stream_class_borrow_trace_inline(stream_class);
- if (!trace) {
- return;
+ if (trace_class) {
+ BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix, trace_class);
+ }
+
+ trace = bt_stream_borrow_trace_inline(stream);
+ if (trace) {
+ BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
+ SET_TMP_PREFIX("trace-");
+ format_trace(buf_ch, false, tmp_prefix, trace);
}
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
SET_TMP_PREFIX("packet-pool-");
- format_object_pool(buf_ch, extended, prefix, &stream->packet_pool);
+ format_object_pool(buf_ch, extended, tmp_prefix, &stream->packet_pool);
}
static inline void format_packet(char **buf_ch, bool extended,
- const char *prefix, struct bt_packet *packet)
+ const char *prefix, const struct bt_packet *packet)
{
- struct bt_stream *stream;
- struct bt_trace *trace;
+ const struct bt_stream *stream;
+ const struct bt_trace_class *trace_class;
char tmp_prefix[64];
if (!extended) {
return;
}
- BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, "
- "%scontext-field-addr=%p",
+ BUF_APPEND(", %sis-frozen=%d, %scontext-field-addr=%p",
PRFIELD(packet->frozen),
- PRFIELD(packet->header_field ? packet->header_field->field : NULL),
PRFIELD(packet->context_field ? packet->context_field->field : NULL));
- stream = bt_packet_borrow_stream(packet);
+ stream = bt_packet_borrow_stream_const(packet);
if (!stream) {
return;
}
- if (packet->default_beginning_cv) {
- SET_TMP_PREFIX("default-begin-cv-");
- format_clock_value(buf_ch, true, tmp_prefix,
- packet->default_beginning_cv);
- }
-
- if (packet->default_end_cv) {
- SET_TMP_PREFIX("default-end-cv-");
- format_clock_value(buf_ch, true, tmp_prefix,
- packet->default_end_cv);
- }
-
- if (packet->discarded_event_counter_snapshot.base.avail) {
- BUF_APPEND(", %sdiscarded-ev-counter-snapshot=%" PRIu64,
- PRFIELD(packet->discarded_event_counter_snapshot.value));
- }
-
- if (packet->packet_counter_snapshot.base.avail) {
- BUF_APPEND(", %spacket-counter-snapshot=%" PRIu64,
- PRFIELD(packet->packet_counter_snapshot.value));
- }
-
BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream));
SET_TMP_PREFIX("stream-");
format_stream(buf_ch, false, tmp_prefix, stream);
- trace = (struct bt_trace *) bt_object_borrow_parent(&stream->base);
- if (!trace) {
+ trace_class = (const struct bt_trace_class *) bt_object_borrow_parent(&stream->base);
+ if (!trace_class) {
return;
}
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
+ BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix, trace_class);
}
static inline void format_event(char **buf_ch, bool extended,
- const char *prefix, struct bt_event *event)
+ const char *prefix, const struct bt_event *event)
{
- struct bt_packet *packet;
- struct bt_stream *stream;
- struct bt_trace *trace;
- struct bt_stream_class *stream_class;
+ 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[64];
if (!extended) {
return;
}
- BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, "
+ BUF_APPEND(", %sis-frozen=%d, "
"%scommon-context-field-addr=%p, "
"%sspecific-context-field-addr=%p, "
"%spayload-field-addr=%p, ",
PRFIELD(event->frozen),
- PRFIELD(event->header_field ?
- event->header_field->field : NULL),
PRFIELD(event->common_context_field),
PRFIELD(event->specific_context_field),
PRFIELD(event->payload_field));
format_stream_class(buf_ch, false, tmp_prefix,
stream_class);
- trace = bt_stream_class_borrow_trace_inline(stream_class);
- if (trace) {
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
+ trace_class = bt_stream_class_borrow_trace_class_inline(
+ stream_class);
+ if (trace_class) {
+ BUF_APPEND(", %strace-class-addr=%p",
+ PRFIELD(trace_class));
+ SET_TMP_PREFIX("trace-class-");
+ format_trace_class(buf_ch, false, tmp_prefix,
+ trace_class);
}
}
- if (event->default_cv) {
- SET_TMP_PREFIX("default-cv-");
- format_clock_value(buf_ch, true, tmp_prefix,
- event->default_cv);
- }
-
- packet = bt_event_borrow_packet(event);
+ packet = bt_event_borrow_packet_const(event);
if (!packet) {
return;
}
BUF_APPEND(", %spacket-addr=%p", PRFIELD(packet));
SET_TMP_PREFIX("packet-");
format_packet(buf_ch, false, tmp_prefix, packet);
- stream = bt_packet_borrow_stream(packet);
+ stream = bt_packet_borrow_stream_const(packet);
if (!stream) {
return;
}
}
static inline void format_clock_class(char **buf_ch, bool extended,
- const char *prefix, struct bt_clock_class *clock_class)
+ const char *prefix, const struct bt_clock_class *clock_class)
{
char tmp_prefix[64];
BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
"%soffset-s=%" PRId64 ", "
- "%soffset-cycles=%" PRIu64 ", %sis-absolute=%d, "
+ "%soffset-cycles=%" PRIu64 ", %sorigin-is-unix-epoch=%d, "
"%sbase-offset-ns=%" PRId64,
PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision),
PRFIELD(clock_class->offset_seconds),
PRFIELD(clock_class->offset_cycles),
- PRFIELD(clock_class->is_absolute),
+ PRFIELD(clock_class->origin_is_unix_epoch),
PRFIELD(clock_class->base_offset.value_ns));
- SET_TMP_PREFIX("cv-pool-");
- format_object_pool(buf_ch, extended, prefix, &clock_class->cv_pool);
+ SET_TMP_PREFIX("cs-pool-");
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &clock_class->cs_pool);
}
-static inline void format_clock_value(char **buf_ch, bool extended,
- const char *prefix, struct bt_clock_value *clock_value)
+static inline void format_clock_snapshot(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_clock_snapshot *clock_snapshot)
{
char tmp_prefix[64];
BUF_APPEND(", %svalue=%" PRIu64 ", %sns-from-origin=%" PRId64,
- PRFIELD(clock_value->value_cycles),
- PRFIELD(clock_value->ns_from_origin));
+ PRFIELD(clock_snapshot->value_cycles),
+ PRFIELD(clock_snapshot->ns_from_origin));
if (!extended) {
return;
}
- BUF_APPEND(", %sis-set=%d", PRFIELD(clock_value->is_set));
+ BUF_APPEND(", %sis-set=%d", PRFIELD(clock_snapshot->is_set));
- if (clock_value->clock_class) {
+ if (clock_snapshot->clock_class) {
BUF_APPEND(", %sclock-class-addr=%p",
- PRFIELD(clock_value->clock_class));
+ PRFIELD(clock_snapshot->clock_class));
SET_TMP_PREFIX("clock-class-");
format_clock_class(buf_ch, false, tmp_prefix,
- clock_value->clock_class);
+ clock_snapshot->clock_class);
}
}
static inline void format_value(char **buf_ch, bool extended,
- const char *prefix, struct bt_value *value)
+ const char *prefix, const struct bt_value *value)
{
BUF_APPEND(", %stype=%s",
PRFIELD(bt_common_value_type_string(bt_value_get_type(value))));
BUF_APPEND(", %svalue=%d", PRFIELD(val));
break;
}
- case BT_VALUE_TYPE_INTEGER:
+ case BT_VALUE_TYPE_UNSIGNED_INTEGER:
{
- int64_t val = bt_value_integer_get(value);
-
- BUF_APPEND(", %svalue=%" PRId64, PRFIELD(val));
+ BUF_APPEND(", %svalue=%" PRIu64,
+ PRFIELD(bt_value_unsigned_integer_get(value)));
+ break;
+ }
+ case BT_VALUE_TYPE_SIGNED_INTEGER:
+ {
+ BUF_APPEND(", %svalue=%" PRId64,
+ PRFIELD(bt_value_signed_integer_get(value)));
break;
}
case BT_VALUE_TYPE_REAL:
}
}
-static inline void format_notification(char **buf_ch, bool extended,
- const char *prefix, struct bt_notification *notif)
+static inline void format_message(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_message *msg)
{
char tmp_prefix[64];
BUF_APPEND(", %stype=%s",
- PRFIELD(bt_notification_type_string(notif->type)));
+ PRFIELD(bt_message_type_string(msg->type)));
if (!extended) {
return;
}
BUF_APPEND(", %sis-frozen=%d, %sgraph-addr=%p",
- PRFIELD(notif->frozen), PRFIELD(notif->graph));
+ PRFIELD(msg->frozen), PRFIELD(msg->graph));
- switch (notif->type) {
- case BT_NOTIFICATION_TYPE_EVENT:
+ switch (msg->type) {
+ case BT_MESSAGE_TYPE_EVENT:
{
- struct bt_notification_event *notif_event = (void *) notif;
+ const struct bt_message_event *msg_event =
+ (const void *) msg;
- if (notif_event->event) {
+ if (msg_event->event) {
SET_TMP_PREFIX("event-");
- format_event(buf_ch, true, tmp_prefix, notif_event->event);
+ format_event(buf_ch, true, tmp_prefix,
+ msg_event->event);
+ }
+
+ if (msg_event->default_cs) {
+ SET_TMP_PREFIX("default-cs-");
+ format_clock_snapshot(buf_ch, true, tmp_prefix,
+ msg_event->default_cs);
}
break;
}
- case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+ case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_END:
{
- struct bt_notification_stream_begin *notif_stream =
- (void *) notif;
+ const struct bt_message_stream *msg_stream = (const void *) msg;
- if (notif_stream->stream) {
+ if (msg_stream->stream) {
SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, true, tmp_prefix, notif_stream->stream);
+ format_stream(buf_ch, true, tmp_prefix,
+ msg_stream->stream);
}
break;
}
- case BT_NOTIFICATION_TYPE_STREAM_END:
+ case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
{
- struct bt_notification_stream_end *notif_stream =
- (void *) notif;
+ const struct bt_message_stream_activity *msg_stream_activity =
+ (const void *) msg;
- if (notif_stream->stream) {
+ if (msg_stream_activity->stream) {
SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, true, tmp_prefix, notif_stream->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)));
+
+ if (msg_stream_activity->default_cs) {
+ SET_TMP_PREFIX("default-cs-");
+ format_clock_snapshot(buf_ch, true, tmp_prefix,
+ msg_stream_activity->default_cs);
}
break;
}
- case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+ case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+ case BT_MESSAGE_TYPE_PACKET_END:
{
- struct bt_notification_packet_begin *notif_packet =
- (void *) notif;
+ const struct bt_message_packet *msg_packet = (const void *) msg;
- if (notif_packet->packet) {
+ if (msg_packet->packet) {
SET_TMP_PREFIX("packet-");
- format_packet(buf_ch, true, tmp_prefix, notif_packet->packet);
+ format_packet(buf_ch, true, tmp_prefix,
+ msg_packet->packet);
+ }
+
+ if (msg_packet->default_cs) {
+ SET_TMP_PREFIX("default-cs-");
+ format_clock_snapshot(buf_ch, true, tmp_prefix,
+ msg_packet->default_cs);
}
break;
}
- case BT_NOTIFICATION_TYPE_PACKET_END:
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
{
- struct bt_notification_packet_end *notif_packet =
- (void *) notif;
+ const struct bt_message_discarded_items *msg_disc_items =
+ (const void *) msg;
- if (notif_packet->packet) {
- SET_TMP_PREFIX("packet-");
- format_packet(buf_ch, true, tmp_prefix, notif_packet->packet);
+ if (msg_disc_items->stream) {
+ SET_TMP_PREFIX("stream-");
+ format_stream(buf_ch, true, tmp_prefix,
+ msg_disc_items->stream);
+ }
+
+ if (msg_disc_items->default_begin_cs) {
+ SET_TMP_PREFIX("default-begin-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-");
+ format_clock_snapshot(buf_ch, true, tmp_prefix,
+ msg_disc_items->default_end_cs);
+ }
+
+ if (msg_disc_items->count.base.avail) {
+ BUF_APPEND(", %scount=%" PRIu64,
+ PRFIELD(msg_disc_items->count.value));
}
break;
static inline void format_plugin_so_shared_lib_handle(char **buf_ch,
const char *prefix,
- struct bt_plugin_so_shared_lib_handle *handle)
+ const struct bt_plugin_so_shared_lib_handle *handle)
{
BUF_APPEND(", %saddr=%p", PRFIELD(handle));
}
static inline void format_component_class(char **buf_ch, bool extended,
- const char *prefix, struct bt_component_class *comp_class)
+ const char *prefix,
+ const struct bt_component_class *comp_class)
{
char tmp_prefix[64];
}
static inline void format_component(char **buf_ch, bool extended,
- const char *prefix, struct bt_component *component)
+ const char *prefix, const struct bt_component *component)
{
char tmp_prefix[64];
}
static inline void format_port(char **buf_ch, bool extended,
- const char *prefix, struct bt_port *port)
+ const char *prefix, const struct bt_port *port)
{
char tmp_prefix[64];
}
static inline void format_connection(char **buf_ch, bool extended,
- const char *prefix, struct bt_connection *connection)
+ const char *prefix, const struct bt_connection *connection)
{
char tmp_prefix[64];
}
static inline void format_graph(char **buf_ch, bool extended,
- const char *prefix, struct bt_graph *graph)
+ const char *prefix, const struct bt_graph *graph)
{
char tmp_prefix[64];
- BUF_APPEND(", %sis-canceled=%d", PRFIELD(graph->canceled));
+ BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
+ "%sconfig-state=%s",
+ PRFIELD(graph->canceled),
+ PRFIELD(graph->can_consume),
+ PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
if (!extended) {
return;
}
SET_TMP_PREFIX("en-pool-");
- format_object_pool(buf_ch, extended, prefix,
- &graph->event_notif_pool);
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &graph->event_msg_pool);
SET_TMP_PREFIX("pbn-pool-");
- format_object_pool(buf_ch, extended, prefix,
- &graph->packet_begin_notif_pool);
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &graph->packet_begin_msg_pool);
SET_TMP_PREFIX("pen-pool-");
- format_object_pool(buf_ch, extended, prefix,
- &graph->packet_end_notif_pool);
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &graph->packet_end_msg_pool);
}
-static inline void format_notification_iterator(char **buf_ch,
+static inline void format_message_iterator(char **buf_ch,
bool extended, const char *prefix,
- struct bt_notification_iterator *iterator)
+ const struct bt_message_iterator *iterator)
{
const char *type;
char tmp_prefix[64];
- if (iterator->type == BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT) {
- type = "BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT";
- } else if (iterator->type == BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT) {
- type = "BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT";
+ 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)";
}
BUF_APPEND(", %stype=%s", PRFIELD(type));
switch (iterator->type) {
- case BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT:
+ case BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT:
{
- struct bt_self_component_port_input_notification_iterator *
- port_in_iter = (void *) iterator;
+ 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-");
}
break;
}
- case BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT:
+ case BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT:
{
- struct bt_port_output_notification_iterator *port_out_iter =
- (void *) iterator;
+ const struct bt_port_output_message_iterator *port_out_iter =
+ (const void *) iterator;
if (port_out_iter->graph) {
SET_TMP_PREFIX("graph-");
PRFIELD(plugin->sink_comp_classes->len));
if (plugin->spec_data) {
- struct bt_plugin_so_spec_data *spec_data =
- (void *) plugin->spec_data;
+ const struct bt_plugin_so_spec_data *spec_data =
+ (const void *) plugin->spec_data;
if (spec_data->shared_lib_handle) {
SET_TMP_PREFIX("so-handle-");
bool extended = false;
char prefix[64];
char *prefix_ch = prefix;
- void *obj;
+ const void *obj;
/* skip "%!" */
fmt_ch += 2;
case 't':
format_trace(buf_ch, extended, prefix, obj);
break;
+ case 'T':
+ format_trace_class(buf_ch, extended, prefix, obj);
+ break;
case 'K':
format_clock_class(buf_ch, extended, prefix, obj);
break;
case 'k':
- format_clock_value(buf_ch, extended, prefix, obj);
+ format_clock_snapshot(buf_ch, extended, prefix, obj);
break;
case 'v':
format_value(buf_ch, extended, prefix, obj);
break;
case 'n':
- format_notification(buf_ch, extended, prefix, obj);
+ format_message(buf_ch, extended, prefix, obj);
break;
case 'i':
- format_notification_iterator(buf_ch, extended, prefix, obj);
+ format_message_iterator(buf_ch, extended, prefix, obj);
break;
case 'C':
format_component_class(buf_ch, extended, prefix, obj);
*out_fmt_ch = fmt_ch;
}
-BT_HIDDEN
void bt_lib_log(const char *func, const char *file, unsigned line,
int lvl, const char *tag, const char *fmt, ...)
{
projects / babeltrace.git / blobdiff