X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Flib-logging.c;h=56b41fc66fafe7e022fc62a865a0a40708cca810;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=d1ac59e6e349cf18e4554eab67559b9f669b7f4d;hpb=5c5632787fc9cafa602c89a28966bcfd01ec0204;p=babeltrace.git diff --git a/lib/lib-logging.c b/lib/lib-logging.c index d1ac59e6..56b41fc6 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -32,30 +32,20 @@ #include #include #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -64,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -93,24 +82,10 @@ static char __thread lib_logging_buf[LIB_LOGGING_BUF_SIZE]; } 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) @@ -120,8 +95,6 @@ static char __thread lib_logging_buf[LIB_LOGGING_BUF_SIZE]; strcat(tmp_prefix, (_prefix2)); \ } while (0) -typedef void (*format_func)(char **, bool, const char *, void *); - static inline void format_component(char **buf_ch, bool extended, const char *prefix, struct bt_component *component); @@ -131,10 +104,37 @@ static inline void format_port(char **buf_ch, bool extended, static inline void format_connection(char **buf_ch, bool extended, const char *prefix, struct bt_connection *connection); -static inline void format_ref_count(char **buf_ch, bool extended, +static inline void format_clock_value(char **buf_ch, bool extended, + const char *prefix, struct bt_clock_value *clock_value); + +static inline void format_field_path(char **buf_ch, bool extended, + const char *prefix, struct bt_field_path *field_path); + +static inline void format_object(char **buf_ch, bool extended, const char *prefix, 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_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]); } static inline void format_object_pool(char **buf_ch, bool extended, @@ -147,99 +147,133 @@ static inline void format_object_pool(char **buf_ch, bool extended, } } -static inline void format_field_type_common(char **buf_ch, bool extended, - const char *prefix, struct bt_field_type_common *field_type) +static inline void format_integer_field_type(char **buf_ch, + bool extended, const char *prefix, + struct bt_field_type *field_type) +{ + struct bt_field_type_integer *int_ft = (void *) field_type; + + BUF_APPEND(", %srange-size=%" PRIu64 ", %sbase=%s", + PRFIELD(int_ft->range), + PRFIELD(bt_common_field_type_integer_preferred_display_base_string(int_ft->base))); +} + +static inline void format_array_field_type(char **buf_ch, + bool extended, const char *prefix, + struct bt_field_type *field_type) +{ + struct bt_field_type_array *array_ft = (void *) field_type; + + BUF_APPEND(", %selement-ft-addr=%p, %selement-ft-id=%s", + PRFIELD(array_ft->element_ft), + PRFIELD(bt_common_field_type_id_string(array_ft->element_ft->id))); +} + +static inline void format_field_type(char **buf_ch, bool extended, + const char *prefix, struct bt_field_type *field_type) { - BUF_APPEND(", %stype-id=%s, %salignment=%u", - PRFIELD(bt_common_field_type_id_string(field_type->id)), - PRFIELD(field_type->alignment)); + char tmp_prefix[64]; + + BUF_APPEND(", %sid=%s", + PRFIELD(bt_common_field_type_id_string(field_type->id))); if (extended) { BUF_APPEND(", %sis-frozen=%d", PRFIELD(field_type->frozen)); + BUF_APPEND(", %sis-part-of-trace=%d", + PRFIELD(field_type->part_of_trace)); } else { return; } - if (field_type->id == BT_FIELD_TYPE_ID_UNKNOWN) { - return; - } - switch (field_type->id) { - case BT_FIELD_TYPE_ID_INTEGER: + case BT_FIELD_TYPE_ID_UNSIGNED_INTEGER: + case BT_FIELD_TYPE_ID_SIGNED_INTEGER: { - struct bt_field_type_common_integer *integer = - BT_FROM_COMMON(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_common_byte_order_string(integer->user_byte_order)), - PRFIELD(integer->base), - PRFIELD(bt_common_string_encoding_string(integer->encoding)), - PRFIELD(integer->mapped_clock_class)); - - if (integer->mapped_clock_class) { - BUF_APPEND(", %smapped-clock-class-name=\"%s\"", - PRFIELD(bt_clock_class_get_name(integer->mapped_clock_class))); - } + format_integer_field_type(buf_ch, extended, prefix, field_type); break; } - case BT_FIELD_TYPE_ID_FLOAT: + case BT_FIELD_TYPE_ID_REAL: { - struct bt_field_type_common_floating_point *flt = - BT_FROM_COMMON(field_type); + struct bt_field_type_real *real_ft = (void *) field_type; - BUF_APPEND(", %sexp-dig=%u, %smant-dig=%u, %sbyte-order=%s", - PRFIELD(flt->exp_dig), PRFIELD(flt->mant_dig), - PRFIELD(bt_common_byte_order_string(flt->user_byte_order))); + BUF_APPEND(", %sis-single-precision=%d", + PRFIELD(real_ft->is_single_precision)); break; } - case BT_FIELD_TYPE_ID_ENUM: + case BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION: + case BT_FIELD_TYPE_ID_SIGNED_ENUMERATION: { - struct bt_field_type_common_enumeration *enm = - BT_FROM_COMMON(field_type); + struct bt_field_type_enumeration *enum_ft = + (void *) field_type; + format_integer_field_type(buf_ch, extended, prefix, field_type); BUF_APPEND(", %smapping-count=%u", - PRFIELD(enm->entries->len)); + PRFIELD(enum_ft->mappings->len)); break; } - case BT_FIELD_TYPE_ID_STRING: + case BT_FIELD_TYPE_ID_STRUCTURE: { - struct bt_field_type_common_string *str = - BT_FROM_COMMON(field_type); + struct bt_field_type_structure *struct_ft = + (void *) field_type; + + if (struct_ft->common.named_fts) { + BUF_APPEND(", %smember-count=%u", + PRFIELD(struct_ft->common.named_fts->len)); + } - BUF_APPEND(", %sencoding=%s", - PRFIELD(bt_common_string_encoding_string(str->encoding))); break; } - case BT_FIELD_TYPE_ID_STRUCT: + case BT_FIELD_TYPE_ID_STATIC_ARRAY: { - struct bt_field_type_common_structure *structure = - BT_FROM_COMMON(field_type); + struct bt_field_type_static_array *array_ft = + (void *) field_type; - BUF_APPEND(", %sfield-count=%u", - PRFIELD(structure->fields->len)); + format_array_field_type(buf_ch, extended, prefix, field_type); + BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_ft->length)); break; } - case BT_FIELD_TYPE_ID_SEQUENCE: + case BT_FIELD_TYPE_ID_DYNAMIC_ARRAY: { - struct bt_field_type_common_sequence *seq = - BT_FROM_COMMON(field_type); + struct bt_field_type_dynamic_array *array_ft = + (void *) field_type; + + format_array_field_type(buf_ch, extended, prefix, field_type); + + if (array_ft->length_ft) { + SET_TMP_PREFIX("length-ft-"); + format_field_type(buf_ch, extended, tmp_prefix, + array_ft->length_ft); + } + + if (array_ft->length_field_path) { + SET_TMP_PREFIX("length-field-path-"); + format_field_path(buf_ch, extended, tmp_prefix, + array_ft->length_field_path); + } - BUF_APPEND(", %slength-ft-addr=\"%s\", %selem-ft-addr=%p", - PRFIELD(seq->length_field_name->str), - PRFIELD(seq->element_ft)); break; } case BT_FIELD_TYPE_ID_VARIANT: { - struct bt_field_type_common_variant *variant = - BT_FROM_COMMON(field_type); + struct bt_field_type_variant *var_ft = (void *) field_type; + + if (var_ft->common.named_fts) { + BUF_APPEND(", %soption-count=%u", + PRFIELD(var_ft->common.named_fts->len)); + } + + if (var_ft->selector_ft) { + SET_TMP_PREFIX("selector-ft-"); + format_field_type(buf_ch, extended, tmp_prefix, + var_ft->selector_ft); + } + + if (var_ft->selector_field_path) { + SET_TMP_PREFIX("selector-field-path-"); + format_field_path(buf_ch, extended, tmp_prefix, + var_ft->selector_field_path); + } - BUF_APPEND(", %stag-name=\"%s\", %sfield-count=%u", - PRFIELD(variant->tag_name->str), - PRFIELD(variant->choices->len)); break; } default: @@ -247,55 +281,41 @@ static inline void format_field_type_common(char **buf_ch, bool extended, } } -static inline void format_field_type(char **buf_ch, bool extended, - const char *prefix, struct bt_field_type *field_type) -{ - format_field_type_common(buf_ch, extended, prefix, - (void *) field_type); -} - -static inline void format_writer_field_type(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_field_type *field_type) -{ - format_field_type_common(buf_ch, extended, prefix, - (void *) field_type); -} - -static inline void format_field_common_integer_extended(char **buf_ch, - const char *prefix, struct bt_field_common *field) +static inline void format_field_integer_extended(char **buf_ch, + const char *prefix, struct bt_field *field) { - struct bt_field_common_integer *integer = BT_FROM_COMMON(field); - struct bt_field_type_common_integer *field_type = - BT_FROM_COMMON(field->type); + struct bt_field_integer *integer = (void *) field; + struct bt_field_type_integer *field_type = (void *) field->type; const char *fmt = NULL; BT_ASSERT(field_type); - if (field_type->base == 8) { + if (field_type->base == BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL) { fmt = ", %svalue=%" PRIo64; - } else if (field_type->base == 16) { + } else if (field_type->base == BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL) { fmt = ", %svalue=%" PRIx64; } - if (field_type->is_signed) { + if (field_type->common.id == BT_FIELD_TYPE_ID_SIGNED_INTEGER || + field_type->common.id == BT_FIELD_TYPE_ID_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_common(char **buf_ch, bool extended, - const char *prefix, struct bt_field_common *field) +static inline void format_field(char **buf_ch, bool extended, + const char *prefix, 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)); @@ -310,134 +330,58 @@ static inline void format_field_common(char **buf_ch, bool extended, BUF_APPEND(", %stype-id=%s", PRFIELD(bt_common_field_type_id_string(field->type->id))); - if (!extended || field->type->id == BT_FIELD_TYPE_ID_UNKNOWN || - !field->payload_set) { + if (!extended || !field->is_set) { return; } switch (field->type->id) { - case BT_FIELD_TYPE_ID_INTEGER: + case BT_FIELD_TYPE_ID_UNSIGNED_INTEGER: + case BT_FIELD_TYPE_ID_SIGNED_INTEGER: + case BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION: + case BT_FIELD_TYPE_ID_SIGNED_ENUMERATION: { - format_field_common_integer_extended(buf_ch, prefix, field); + format_field_integer_extended(buf_ch, prefix, field); break; } - case BT_FIELD_TYPE_ID_FLOAT: + case BT_FIELD_TYPE_ID_REAL: { - struct bt_field_common_floating_point *flt = - BT_FROM_COMMON(field); + struct bt_field_real *real_field = (void *) field; - BUF_APPEND(", %svalue=%f", PRFIELD(flt->payload)); + BUF_APPEND(", %svalue=%f", PRFIELD(real_field->value)); break; } case BT_FIELD_TYPE_ID_STRING: { - struct bt_field_common_string *str = - BT_FROM_COMMON(field); + struct bt_field_string *str = (void *) field; - if (str->payload) { - BT_ASSERT(str->payload); + if (str->buf) { + BT_ASSERT(str->buf->data); BUF_APPEND(", %spartial-value=\"%.32s\"", - PRFIELD(str->payload->str)); - + PRFIELD(str->buf->data)); } - break; - } - case BT_FIELD_TYPE_ID_SEQUENCE: - { - struct bt_field_common_sequence *seq = - BT_FROM_COMMON(field); - BUF_APPEND(", %slength=%" PRIu64, PRFIELD(seq->length)); - - if (seq->elements) { - BUF_APPEND(", %sallocated-length=%u", - PRFIELD(seq->elements->len)); - } break; } - case BT_FIELD_TYPE_ID_VARIANT: + case BT_FIELD_TYPE_ID_STATIC_ARRAY: + case BT_FIELD_TYPE_ID_DYNAMIC_ARRAY: { - struct bt_field_common_variant *variant = - BT_FROM_COMMON(field); - - BUF_APPEND(", %scur-field-addr=%p", - PRFIELD(variant->current_field)); - break; - } - default: - break; - } -} - -static inline void format_field(char **buf_ch, bool extended, - const char *prefix, struct bt_field *field) -{ - struct bt_field_common *common_field = (void *) field; + struct bt_field_array *array_field = (void *) field; - format_field_common(buf_ch, extended, prefix, (void *) field); + BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_field->length)); - if (!extended) { - return; - } - - if (!common_field->type) { - return; - } - - switch (common_field->type->id) { - case BT_FIELD_TYPE_ID_ENUM: - { - struct bt_field_common_integer *integer = (void *) field; - struct bt_field_type_common_enumeration *enum_ft = - BT_FROM_COMMON(common_field->type); - - if (enum_ft->container_ft) { - if (enum_ft->container_ft->is_signed) { - BUF_APPEND(", %svalue=%" PRId64, - PRFIELD(integer->payload.signd)); - } else { - BUF_APPEND(", %svalue=%" PRIu64, - PRFIELD(integer->payload.unsignd)); - } + if (array_field->fields) { + BUF_APPEND(", %sallocated-length=%u", + PRFIELD(array_field->fields->len)); } - break; - } - default: - break; - } -} - -static inline void format_writer_field(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_field *field) -{ - struct bt_field_common *common_field = (void *) field; - format_field_common(buf_ch, extended, prefix, (void *) field); - - if (!extended) { - return; - } - - if (!common_field->type) { - return; - } - - switch (common_field->type->id) { - case BT_FIELD_TYPE_ID_ENUM: - { - struct bt_ctf_field_enumeration *enumeration = (void *) field; - - if (enumeration->container) { - format_writer_field(buf_ch, extended, prefix, - (void *) enumeration->container); - } break; } case BT_FIELD_TYPE_ID_VARIANT: { - struct bt_ctf_field_variant *variant = (void *) field; + struct bt_field_variant *var_field = (void *) field; - BUF_APPEND(", %stag-field-addr=%p", PRFIELD(variant->tag)); + BUF_APPEND(", %sselected-field-index=%" PRIu64, + PRFIELD(var_field->selected_index)); break; } default: @@ -452,29 +396,34 @@ static inline void format_field_path(char **buf_ch, bool extended, if (field_path->indexes) { BT_ASSERT(field_path->indexes); - BUF_APPEND(", %sindex-count=%u", PRFIELD(field_path->indexes->len)); + BUF_APPEND(", %sindex-count=%u", + PRFIELD(field_path->indexes->len)); } if (!extended || !field_path->indexes) { return; } - BUF_APPEND(", %spath=[%s", PRFIELD(bt_common_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); + uint64_t index = bt_field_path_get_index_by_index_inline( + field_path, i); - BUF_APPEND(", %d", index); + BUF_APPEND(", %" PRIu64, index); } BUF_APPEND("%s", "]"); } -static inline void format_trace_common(char **buf_ch, bool extended, - const char *prefix, struct bt_trace_common *trace) +static inline void format_trace(char **buf_ch, bool extended, + const char *prefix, 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) { @@ -483,13 +432,8 @@ static inline void format_trace_common(char **buf_ch, bool extended, BUF_APPEND(", %sis-frozen=%d", PRFIELD(trace->frozen)); - if (trace->uuid_set) { - BUF_APPEND_UUID(trace->uuid); - } - - if (trace->clock_classes) { - BUF_APPEND(", %sclock-class-count=%u", - PRFIELD(trace->clock_classes->len)); + if (trace->uuid.value) { + BUF_APPEND_UUID(trace->uuid.value); } if (trace->stream_classes) { @@ -502,46 +446,27 @@ static inline void format_trace_common(char **buf_ch, bool extended, PRFIELD(trace->streams->len)); } - BUF_APPEND(", %spacket-header-ft-addr=%p", - PRFIELD(trace->packet_header_field_type)); -} - -static inline void format_trace(char **buf_ch, bool extended, - const char *prefix, struct bt_trace *trace) -{ - char tmp_prefix[64]; - - format_trace_common(buf_ch, extended, prefix, BT_TO_COMMON(trace)); - - if (!extended) { - return; - } - - BUF_APPEND(", %sis-static=%d", PRFIELD(trace->is_static)); + BUF_APPEND(", %spacket-header-ft-addr=%p, %sis-static=%d, " + "%sassigns-auto-sc-id=%d", + PRFIELD(trace->packet_header_ft), + 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); } -static inline void format_writer_trace(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_trace *trace) -{ - format_trace_common(buf_ch, extended, prefix, BT_TO_COMMON(trace)); -} - -static inline void format_stream_class_common(char **buf_ch, bool extended, - const char *prefix, struct bt_stream_class_common *stream_class, - format_func trace_format_func) +static inline void format_stream_class(char **buf_ch, bool extended, + const char *prefix, struct bt_stream_class *stream_class) { - struct bt_trace_common *trace; + struct bt_trace *trace; 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) { @@ -556,32 +481,29 @@ static inline void format_stream_class_common(char **buf_ch, bool extended, } BUF_APPEND(", %spacket-context-ft-addr=%p, " - "%sevent-header-ft-addr=%p, %sevent-context-ft-addr=%p", - PRFIELD(stream_class->packet_context_field_type), - PRFIELD(stream_class->event_header_field_type), - PRFIELD(stream_class->event_context_field_type)); - trace = bt_stream_class_common_borrow_trace(stream_class); + "%sevent-header-ft-addr=%p, %sevent-common-context-ft-addr=%p", + PRFIELD(stream_class->packet_context_ft), + PRFIELD(stream_class->event_header_ft), + PRFIELD(stream_class->event_common_context_ft)); + trace = bt_stream_class_borrow_trace_inline(stream_class); if (!trace) { 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", + 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-"); - trace_format_func(buf_ch, false, tmp_prefix, trace); -} - -static inline void format_stream_class(char **buf_ch, bool extended, - const char *prefix, struct bt_stream_class *stream_class) -{ - char tmp_prefix[64]; - - format_stream_class_common(buf_ch, extended, prefix, - BT_TO_COMMON(stream_class), (format_func) format_trace); - - if (!extended) { - return; - } - + 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); @@ -590,200 +512,103 @@ static inline void format_stream_class(char **buf_ch, bool extended, &stream_class->packet_context_field_pool); } -static inline void format_writer_stream_class(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_stream_class *stream_class) -{ - format_stream_class_common(buf_ch, extended, prefix, - BT_TO_COMMON(stream_class), (format_func) format_writer_trace); - - if (extended && 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( - BT_TO_COMMON(stream_class->clock->clock_class)))); - } -} - -static inline void format_event_class_common(char **buf_ch, bool extended, - const char *prefix, struct bt_event_class_common *event_class, - format_func format_stream_class_func, - format_func format_trace_func) +static inline void format_event_class(char **buf_ch, bool extended, + const char *prefix, struct bt_event_class *event_class) { - struct bt_stream_class_common *stream_class; - struct bt_trace_common *trace; + struct bt_stream_class *stream_class; + struct bt_trace *trace; 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_common_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_field_type), - PRFIELD(event_class->payload_field_type)); + BUF_APPEND(", %sspecific-context-ft-addr=%p, %spayload-ft-addr=%p", + PRFIELD(event_class->specific_context_ft), + PRFIELD(event_class->payload_ft)); - stream_class = bt_event_class_common_borrow_stream_class(event_class); + stream_class = bt_event_class_borrow_stream_class(event_class); if (!stream_class) { return; } BUF_APPEND(", %sstream-class-addr=%p", PRFIELD(stream_class)); SET_TMP_PREFIX("stream-class-"); - format_stream_class_func(buf_ch, false, tmp_prefix, stream_class); - trace = bt_stream_class_common_borrow_trace(stream_class); + format_stream_class(buf_ch, false, tmp_prefix, stream_class); + trace = bt_stream_class_borrow_trace_inline(stream_class); if (!trace) { return; } BUF_APPEND(", %strace-addr=%p", PRFIELD(trace)); SET_TMP_PREFIX("trace-"); - format_trace_func(buf_ch, false, tmp_prefix, trace); -} - -static inline void format_event_class(char **buf_ch, bool extended, - const char *prefix, struct bt_event_class *event_class) -{ - char tmp_prefix[64]; - - format_event_class_common(buf_ch, extended, prefix, - BT_TO_COMMON(event_class), (format_func) format_stream_class, - (format_func) format_trace); - - if (!extended) { - return; - } - + format_trace(buf_ch, false, tmp_prefix, trace); SET_TMP_PREFIX("event-pool-"); format_object_pool(buf_ch, extended, prefix, &event_class->event_pool); } -static inline void format_writer_event_class(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_event_class *event_class) -{ - format_event_class_common(buf_ch, extended, prefix, - BT_TO_COMMON(event_class), - (format_func) format_writer_stream_class, - (format_func) format_writer_trace); -} - -static inline void format_stream_common(char **buf_ch, bool extended, - const char *prefix, struct bt_stream_common *stream, - format_func format_stream_class_func, - format_func format_trace_func) +static inline void format_stream(char **buf_ch, bool extended, + const char *prefix, struct bt_stream *stream) { - struct bt_stream_class_common *stream_class; - struct bt_trace_common *trace; + struct bt_stream_class *stream_class; + struct bt_trace *trace; 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)); } if (!extended) { return; } - stream_class = bt_stream_common_borrow_class(stream); + stream_class = bt_stream_borrow_class(stream); if (!stream_class) { return; } BUF_APPEND(", %sstream-class-addr=%p", PRFIELD(stream_class)); SET_TMP_PREFIX("stream-class-"); - format_stream_class_func(buf_ch, false, tmp_prefix, stream_class); - trace = bt_stream_class_common_borrow_trace(stream_class); + format_stream_class(buf_ch, false, tmp_prefix, stream_class); + trace = bt_stream_class_borrow_trace_inline(stream_class); if (!trace) { return; } - trace = (void *) bt_object_borrow_parent(stream); + trace = (void *) bt_object_borrow_parent(&stream->base); if (!trace) { return; } BUF_APPEND(", %strace-addr=%p", PRFIELD(trace)); SET_TMP_PREFIX("trace-"); - format_trace_common(buf_ch, false, tmp_prefix, trace); -} - -static inline void format_stream(char **buf_ch, bool extended, - const char *prefix, struct bt_stream *stream) -{ - char tmp_prefix[64]; - - format_stream_common(buf_ch, extended, prefix, BT_TO_COMMON(stream), - (format_func) format_stream_class, - (format_func) format_trace); + format_trace(buf_ch, false, tmp_prefix, trace); SET_TMP_PREFIX("packet-pool-"); format_object_pool(buf_ch, extended, prefix, &stream->packet_pool); } -static inline void format_writer_stream(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_stream *stream) -{ - format_stream_common(buf_ch, extended, prefix, BT_TO_COMMON(stream), - (format_func) format_writer_stream_class, - (format_func) format_writer_trace); - - 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)); - - if (stream->events) { - BUF_APPEND(", %sevent-count=%u", PRFIELD(stream->events->len)); - } - - BUF_APPEND(", %sheader-field-addr=%p, %scontext-field-addr=%p" - ", %sfd=%d, %smmap-offset=%zu, " - "%smmap-base-offset=%zu, %spacket-size=%" PRIu64 ", " - "%soffset=%" PRId64 ", " - "%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->flushed_packet_count), - PRFIELD(stream->discarded_events), - PRFIELD(stream->size), PRFIELD(stream->last_ts_end)); -} - static inline void format_packet(char **buf_ch, bool extended, const char *prefix, struct bt_packet *packet) { @@ -798,17 +623,39 @@ static inline void format_packet(char **buf_ch, bool extended, BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, " "%scontext-field-addr=%p", PRFIELD(packet->frozen), - PRFIELD(packet->header ? packet->header->field : NULL), - PRFIELD(packet->context)); + PRFIELD(packet->header_field ? packet->header_field->field : NULL), + PRFIELD(packet->context_field ? packet->context_field->field : NULL)); stream = bt_packet_borrow_stream(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); + trace = (struct bt_trace *) bt_object_borrow_parent(&stream->base); if (!trace) { return; } @@ -818,14 +665,13 @@ static inline void format_packet(char **buf_ch, bool extended, format_trace(buf_ch, false, tmp_prefix, trace); } -static inline void format_event_common(char **buf_ch, bool extended, - const char *prefix, struct bt_event_common *event, - format_func format_event_class_func, - format_func format_stream_class_func, - format_func format_trace_func) +static inline void format_event(char **buf_ch, bool extended, + const char *prefix, struct bt_event *event) { - struct bt_trace_common *trace; - struct bt_stream_class_common *stream_class; + struct bt_packet *packet; + struct bt_stream *stream; + struct bt_trace *trace; + struct bt_stream_class *stream_class; char tmp_prefix[64]; if (!extended) { @@ -833,12 +679,14 @@ static inline void format_event_common(char **buf_ch, bool extended, } BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, " - "%sstream-context-field-addr=%p, " - "%scontext-field-addr=%p, %spayload-field-addr=%p, ", + "%scommon-context-field-addr=%p, " + "%specific-scontext-field-addr=%p, " + "%spayload-field-addr=%p, ", PRFIELD(event->frozen), - PRFIELD(event->header_field ? event->header_field->field : NULL), - PRFIELD(event->stream_event_context_field), - PRFIELD(event->context_field), + PRFIELD(event->header_field ? + event->header_field->field : NULL), + PRFIELD(event->common_context_field), + PRFIELD(event->specific_context_field), PRFIELD(event->payload_field)); BUF_APPEND(", %sevent-class-addr=%p", PRFIELD(event->class)); @@ -847,41 +695,26 @@ static inline void format_event_common(char **buf_ch, bool extended, } SET_TMP_PREFIX("event-class-"); - format_event_class_func(buf_ch, false, tmp_prefix, event->class); - stream_class = bt_event_class_common_borrow_stream_class(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_func(buf_ch, false, tmp_prefix, + format_stream_class(buf_ch, false, tmp_prefix, stream_class); - trace = bt_stream_class_common_borrow_trace(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_func(buf_ch, false, tmp_prefix, trace); + format_trace(buf_ch, false, tmp_prefix, trace); } } -} - -static inline void format_event(char **buf_ch, bool extended, - const char *prefix, struct bt_event *event) -{ - struct bt_packet *packet; - struct bt_stream *stream; - char tmp_prefix[64]; - - format_event_common(buf_ch, extended, prefix, BT_TO_COMMON(event), - (format_func) format_event_class, - (format_func) format_stream_class, (format_func) format_trace); - - if (!extended) { - return; - } - if (event->clock_values) { - BUF_APPEND(", %sclock-value-count=%u", - PRFIELD(g_hash_table_size(event->clock_values))); + 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); @@ -902,43 +735,39 @@ static inline void format_event(char **buf_ch, bool extended, format_stream(buf_ch, false, tmp_prefix, stream); } -static inline void format_writer_event(char **buf_ch, bool extended, - const char *prefix, struct bt_event *event) -{ - format_event_common(buf_ch, extended, prefix, BT_TO_COMMON(event), - (format_func) format_writer_event_class, - (format_func) format_writer_stream_class, - (format_func) format_writer_trace); -} - static inline void format_clock_class(char **buf_ch, bool extended, const char *prefix, struct bt_clock_class *clock_class) { char tmp_prefix[64]; - BUF_APPEND(", %sname=\"%s\", %sfreq=%" PRIu64, - PRFIELD(clock_class->name->str), - PRFIELD(clock_class->frequency)); + 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 ", %sis-absolute=%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->is_absolute), + PRFIELD(clock_class->base_offset.value_ns)); SET_TMP_PREFIX("cv-pool-"); format_object_pool(buf_ch, extended, prefix, &clock_class->cv_pool); @@ -948,16 +777,15 @@ static inline void format_clock_value(char **buf_ch, bool extended, const char *prefix, struct bt_clock_value *clock_value) { 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_value->value_cycles), + PRFIELD(clock_value->ns_from_origin)); if (!extended) { return; } - BUF_APPEND(", %sis-frozen=%d, %sis-set=%d", - PRFIELD(clock_value->frozen), PRFIELD(clock_value->is_set)); + BUF_APPEND(", %sis-set=%d", PRFIELD(clock_value->is_set)); BUF_APPEND(", %sclock-class-addr=%p", PRFIELD(clock_value->clock_class)); SET_TMP_PREFIX("clock-class-"); @@ -1050,28 +878,6 @@ static inline void format_notification(char **buf_ch, bool extended, SET_TMP_PREFIX("event-"); format_event(buf_ch, true, tmp_prefix, notif_event->event); - - if (!notif_event->cc_prio_map) { - return; - } - - 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: - { - struct bt_notification_inactivity *notif_inactivity = - (void *) notif; - - if (!notif_inactivity->cc_prio_map) { - return; - } - - 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: @@ -1110,28 +916,6 @@ static inline void format_notification(char **buf_ch, bool extended, format_packet(buf_ch, true, tmp_prefix, notif_packet->packet); break; } - case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS: - case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS: - { - struct bt_notification_discarded_elements *notif_discarded = - (void *) notif; - - BUF_APPEND(", %scount=%" PRId64, - PRFIELD(notif_discarded->count)); - - 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 (notif_discarded->end_clock_value) { - SET_TMP_PREFIX("end-clock-value-"); - format_clock_value(buf_ch, true, tmp_prefix, - notif_discarded->end_clock_value); - } - break; - } default: break; } @@ -1325,9 +1109,6 @@ static inline void format_notification_iterator(char **buf_ch, 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); break; } default: @@ -1391,47 +1172,6 @@ static inline void format_plugin(char **buf_ch, bool extended, } } -static inline void format_ctf_writer(char **buf_ch, bool extended, - const char *prefix, struct bt_ctf_writer *writer) -{ - /* TODO */ -} - -static inline void format_stream_class_common_common(char **buf_ch, - bool extended, const char *prefix, - struct bt_stream_class_common *stream_class) -{ - format_stream_class_common(buf_ch, extended, prefix, stream_class, - (format_func) format_trace_common); -} - -static inline void format_event_class_common_common(char **buf_ch, - bool extended, const char *prefix, - struct bt_event_class_common *event_class) -{ - format_event_class_common(buf_ch, extended, prefix, event_class, - (format_func) format_stream_class_common, - (format_func) format_trace_common); -} - -static inline void format_event_common_common(char **buf_ch, - bool extended, const char *prefix, - struct bt_event_common *event) -{ - format_event_common(buf_ch, extended, prefix, event, - (format_func) format_event_class_common, - (format_func) format_stream_class_common, - (format_func) format_trace_common); -} - -static inline void format_stream_common_common(char **buf_ch, bool extended, - const char *prefix, struct bt_stream_common *stream) -{ - format_stream_common(buf_ch, extended, prefix, stream, - (format_func) format_stream_class_common, - (format_func) format_trace_common); -} - 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) @@ -1441,15 +1181,17 @@ static inline void handle_conversion_specifier_bt(void *priv_data, char prefix[64]; char *prefix_ch = prefix; void *obj; - enum { - CAT_DEFAULT, - CAT_WRITER, - CAT_COMMON, - } cat = CAT_DEFAULT; /* 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++; @@ -1474,14 +1216,6 @@ static inline void handle_conversion_specifier_bt(void *priv_data, fmt_ch++; } - if (*fmt_ch == 'w') { - cat = CAT_WRITER; - fmt_ch++; - } else if (*fmt_ch == '_') { - cat = CAT_COMMON; - fmt_ch++; - } - obj = va_arg(*args, void *); BUF_APPEND("%saddr=%p", prefix, obj); @@ -1489,136 +1223,75 @@ static inline void handle_conversion_specifier_bt(void *priv_data, goto update_fmt; } - switch (cat) { - case CAT_DEFAULT: - switch (*fmt_ch) { - case 'r': - format_ref_count(buf_ch, extended, prefix, obj); - break; - case 'F': - format_field_type(buf_ch, extended, prefix, obj); - break; - case 'f': - format_field(buf_ch, extended, prefix, obj); - break; - case 'P': - format_field_path(buf_ch, extended, prefix, obj); - break; - case 'E': - format_event_class(buf_ch, extended, prefix, obj); - break; - case 'e': - format_event(buf_ch, extended, prefix, obj); - break; - case 'S': - format_stream_class(buf_ch, extended, prefix, obj); - break; - case 's': - format_stream(buf_ch, extended, prefix, obj); - break; - case 'a': - format_packet(buf_ch, extended, prefix, obj); - break; - case 't': - format_trace(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); - break; - case 'v': - format_value(buf_ch, extended, prefix, obj); - break; - case 'n': - format_notification(buf_ch, extended, prefix, obj); - break; - case 'i': - format_notification_iterator(buf_ch, extended, prefix, obj); - break; - case 'C': - format_component_class(buf_ch, extended, prefix, obj); - break; - case 'c': - format_component(buf_ch, extended, prefix, obj); - break; - case 'p': - format_port(buf_ch, extended, prefix, obj); - break; - case 'x': - format_connection(buf_ch, extended, prefix, obj); - break; - case 'u': - format_plugin(buf_ch, extended, prefix, obj); - break; - case 'g': - format_graph(buf_ch, extended, prefix, obj); - break; - case 'o': - format_object_pool(buf_ch, extended, prefix, obj); - break; - default: - abort(); - } + switch (*fmt_ch) { + case 'F': + format_field_type(buf_ch, extended, prefix, obj); break; - case CAT_WRITER: - switch (*fmt_ch) { - case 'F': - format_writer_field_type(buf_ch, extended, prefix, obj); - break; - case 'f': - format_writer_field(buf_ch, extended, prefix, obj); - break; - case 'E': - format_writer_event_class(buf_ch, extended, prefix, obj); - break; - case 'e': - format_writer_event(buf_ch, extended, prefix, obj); - break; - case 'S': - format_writer_stream_class(buf_ch, extended, prefix, obj); - break; - case 's': - format_writer_stream(buf_ch, extended, prefix, obj); - break; - case 't': - format_writer_trace(buf_ch, extended, prefix, obj); - break; - case 'w': - format_ctf_writer(buf_ch, extended, prefix, obj); - break; - default: - abort(); - } + case 'f': + format_field(buf_ch, extended, prefix, obj); break; - case CAT_COMMON: - switch (*fmt_ch) { - case 'F': - format_field_type_common(buf_ch, extended, prefix, obj); - break; - case 'f': - format_field_common(buf_ch, extended, prefix, obj); - break; - case 'E': - format_event_class_common_common(buf_ch, extended, prefix, obj); - break; - case 'e': - format_event_common_common(buf_ch, extended, prefix, obj); - break; - case 'S': - format_stream_class_common_common(buf_ch, extended, prefix, obj); - break; - case 's': - format_stream_common_common(buf_ch, extended, prefix, obj); - break; - case 't': - format_trace_common(buf_ch, extended, prefix, obj); - break; - default: - abort(); - } + case 'P': + format_field_path(buf_ch, extended, prefix, obj); + break; + case 'E': + format_event_class(buf_ch, extended, prefix, obj); + break; + case 'e': + format_event(buf_ch, extended, prefix, obj); + break; + case 'S': + format_stream_class(buf_ch, extended, prefix, obj); break; + case 's': + format_stream(buf_ch, extended, prefix, obj); + break; + case 'a': + format_packet(buf_ch, extended, prefix, obj); + break; + case 't': + format_trace(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); + break; + case 'v': + format_value(buf_ch, extended, prefix, obj); + break; + case 'n': + format_notification(buf_ch, extended, prefix, obj); + break; + case 'i': + format_notification_iterator(buf_ch, extended, prefix, obj); + break; + case 'C': + format_component_class(buf_ch, extended, prefix, obj); + break; + case 'c': + format_component(buf_ch, extended, prefix, obj); + break; + case 'p': + format_port(buf_ch, extended, prefix, obj); + break; + case 'x': + format_connection(buf_ch, extended, prefix, obj); + break; + case 'l': + format_plugin(buf_ch, extended, prefix, obj); + break; + case 'g': + format_graph(buf_ch, extended, prefix, obj); + break; + case 'o': + format_object_pool(buf_ch, extended, prefix, obj); + break; + case 'O': + format_object(buf_ch, extended, prefix, obj); + break; + default: + abort(); } update_fmt: