* SOFTWARE.
*/
+#define BT_LOG_TAG "LIB-LOGGING"
+
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <stdint.h>
-#include <assert.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/object-internal.h>
-#include <babeltrace/ref-internal.h>
-#include <babeltrace/values-internal.h>
-#include <babeltrace/ctf-ir/field-types-internal.h>
-#include <babeltrace/ctf-ir/fields-internal.h>
-#include <babeltrace/ctf-ir/event-class-internal.h>
-#include <babeltrace/ctf-ir/event-internal.h>
-#include <babeltrace/ctf-ir/packet-internal.h>
-#include <babeltrace/ctf-ir/stream-class-internal.h>
-#include <babeltrace/ctf-ir/stream-internal.h>
-#include <babeltrace/ctf-ir/trace-internal.h>
-#include <babeltrace/ctf-ir/clock-class-internal.h>
-#include <babeltrace/ctf-ir/clock-value-internal.h>
-#include <babeltrace/ctf-ir/field-path-internal.h>
-#include <babeltrace/graph/clock-class-priority-map-internal.h>
+#include <babeltrace/value-internal.h>
+#include <babeltrace/value-internal.h>
+#include <babeltrace/object-pool-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-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-class-sink-colander-internal.h>
#include <babeltrace/graph/component-filter-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-discarded-elements-internal.h>
-#include <babeltrace/graph/notification-event-internal.h>
-#include <babeltrace/graph/notification-heap-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>
-#include <babeltrace/ctf-writer/writer-internal.h>
-#include <babeltrace/ctf-writer/clock-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 { \
size_t _size = LIB_LOGGING_BUF_SIZE - \
(size_t) (*buf_ch - lib_logging_buf); \
_count = snprintf(*buf_ch, _size, (_fmt), __VA_ARGS__); \
- assert(_count >= 0); \
+ BT_ASSERT(_count >= 0); \
*buf_ch += MIN(_count, _size); \
if (*buf_ch >= lib_logging_buf + LIB_LOGGING_BUF_SIZE - 1) { \
return; \
} while (0)
#define BUF_APPEND_UUID(_uuid) \
- BUF_APPEND(", %suuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"", \
- prefix, \
- (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])
+ do { \
+ BUF_APPEND(", %suuid=", prefix); \
+ format_uuid(buf_ch, (_uuid)); \
+ } while (0)
#define PRFIELD(_expr) prefix, (_expr)
+#define PRFIELD_GSTRING(_expr) PRFIELD((_expr) ? (_expr)->str : NULL)
+
#define SET_TMP_PREFIX(_prefix2) \
do { \
strcpy(tmp_prefix, prefix); \
} 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_snapshot(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_clock_snapshot *clock_snapshot);
-static inline void format_ref_count(char **buf_ch, bool extended,
- const char *prefix, struct bt_object *obj)
+static inline void format_field_path(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_field_path *field_path);
+
+static inline void format_object(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_object *obj)
{
- BUF_APPEND(", %sref-count=%lu", prefix, obj->ref_count.count);
+ BUF_APPEND(", %sref-count=%llu", prefix, obj->ref_count);
}
-static inline void format_field_type(char **buf_ch, bool extended,
- const char *prefix, struct bt_field_type *field_type)
+static inline void format_uuid(char **buf_ch, bt_uuid uuid)
{
- BUF_APPEND(", %stype-id=%s, %salignment=%u",
- PRFIELD(bt_field_type_id_string(field_type->id)),
- PRFIELD(field_type->alignment));
+ 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]);
+}
- if (extended) {
- BUF_APPEND(", %sis-frozen=%d", PRFIELD(field_type->frozen));
- } else {
- return;
+static inline void format_object_pool(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_object_pool *pool)
+{
+ BUF_APPEND(", %ssize=%zu", PRFIELD(pool->size));
+
+ if (pool->objects) {
+ BUF_APPEND(", %scap=%u", PRFIELD(pool->objects->len));
}
+}
+
+static inline void format_integer_field_class(char **buf_ch,
+ bool extended, const char *prefix,
+ const struct bt_field_class *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),
+ PRFIELD(bt_common_field_class_integer_preferred_display_base_string(int_fc->base)));
+}
+
+static inline void format_array_field_class(char **buf_ch,
+ bool extended, const char *prefix,
+ const struct bt_field_class *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),
+ PRFIELD(bt_common_field_class_type_string(array_fc->element_fc->type)));
+}
- if (field_type->id == BT_FIELD_TYPE_ID_UNKNOWN) {
+static inline void format_field_class(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_field_class *field_class)
+{
+ char tmp_prefix[64];
+
+ BUF_APPEND(", %stype=%s",
+ PRFIELD(bt_common_field_class_type_string(field_class->type)));
+
+ if (extended) {
+ BUF_APPEND(", %sis-frozen=%d", PRFIELD(field_class->frozen));
+ BUF_APPEND(", %sis-part-of-trace-class=%d",
+ PRFIELD(field_class->part_of_trace_class));
+ } else {
return;
}
- switch (field_type->id) {
- case BT_FIELD_TYPE_ID_INTEGER:
+ switch (field_class->type) {
+ case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+ case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
{
- struct bt_field_type_integer *integer = (void *) field_type;
-
- BUF_APPEND(", %ssize=%u, %sis-signed=%d, %sbyte-order=%s, "
- "%sbase=%d, %sencoding=%s, "
- "%smapped-clock-class-addr=%p",
- PRFIELD(integer->size), PRFIELD(integer->is_signed),
- PRFIELD(bt_byte_order_string(integer->user_byte_order)),
- PRFIELD(integer->base),
- PRFIELD(bt_string_encoding_string(integer->encoding)),
- PRFIELD(integer->mapped_clock));
-
- if (integer->mapped_clock) {
- BUF_APPEND(", %smapped-clock-class-name=\"%s\"",
- PRFIELD(bt_clock_class_get_name(integer->mapped_clock)));
- }
+ format_integer_field_class(buf_ch, extended, prefix, field_class);
break;
}
- case BT_FIELD_TYPE_ID_FLOAT:
+ case BT_FIELD_CLASS_TYPE_REAL:
{
- struct bt_field_type_floating_point *flt = (void *) field_type;
+ const struct bt_field_class_real *real_fc = (void *) field_class;
- BUF_APPEND(", %sexp-dig=%u, %smant-dig=%u, %sbyte-order=%s",
- PRFIELD(flt->exp_dig), PRFIELD(flt->mant_dig),
- PRFIELD(bt_byte_order_string(flt->user_byte_order)));
+ BUF_APPEND(", %sis-single-precision=%d",
+ PRFIELD(real_fc->is_single_precision));
break;
}
- case BT_FIELD_TYPE_ID_ENUM:
+ case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
+ case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
{
- struct bt_field_type_enumeration *enm = (void *) field_type;
+ 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",
- PRFIELD(enm->entries->len));
+ PRFIELD(enum_fc->mappings->len));
break;
}
- case BT_FIELD_TYPE_ID_STRING:
+ case BT_FIELD_CLASS_TYPE_STRUCTURE:
{
- struct bt_field_type_string *str = (void *) field_type;
+ const struct bt_field_class_structure *struct_fc =
+ (const void *) field_class;
+
+ if (struct_fc->common.named_fcs) {
+ BUF_APPEND(", %smember-count=%u",
+ PRFIELD(struct_fc->common.named_fcs->len));
+ }
- BUF_APPEND(", %sencoding=%s",
- PRFIELD(bt_string_encoding_string(str->encoding)));
break;
}
- case BT_FIELD_TYPE_ID_STRUCT:
+ case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
{
- struct bt_field_type_structure *structure = (void *) field_type;
+ const struct bt_field_class_static_array *array_fc =
+ (const void *) field_class;
- BUF_APPEND(", %sfield-count=%u",
- PRFIELD(structure->fields->len));
+ format_array_field_class(buf_ch, extended, prefix, field_class);
+ BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
break;
}
- case BT_FIELD_TYPE_ID_SEQUENCE:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- struct bt_field_type_sequence *seq = (void *) field_type;
+ const struct bt_field_class_dynamic_array *array_fc =
+ (const void *) field_class;
+
+ format_array_field_class(buf_ch, extended, prefix, field_class);
+
+ if (array_fc->length_fc) {
+ SET_TMP_PREFIX("length-fc-");
+ format_field_class(buf_ch, extended, tmp_prefix,
+ array_fc->length_fc);
+ }
+
+ if (array_fc->length_field_path) {
+ SET_TMP_PREFIX("length-field-path-");
+ format_field_path(buf_ch, extended, tmp_prefix,
+ array_fc->length_field_path);
+ }
- BUF_APPEND(", %slength-ft-addr=\"%s\", %selem-ft-addr=%p",
- PRFIELD(seq->length_field_name->str),
- PRFIELD(seq->element_type));
break;
}
- case BT_FIELD_TYPE_ID_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT:
{
- struct bt_field_type_variant *variant = (void *) field_type;
+ const struct bt_field_class_variant *var_fc =
+ (const void *) field_class;
+
+ if (var_fc->common.named_fcs) {
+ BUF_APPEND(", %soption-count=%u",
+ 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 (var_fc->selector_field_path) {
+ SET_TMP_PREFIX("selector-field-path-");
+ format_field_path(buf_ch, extended, tmp_prefix,
+ var_fc->selector_field_path);
+ }
- BUF_APPEND(", %stag-name=\"%s\", %stag-ft-addr=%p, "
- "%sfield-count=%u",
- PRFIELD(variant->tag_name->str),
- PRFIELD(variant->tag), PRFIELD(variant->fields->len));
break;
}
default:
}
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_type_integer *field_type = (void *) field->type;
+ const struct bt_field_integer *integer = (void *) field;
+ const struct bt_field_class_integer *field_class =
+ (void *) field->class;
const char *fmt = NULL;
- if (field_type->base == 8) {
+ BT_ASSERT(field_class);
+
+ if (field_class->base == BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL) {
fmt = ", %svalue=%" PRIo64;
- } else if (field_type->base == 16) {
+ } else if (field_class->base == BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL) {
fmt = ", %svalue=%" PRIx64;
}
- if (field_type->is_signed) {
+ if (field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
+ field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) {
if (!fmt) {
fmt = ", %svalue=%" PRId64;
}
- BUF_APPEND(fmt, PRFIELD(integer->payload.signd));
+ BUF_APPEND(fmt, PRFIELD(integer->value.i));
} else {
if (!fmt) {
fmt = ", %svalue=%" PRIu64;
}
- BUF_APPEND(fmt, PRFIELD(integer->payload.unsignd));
+ BUF_APPEND(fmt, PRFIELD(integer->value.u));
}
}
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->payload_set));
+ BUF_APPEND(", %sis-set=%d", PRFIELD(field->is_set));
if (extended) {
BUF_APPEND(", %sis-frozen=%d", PRFIELD(field->frozen));
}
- BUF_APPEND(", %stype-addr=%p, %stype-id=%s",
- PRFIELD(field->type),
- PRFIELD(bt_field_type_id_string(field->type->id)));
+ BUF_APPEND(", %sclass-addr=%p", PRFIELD(field->class));
- if (!extended || field->type->id == BT_FIELD_TYPE_ID_UNKNOWN ||
- !field->payload_set) {
+ if (!field->class) {
return;
}
- switch (field->type->id) {
- case BT_FIELD_TYPE_ID_INTEGER:
+ BUF_APPEND(", %sclass-type=%s",
+ PRFIELD(bt_common_field_class_type_string(field->class->type)));
+
+ if (!extended || !field->is_set) {
+ return;
+ }
+
+ switch (field->class->type) {
+ case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+ case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
+ case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
+ case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
{
format_field_integer_extended(buf_ch, prefix, field);
break;
}
- case BT_FIELD_TYPE_ID_FLOAT:
+ case BT_FIELD_CLASS_TYPE_REAL:
{
- struct bt_field_floating_point *flt = (void *) field;
+ const struct bt_field_real *real_field = (const void *) field;
- BUF_APPEND(", %svalue=%f", PRFIELD(flt->payload));
+ BUF_APPEND(", %svalue=%f", PRFIELD(real_field->value));
break;
}
- case BT_FIELD_TYPE_ID_ENUM:
+ case BT_FIELD_CLASS_TYPE_STRING:
{
- struct bt_field_enumeration *enm = (void *) field;
+ const struct bt_field_string *str = (const void *) field;
- if (enm->payload) {
- format_field_integer_extended(buf_ch, prefix,
- enm->payload);
+ if (str->buf) {
+ BT_ASSERT(str->buf->data);
+ BUF_APPEND(", %spartial-value=\"%.32s\"",
+ PRFIELD(str->buf->data));
}
- break;
- }
- case BT_FIELD_TYPE_ID_STRING:
- {
- struct bt_field_string *str = (void *) field;
- assert(str->payload);
- BUF_APPEND(", %spartial-value=\"%.32s\"",
- PRFIELD(str->payload->str));
break;
}
- case BT_FIELD_TYPE_ID_SEQUENCE:
+ case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- struct bt_field_sequence *seq = (void *) field;
+ const struct bt_field_array *array_field = (const void *) field;
+
+ BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_field->length));
+
+ if (array_field->fields) {
+ BUF_APPEND(", %sallocated-length=%u",
+ PRFIELD(array_field->fields->len));
+ }
- BUF_APPEND(", %slength-field-addr=%p", PRFIELD(seq->length));
break;
}
- case BT_FIELD_TYPE_ID_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT:
{
- struct bt_field_variant *variant = (void *) field;
+ const struct bt_field_variant *var_field = (const void *) field;
- BUF_APPEND(", %stag-field-addr=%p, %svalue-field-addr=%p",
- PRFIELD(variant->tag), PRFIELD(variant->payload));
+ BUF_APPEND(", %sselected-field-index=%" PRIu64,
+ PRFIELD(var_field->selected_index));
break;
}
default:
}
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;
- 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) {
+ if (!extended || !field_path->items) {
return;
}
- BUF_APPEND(", %spath=[%s", PRFIELD(bt_scope_string(field_path->root)));
+ BUF_APPEND(", %spath=[%s",
+ PRFIELD(bt_common_scope_string(field_path->root)));
- for (i = 0; i < field_path->indexes->len; i++) {
- int index = g_array_index(field_path->indexes, int, i);
+ 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);
- BUF_APPEND(", %d", index);
+ 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)
{
- if (trace->name) {
- BUF_APPEND(", %sname=\"%s\"", PRFIELD(trace->name->str));
+ char tmp_prefix[64];
+
+ if (trace->name.value) {
+ BUF_APPEND(", %sname=\"%s\"", PRFIELD(trace->name.value));
}
if (!extended) {
return;
}
- BUF_APPEND(", %sis-frozen=%d, %sis-static=%d",
- PRFIELD(trace->frozen), PRFIELD(trace->is_static));
+ BUF_APPEND(", %sis-frozen=%d", PRFIELD(trace->frozen));
+
+ if (trace->streams) {
+ BUF_APPEND(", %sstream-count=%u",
+ PRFIELD(trace->streams->len));
+ }
- if (trace->uuid_set) {
- BUF_APPEND_UUID(trace->uuid);
+ if (!trace->class) {
+ return;
}
- BUF_APPEND(", %sclock-class-count=%u, %sstream-class-count=%u, "
- "%sstream-count=%u, %sis-ctf-writer-trace=%d, "
- "%spacket-header-ft-addr=%p",
- PRFIELD(trace->clocks->len),
- PRFIELD(trace->stream_classes->len),
- PRFIELD(trace->streams->len),
- PRFIELD(trace->is_created_by_writer),
- PRFIELD(trace->packet_header_type));
+ 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];
- if (stream_class->id_set) {
- BUF_APPEND(", %sid=%" PRId64, PRFIELD(stream_class->id));
- }
+ BUF_APPEND(", %sid=%" PRIu64, PRFIELD(stream_class->id));
- if (stream_class->name) {
- BUF_APPEND(", %sname=\"%s\"", PRFIELD(stream_class->name->str));
+ if (stream_class->name.value) {
+ BUF_APPEND(", %sname=\"%s\"",
+ PRFIELD(stream_class->name.value));
}
if (!extended) {
BUF_APPEND(", %sis-frozen=%d", PRFIELD(stream_class->frozen));
- if (stream_class->clock) {
- BUF_APPEND(", %sctf-writer-clock-addr=%p, "
- "%sctf-writer-clock-name=\"%s\"",
- PRFIELD(stream_class->clock),
- PRFIELD(bt_clock_class_get_name(stream_class->clock->clock_class)));
- }
-
- BUF_APPEND(", %sevent-class-count=%u, %spacket-context-ft-addr=%p, "
- "%sevent-header-ft-addr=%p, %sevent-context-ft-addr=%p",
- PRFIELD(stream_class->event_classes->len),
- PRFIELD(stream_class->packet_context_type),
- PRFIELD(stream_class->event_header_type),
- PRFIELD(stream_class->event_context_type));
- trace = bt_stream_class_borrow_trace(stream_class);
- if (!trace) {
+ if (stream_class->event_classes) {
+ BUF_APPEND(", %sevent-class-count=%u",
+ PRFIELD(stream_class->event_classes->len));
+ }
+
+ BUF_APPEND(", %spacket-context-fc-addr=%p, "
+ "%sevent-common-context-fc-addr=%p",
+ PRFIELD(stream_class->packet_context_fc),
+ PRFIELD(stream_class->event_common_context_fc));
+ 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(", %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));
+ 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, 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=%" PRId64, PRFIELD(event_class->id));
+ BUF_APPEND(", %sid=%" PRIu64, PRFIELD(event_class->id));
- if (event_class->name) {
- BUF_APPEND(", %sname=\"%s\"", PRFIELD(event_class->name->str));
+ if (event_class->name.value) {
+ BUF_APPEND(", %sname=\"%s\"",
+ PRFIELD(event_class->name.value));
}
if (!extended) {
return;
}
- BUF_APPEND(", %sis-frozen=%d, %slog-level=%s",
- PRFIELD(event_class->frozen),
- PRFIELD(bt_event_class_log_level_string(event_class->log_level)));
+ BUF_APPEND(", %sis-frozen=%d", PRFIELD(event_class->frozen));
+
+ if (event_class->log_level.base.avail) {
+ BUF_APPEND(", %slog-level=%s",
+ PRFIELD(bt_common_event_class_log_level_string(
+ (int) event_class->log_level.value)));
+ }
- if (event_class->emf_uri) {
+ if (event_class->emf_uri.value) {
BUF_APPEND(", %semf-uri=\"%s\"",
- PRFIELD(event_class->emf_uri->str));
+ PRFIELD(event_class->emf_uri.value));
}
- BUF_APPEND(", %scontext-ft-addr=%p, %spayload-ft-addr=%p",
- PRFIELD(event_class->context),
- PRFIELD(event_class->fields));
+ BUF_APPEND(", %sspecific-context-fc-addr=%p, %spayload-fc-addr=%p",
+ 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(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, 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=%" PRId64, PRFIELD(stream->id));
+ BUF_APPEND(", %sid=%" PRIu64, PRFIELD(stream->id));
- if (stream->name) {
- BUF_APPEND(", %sname=\"%s\"", PRFIELD(stream->name->str));
+ if (stream->name.value) {
+ BUF_APPEND(", %sname=\"%s\"", PRFIELD(stream->name.value));
}
- BUF_APPEND(", %sis-ctf-writer-stream=%d",
- PRFIELD(stream->pos.fd != -1));
-
if (!extended) {
return;
}
- if (stream->pos.fd != -1) {
- BUF_APPEND(", %sheader-field-addr=%p, %scontext-field-addr=%p"
- ", %sfd=%d, %smmap-offset=%zu, "
- "%smmap-base-offset=%zu, %spacket-size=%" PRIu64 ", "
- "%soffset=%" PRId64 ", %sevent-count=%u, "
- "%sflushed-packet-count=%u, "
- "%sdiscarded-event-count=%" PRIu64 ", "
- "%ssize=%" PRIu64 ", %slast-ts-end=%" PRIu64,
- PRFIELD(stream->packet_header),
- PRFIELD(stream->packet_context),
- PRFIELD(stream->pos.fd),
- PRFIELD((size_t) stream->pos.mmap_offset),
- PRFIELD((size_t) stream->pos.mmap_base_offset),
- PRFIELD(stream->pos.packet_size),
- PRFIELD(stream->pos.offset),
- PRFIELD(stream->events->len),
- PRFIELD(stream->flushed_packet_count),
- PRFIELD(stream->discarded_events),
- PRFIELD(stream->size), PRFIELD(stream->last_ts_end));
- }
-
- stream_class = bt_stream_borrow_stream_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(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 = (struct bt_trace *) bt_object_borrow_parent(stream);
- if (!trace) {
- return;
+ 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, 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),
- PRFIELD(packet->context));
- stream = bt_packet_borrow_stream(packet);
+ PRFIELD(packet->context_field ? packet->context_field->field : NULL));
+ stream = bt_packet_borrow_stream_const(packet);
if (!stream) {
return;
}
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);
- 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_trace *trace;
- struct bt_stream_class *stream_class;
- struct bt_packet *packet;
- struct bt_stream *stream;
+ 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, "
- "%sstream-context-field-addr=%p, "
- "%scontext-field-addr=%p, %spayload-field-addr=%p, "
- "%sclock-value-count=%u",
+ BUF_APPEND(", %sis-frozen=%d, "
+ "%scommon-context-field-addr=%p, "
+ "%sspecific-context-field-addr=%p, "
+ "%spayload-field-addr=%p, ",
PRFIELD(event->frozen),
- PRFIELD(event->event_header),
- PRFIELD(event->stream_event_context),
- PRFIELD(event->context_payload),
- PRFIELD(event->fields_payload),
- PRFIELD(g_hash_table_size(event->clock_values)));
- BUF_APPEND(", %sevent-class-addr=%p", PRFIELD(event->event_class));
+ PRFIELD(event->common_context_field),
+ PRFIELD(event->specific_context_field),
+ PRFIELD(event->payload_field));
+ BUF_APPEND(", %sevent-class-addr=%p", PRFIELD(event->class));
+
+ if (!event->class) {
+ return;
+ }
+
SET_TMP_PREFIX("event-class-");
- format_event_class(buf_ch, false, tmp_prefix, event->event_class);
- stream_class = bt_event_class_borrow_stream_class(event->event_class);
+ format_event_class(buf_ch, false, tmp_prefix, event->class);
+ stream_class = bt_event_class_borrow_stream_class(event->class);
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 = bt_stream_class_borrow_trace(stream_class);
- if (trace) {
- BUF_APPEND(", %strace-addr=%p", PRFIELD(trace));
- SET_TMP_PREFIX("trace-");
- format_trace(buf_ch, false, tmp_prefix, trace);
+ format_stream_class(buf_ch, false, tmp_prefix,
+ stream_class);
+
+ 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);
}
}
- 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)
{
- BUF_APPEND(", %sname=\"%s\", %sfreq=%" PRIu64,
- PRFIELD(clock_class->name->str),
- PRFIELD(clock_class->frequency));
+ char tmp_prefix[64];
+
+ if (clock_class->name.value) {
+ BUF_APPEND(", %sname=\"%s\"", PRFIELD(clock_class->name.value));
+ }
+
+ BUF_APPEND(", %sfreq=%" PRIu64, PRFIELD(clock_class->frequency));
if (!extended) {
return;
}
- if (clock_class->description) {
- BUF_APPEND(", %spartial-description=\"%.32s\"",
- PRFIELD(clock_class->description->str));
+ if (clock_class->description.value) {
+ BUF_APPEND(", %spartial-descr=\"%.32s\"",
+ PRFIELD(clock_class->description.value));
+ }
+
+ if (clock_class->uuid.value) {
+ BUF_APPEND_UUID(clock_class->uuid.value);
}
BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
"%soffset-s=%" PRId64 ", "
- "%soffset-cycles=%" PRId64 ", %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_s), PRFIELD(clock_class->offset),
- PRFIELD(clock_class->absolute));
-
- if (clock_class->uuid_set) {
- BUF_APPEND_UUID(clock_class->uuid);
- }
+ PRFIELD(clock_class->offset_seconds),
+ PRFIELD(clock_class->offset_cycles),
+ PRFIELD(clock_class->origin_is_unix_epoch),
+ PRFIELD(clock_class->base_offset.value_ns));
+
+ 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-epoch=%" PRId64,
- PRFIELD(clock_value->value),
- PRFIELD(clock_value->ns_from_epoch));
+ BUF_APPEND(", %svalue=%" PRIu64 ", %sns-from-origin=%" PRId64,
+ PRFIELD(clock_snapshot->value_cycles),
+ PRFIELD(clock_snapshot->ns_from_origin));
if (!extended) {
return;
}
- BUF_APPEND(", %sclock-class-addr=%p",
- PRFIELD(clock_value->clock_class));
- SET_TMP_PREFIX("clock-class-");
- format_clock_class(buf_ch, false, tmp_prefix, clock_value->clock_class);
+ BUF_APPEND(", %sis-set=%d", PRFIELD(clock_snapshot->is_set));
+
+ if (clock_snapshot->clock_class) {
+ BUF_APPEND(", %sclock-class-addr=%p",
+ PRFIELD(clock_snapshot->clock_class));
+ SET_TMP_PREFIX("clock-class-");
+ format_clock_class(buf_ch, false, tmp_prefix,
+ 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_value_type_string(bt_value_get_type(value))));
+ PRFIELD(bt_common_value_type_string(bt_value_get_type(value))));
if (!extended) {
return;
switch (bt_value_get_type(value)) {
case BT_VALUE_TYPE_BOOL:
{
- bt_bool val;
- int status = bt_value_bool_get(value, &val);
+ bt_bool val = bt_value_bool_get(value);
- assert(status == 0);
BUF_APPEND(", %svalue=%d", PRFIELD(val));
break;
}
- case BT_VALUE_TYPE_INTEGER:
+ case BT_VALUE_TYPE_UNSIGNED_INTEGER:
{
- int64_t val;
- int status = bt_value_integer_get(value, &val);
-
- assert(status == 0);
- 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_FLOAT:
+ case BT_VALUE_TYPE_REAL:
{
- double val;
- int status = bt_value_float_get(value, &val);
+ double val = bt_value_real_get(value);
- assert(status == 0);
BUF_APPEND(", %svalue=%f", PRFIELD(val));
break;
}
case BT_VALUE_TYPE_STRING:
{
- const char *val;
- int status = bt_value_string_get(value, &val);
+ const char *val = bt_value_string_get(value);
- assert(status == 0);
BUF_APPEND(", %spartial-value=\"%.32s\"", PRFIELD(val));
break;
}
case BT_VALUE_TYPE_ARRAY:
{
- int64_t count = bt_value_array_size(value);
+ int64_t count = bt_value_array_get_size(value);
- assert(count >= 0);
+ BT_ASSERT(count >= 0);
BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
break;
}
case BT_VALUE_TYPE_MAP:
{
- int64_t count = bt_value_map_size(value);
+ int64_t count = bt_value_map_get_size(value);
- assert(count >= 0);
+ BT_ASSERT(count >= 0);
BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
break;
}
}
}
-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", PRFIELD(notif->frozen));
+ BUF_APPEND(", %sis-frozen=%d, %sgraph-addr=%p",
+ 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;
- SET_TMP_PREFIX("event-");
- format_event(buf_ch, true, tmp_prefix, notif_event->event);
+ if (msg_event->event) {
+ SET_TMP_PREFIX("event-");
+ format_event(buf_ch, true, tmp_prefix,
+ msg_event->event);
+ }
- if (!notif_event->cc_prio_map) {
- return;
+ if (msg_event->default_cs) {
+ SET_TMP_PREFIX("default-cs-");
+ format_clock_snapshot(buf_ch, true, tmp_prefix,
+ msg_event->default_cs);
}
- BUF_APPEND(", %scc-prio-map-addr=%p, %scc-prio-map-cc-count=%u",
- PRFIELD(notif_event->cc_prio_map),
- PRFIELD(notif_event->cc_prio_map->entries->len));
break;
}
- case BT_NOTIFICATION_TYPE_INACTIVITY:
+ case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_END:
{
- struct bt_notification_inactivity *notif_inactivity =
- (void *) notif;
+ const struct bt_message_stream *msg_stream = (const void *) msg;
- if (!notif_inactivity->cc_prio_map) {
- return;
+ if (msg_stream->stream) {
+ SET_TMP_PREFIX("stream-");
+ format_stream(buf_ch, true, tmp_prefix,
+ msg_stream->stream);
}
- BUF_APPEND(", %scc-prio-map-addr=%p, %scc-prio-map-cc-count=%u",
- PRFIELD(notif_inactivity->cc_prio_map),
- PRFIELD(notif_inactivity->cc_prio_map->entries->len));
break;
}
- case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+ case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
{
- struct bt_notification_stream_begin *notif_stream =
- (void *) notif;
+ const struct bt_message_stream_activity *msg_stream_activity =
+ (const void *) msg;
- SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, true, tmp_prefix, notif_stream->stream);
- break;
- }
- case BT_NOTIFICATION_TYPE_STREAM_END:
- {
- struct bt_notification_stream_end *notif_stream =
- (void *) notif;
+ if (msg_stream_activity->stream) {
+ SET_TMP_PREFIX("stream-");
+ format_stream(buf_ch, true, tmp_prefix,
+ msg_stream_activity->stream);
+ }
- SET_TMP_PREFIX("stream-");
- format_stream(buf_ch, true, tmp_prefix, notif_stream->stream);
- break;
- }
- case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
- {
- struct bt_notification_packet_begin *notif_packet =
- (void *) notif;
+ 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);
+ }
- SET_TMP_PREFIX("packet-");
- format_packet(buf_ch, true, tmp_prefix, notif_packet->packet);
break;
}
- case BT_NOTIFICATION_TYPE_PACKET_END:
+ case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+ case BT_MESSAGE_TYPE_PACKET_END:
{
- struct bt_notification_packet_end *notif_packet =
- (void *) notif;
+ const struct bt_message_packet *msg_packet = (const void *) msg;
+
+ if (msg_packet->packet) {
+ SET_TMP_PREFIX("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);
+ }
- SET_TMP_PREFIX("packet-");
- format_packet(buf_ch, true, tmp_prefix, notif_packet->packet);
break;
}
- case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
- case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
{
- struct bt_notification_discarded_elements *notif_discarded =
- (void *) notif;
+ const struct bt_message_discarded_items *msg_disc_items =
+ (const void *) msg;
- BUF_APPEND(", %scount=%" PRId64,
- PRFIELD(notif_discarded->count));
+ if (msg_disc_items->stream) {
+ SET_TMP_PREFIX("stream-");
+ format_stream(buf_ch, true, tmp_prefix,
+ msg_disc_items->stream);
+ }
- if (notif_discarded->begin_clock_value) {
- SET_TMP_PREFIX("begin-clock-value-");
- format_clock_value(buf_ch, true, tmp_prefix,
- notif_discarded->begin_clock_value);
+ 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 (notif_discarded->end_clock_value) {
- SET_TMP_PREFIX("end-clock-value-");
- format_clock_value(buf_ch, true, tmp_prefix,
- notif_discarded->end_clock_value);
+ 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;
}
default:
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));
if (handle->path) {
- BUF_APPEND(", %spath=\"%s\"", PRFIELD(handle->path->str));
+ BUF_APPEND(", %spath=\"%s\"", PRFIELD_GSTRING(handle->path));
}
}
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];
BUF_APPEND(", %stype=%s, %sname=\"%s\"",
PRFIELD(bt_component_class_type_string(comp_class->type)),
- PRFIELD(comp_class->name->str));
+ PRFIELD_GSTRING(comp_class->name));
if (comp_class->description) {
BUF_APPEND(", %spartial-descr=\"%.32s\"",
- PRFIELD(comp_class->description->str));
+ PRFIELD_GSTRING(comp_class->description));
}
if (!extended) {
}
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];
- BUF_APPEND(", %sname=\"%s\"", PRFIELD(component->name->str));
- SET_TMP_PREFIX("class-");
- format_component_class(buf_ch, extended, tmp_prefix, component->class);
+ BUF_APPEND(", %sname=\"%s\"",
+ PRFIELD_GSTRING(component->name));
+
+ if (component->class) {
+ SET_TMP_PREFIX("class-");
+ format_component_class(buf_ch, extended, tmp_prefix,
+ component->class);
+ }
if (!extended) {
return;
}
- BUF_APPEND(", %sinput-port-count=%u, %soutput-port-count=%u",
- PRFIELD(component->input_ports ? component->input_ports->len : 0),
- PRFIELD(component->output_ports ? component->output_ports->len : 0));
+ if (component->input_ports) {
+ BUF_APPEND(", %sinput-port-count=%u",
+ PRFIELD(component->input_ports->len));
+ }
+
+ if (component->output_ports) {
+ BUF_APPEND(", %soutput-port-count=%u",
+ PRFIELD(component->output_ports->len));
+ }
}
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];
BUF_APPEND(", %stype=%s, %sname=\"%s\"",
PRFIELD(bt_port_type_string(port->type)),
- PRFIELD(port->name->str));
+ PRFIELD_GSTRING(port->name));
if (!extended) {
return;
}
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)
{
- BUF_APPEND(", %sis-canceled=%d", PRFIELD(graph->canceled));
+ char tmp_prefix[64];
+
+ 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;
}
- BUF_APPEND(", %scomp-count=%u, %sconn-count=%u",
- PRFIELD(graph->components->len),
- PRFIELD(graph->connections->len));
+ if (graph->components) {
+ BUF_APPEND(", %scomp-count=%u",
+ PRFIELD(graph->components->len));
+ }
+
+ if (graph->connections) {
+ BUF_APPEND(", %sconn-count=%u",
+ PRFIELD(graph->connections->len));
+ }
+
+ SET_TMP_PREFIX("en-pool-");
+ format_object_pool(buf_ch, extended, tmp_prefix,
+ &graph->event_msg_pool);
+ SET_TMP_PREFIX("pbn-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, 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_PRIVATE_CONNECTION) {
- type = "BT_NOTIFICATION_ITERATOR_TYPE_PRIVATE_CONNECTION";
- } else if (iterator->type == BT_NOTIFICATION_ITERATOR_TYPE_OUTPUT_PORT) {
- type = "BT_NOTIFICATION_ITERATOR_TYPE_OUTPUT_PORT";
+ 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_PRIVATE_CONNECTION:
+ case BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT:
{
- struct bt_notification_iterator_private_connection *
- iter_priv_conn = (void *) iterator;
+ const struct bt_self_component_port_input_message_iterator *
+ port_in_iter = (const void *) iterator;
- if (iter_priv_conn->upstream_component) {
+ if (port_in_iter->upstream_component) {
SET_TMP_PREFIX("upstream-comp-");
format_component(buf_ch, false, tmp_prefix,
- iter_priv_conn->upstream_component);
+ port_in_iter->upstream_component);
}
- if (iter_priv_conn->upstream_port) {
+ if (port_in_iter->upstream_port) {
SET_TMP_PREFIX("upstream-port-");
format_port(buf_ch, false, tmp_prefix,
- iter_priv_conn->upstream_port);
+ port_in_iter->upstream_port);
}
- if (iter_priv_conn->connection) {
+ if (port_in_iter->connection) {
SET_TMP_PREFIX("upstream-conn-");
format_connection(buf_ch, false, tmp_prefix,
- iter_priv_conn->connection);
+ port_in_iter->connection);
}
break;
}
- case BT_NOTIFICATION_ITERATOR_TYPE_OUTPUT_PORT:
+ case BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT:
{
- struct bt_notification_iterator_output_port *iter_output_port =
- (void *) iterator;
-
- SET_TMP_PREFIX("graph-");
- format_graph(buf_ch, false, tmp_prefix,
- iter_output_port->graph);
- SET_TMP_PREFIX("colander-comp-");
- format_component(buf_ch, false, tmp_prefix,
- iter_output_port->colander);
- SET_TMP_PREFIX("output-port-");
- format_port(buf_ch, false, tmp_prefix,
- iter_output_port->output_port);
+ 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;
}
default:
}
static inline void format_plugin(char **buf_ch, bool extended,
- const char *prefix, struct bt_plugin *plugin)
+ const char *prefix, const struct bt_plugin *plugin)
{
char tmp_prefix[64];
if (plugin->info.path_set) {
BUF_APPEND(", %spath=\"%s\"",
- PRFIELD(plugin->info.path->str));
+ PRFIELD_GSTRING(plugin->info.path));
}
if (plugin->info.name_set) {
BUF_APPEND(", %sname=\"%s\"",
- PRFIELD(plugin->info.name->str));
+ PRFIELD_GSTRING(plugin->info.name));
}
if (!extended) {
if (plugin->info.author_set) {
BUF_APPEND(", %sauthor=\"%s\"",
- PRFIELD(plugin->info.author->str));
+ PRFIELD_GSTRING(plugin->info.author));
}
if (plugin->info.license_set) {
BUF_APPEND(", %slicense=\"%s\"",
- PRFIELD(plugin->info.license->str));
+ PRFIELD_GSTRING(plugin->info.license));
}
if (plugin->info.version_set) {
plugin->info.version.extra->str : "");
}
- BUF_APPEND(", %sis-frozen=%d, %scomp-class-count=%u",
- PRFIELD(plugin->frozen),
- PRFIELD(plugin->comp_classes->len));
+ BUF_APPEND(", %ssrc-comp-class-count=%u, %sflt-comp-class-count=%u, "
+ "%ssink-comp-class-count=%u",
+ PRFIELD(plugin->src_comp_classes->len),
+ PRFIELD(plugin->flt_comp_classes->len),
+ 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-");
}
}
-static inline void format_ctf_writer(char **buf_ch, bool extended,
- const char *prefix, struct bt_ctf_writer *writer)
-{
- /* TODO */
-}
-
static inline void handle_conversion_specifier_bt(void *priv_data,
char **buf_ch, size_t avail_size,
const char **out_fmt_ch, va_list *args)
bool extended = false;
char prefix[64];
char *prefix_ch = prefix;
- void *obj;
+ const void *obj;
/* skip "%!" */
fmt_ch += 2;
+ if (*fmt_ch == 'u') {
+ /* UUID */
+ obj = va_arg(*args, void *);
+ format_uuid(buf_ch, obj);
+ goto update_fmt;
+ }
+
if (*fmt_ch == '[') {
/* local prefix */
fmt_ch++;
}
switch (*fmt_ch) {
- case 'r':
- format_ref_count(buf_ch, extended, prefix, obj);
- break;
case 'F':
- format_field_type(buf_ch, extended, prefix, obj);
+ format_field_class(buf_ch, extended, prefix, obj);
break;
case 'f':
format_field(buf_ch, extended, prefix, obj);
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);
case 'x':
format_connection(buf_ch, extended, prefix, obj);
break;
- case 'u':
+ case 'l':
format_plugin(buf_ch, extended, prefix, obj);
break;
case 'g':
format_graph(buf_ch, extended, prefix, obj);
break;
- case 'w':
- format_ctf_writer(buf_ch, extended, prefix, obj);
+ case 'o':
+ format_object_pool(buf_ch, extended, prefix, obj);
+ break;
+ case 'O':
+ format_object(buf_ch, extended, prefix, obj);
break;
default:
abort();
*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, ...)
{
va_list args;
- assert(tag);
- assert(fmt);
+ 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);
projects / babeltrace.git / blobdiff