X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Flib-logging.c;h=4b5557aa02cc1b7d41d67e0a6b966bf7a0c8bb03;hb=b9fd9cbba60297c02bea7473d4347c588d9724d7;hp=a72cdd98e1d9ac4e5ea4a741814ed7c799933324;hpb=862ca4ed7b3a8ef14f69529d252bccc48a33108a;p=babeltrace.git diff --git a/lib/lib-logging.c b/lib/lib-logging.c index a72cdd98..4b5557aa 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -30,13 +30,15 @@ #include #include #include +#include +#include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -48,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -59,12 +61,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -111,8 +115,8 @@ static inline void format_port(char **buf_ch, bool extended, static inline void format_connection(char **buf_ch, bool extended, const char *prefix, const struct bt_connection *connection); -static inline void format_clock_value(char **buf_ch, bool extended, - const char *prefix, const struct bt_clock_value *clock_value); +static inline void format_clock_snapshot(char **buf_ch, bool extended, + const char *prefix, const struct bt_clock_snapshot *clock_snapshot); static inline void format_field_path(char **buf_ch, bool extended, const char *prefix, const struct bt_field_path *field_path); @@ -431,8 +435,6 @@ static inline void format_field_path(char **buf_ch, bool extended, static inline void format_trace_class(char **buf_ch, bool extended, const char *prefix, const struct bt_trace_class *trace_class) { - char tmp_prefix[64]; - if (trace_class->name.value) { BUF_APPEND(", %sname=\"%s\"", PRFIELD(trace_class->name.value)); @@ -453,13 +455,8 @@ static inline void format_trace_class(char **buf_ch, bool extended, PRFIELD(trace_class->stream_classes->len)); } - BUF_APPEND(", %spacket-header-fc-addr=%p, " - "%sassigns-auto-sc-id=%d", - PRFIELD(trace_class->packet_header_fc), + BUF_APPEND(", %sassigns-auto-sc-id=%d", PRFIELD(trace_class->assigns_automatic_stream_class_id)); - SET_TMP_PREFIX("phf-pool-"); - format_object_pool(buf_ch, extended, prefix, - &trace_class->packet_header_field_pool); } static inline void format_trace(char **buf_ch, bool extended, @@ -519,34 +516,22 @@ static inline void format_stream_class(char **buf_ch, bool extended, } BUF_APPEND(", %spacket-context-fc-addr=%p, " - "%sevent-header-fc-addr=%p, %sevent-common-context-fc-addr=%p", + "%sevent-common-context-fc-addr=%p", PRFIELD(stream_class->packet_context_fc), - PRFIELD(stream_class->event_header_fc), PRFIELD(stream_class->event_common_context_fc)); trace_class = bt_stream_class_borrow_trace_class_inline(stream_class); if (!trace_class) { return; } - BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, " - "%spackets-have-discarded-ev-counter-snapshot=%d, " - "%spackets-have-packet-counter-snapshot=%d, " - "%spackets-have-default-begin-cv=%d, " - "%spackets-have-default-end-cv=%d", + BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d", PRFIELD(stream_class->assigns_automatic_event_class_id), - PRFIELD(stream_class->assigns_automatic_stream_id), - PRFIELD(stream_class->packets_have_discarded_event_counter_snapshot), - PRFIELD(stream_class->packets_have_packet_counter_snapshot), - PRFIELD(stream_class->packets_have_default_beginning_cv), - PRFIELD(stream_class->packets_have_default_end_cv)); + 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("ehf-pool-"); - format_object_pool(buf_ch, extended, prefix, - &stream_class->event_header_field_pool); SET_TMP_PREFIX("pcf-pool-"); - format_object_pool(buf_ch, extended, prefix, + format_object_pool(buf_ch, extended, tmp_prefix, &stream_class->packet_context_field_pool); } @@ -602,7 +587,8 @@ static inline void format_event_class(char **buf_ch, bool extended, SET_TMP_PREFIX("trace-class-"); format_trace_class(buf_ch, false, tmp_prefix, trace_class); SET_TMP_PREFIX("event-pool-"); - format_object_pool(buf_ch, extended, prefix, &event_class->event_pool); + format_object_pool(buf_ch, extended, tmp_prefix, + &event_class->event_pool); } static inline void format_stream(char **buf_ch, bool extended, @@ -645,7 +631,7 @@ static inline void format_stream(char **buf_ch, bool extended, } SET_TMP_PREFIX("packet-pool-"); - format_object_pool(buf_ch, extended, prefix, &stream->packet_pool); + format_object_pool(buf_ch, extended, tmp_prefix, &stream->packet_pool); } static inline void format_packet(char **buf_ch, bool extended, @@ -659,38 +645,14 @@ static inline void format_packet(char **buf_ch, bool extended, return; } - BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, " - "%scontext-field-addr=%p", + BUF_APPEND(", %sis-frozen=%d, %scontext-field-addr=%p", PRFIELD(packet->frozen), - PRFIELD(packet->header_field ? packet->header_field->field : NULL), PRFIELD(packet->context_field ? packet->context_field->field : NULL)); stream = bt_packet_borrow_stream_const(packet); if (!stream) { return; } - if (packet->default_beginning_cv) { - SET_TMP_PREFIX("default-begin-cv-"); - format_clock_value(buf_ch, true, tmp_prefix, - packet->default_beginning_cv); - } - - if (packet->default_end_cv) { - SET_TMP_PREFIX("default-end-cv-"); - format_clock_value(buf_ch, true, tmp_prefix, - packet->default_end_cv); - } - - if (packet->discarded_event_counter_snapshot.base.avail) { - BUF_APPEND(", %sdiscarded-ev-counter-snapshot=%" PRIu64, - PRFIELD(packet->discarded_event_counter_snapshot.value)); - } - - if (packet->packet_counter_snapshot.base.avail) { - BUF_APPEND(", %spacket-counter-snapshot=%" PRIu64, - PRFIELD(packet->packet_counter_snapshot.value)); - } - BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream)); SET_TMP_PREFIX("stream-"); format_stream(buf_ch, false, tmp_prefix, stream); @@ -717,13 +679,11 @@ static inline void format_event(char **buf_ch, bool extended, return; } - BUF_APPEND(", %sis-frozen=%d, %sheader-field-addr=%p, " + BUF_APPEND(", %sis-frozen=%d, " "%scommon-context-field-addr=%p, " "%sspecific-context-field-addr=%p, " "%spayload-field-addr=%p, ", PRFIELD(event->frozen), - PRFIELD(event->header_field ? - event->header_field->field : NULL), PRFIELD(event->common_context_field), PRFIELD(event->specific_context_field), PRFIELD(event->payload_field)); @@ -753,12 +713,6 @@ static inline void format_event(char **buf_ch, bool extended, } } - 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_const(event); if (!packet) { return; @@ -803,38 +757,39 @@ static inline void format_clock_class(char **buf_ch, bool extended, BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", " "%soffset-s=%" PRId64 ", " - "%soffset-cycles=%" PRIu64 ", %sis-absolute=%d, " + "%soffset-cycles=%" PRIu64 ", %sorigin-is-unix-epoch=%d, " "%sbase-offset-ns=%" PRId64, PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision), PRFIELD(clock_class->offset_seconds), PRFIELD(clock_class->offset_cycles), - PRFIELD(clock_class->is_absolute), + PRFIELD(clock_class->origin_is_unix_epoch), PRFIELD(clock_class->base_offset.value_ns)); - SET_TMP_PREFIX("cv-pool-"); - format_object_pool(buf_ch, extended, prefix, &clock_class->cv_pool); + SET_TMP_PREFIX("cs-pool-"); + format_object_pool(buf_ch, extended, tmp_prefix, + &clock_class->cs_pool); } -static inline void format_clock_value(char **buf_ch, bool extended, - const char *prefix, const struct bt_clock_value *clock_value) +static inline void format_clock_snapshot(char **buf_ch, bool extended, + const char *prefix, const struct bt_clock_snapshot *clock_snapshot) { char tmp_prefix[64]; BUF_APPEND(", %svalue=%" PRIu64 ", %sns-from-origin=%" PRId64, - PRFIELD(clock_value->value_cycles), - PRFIELD(clock_value->ns_from_origin)); + PRFIELD(clock_snapshot->value_cycles), + PRFIELD(clock_snapshot->ns_from_origin)); if (!extended) { return; } - BUF_APPEND(", %sis-set=%d", PRFIELD(clock_value->is_set)); + BUF_APPEND(", %sis-set=%d", PRFIELD(clock_snapshot->is_set)); - if (clock_value->clock_class) { + if (clock_snapshot->clock_class) { BUF_APPEND(", %sclock-class-addr=%p", - PRFIELD(clock_value->clock_class)); + PRFIELD(clock_snapshot->clock_class)); SET_TMP_PREFIX("clock-class-"); format_clock_class(buf_ch, false, tmp_prefix, - clock_value->clock_class); + clock_snapshot->clock_class); } } @@ -898,78 +853,124 @@ static inline void format_value(char **buf_ch, bool extended, } } -static inline void format_notification(char **buf_ch, bool extended, - const char *prefix, const struct bt_notification *notif) +static inline void format_message(char **buf_ch, bool extended, + const char *prefix, const struct bt_message *msg) { char tmp_prefix[64]; BUF_APPEND(", %stype=%s", - PRFIELD(bt_notification_type_string(notif->type))); + PRFIELD(bt_message_type_string(msg->type))); if (!extended) { return; } BUF_APPEND(", %sis-frozen=%d, %sgraph-addr=%p", - PRFIELD(notif->frozen), PRFIELD(notif->graph)); + PRFIELD(msg->frozen), PRFIELD(msg->graph)); - switch (notif->type) { - case BT_NOTIFICATION_TYPE_EVENT: + switch (msg->type) { + case BT_MESSAGE_TYPE_EVENT: { - const struct bt_notification_event *notif_event = - (const void *) notif; + const struct bt_message_event *msg_event = + (const void *) msg; - if (notif_event->event) { + if (msg_event->event) { SET_TMP_PREFIX("event-"); - format_event(buf_ch, true, tmp_prefix, notif_event->event); + format_event(buf_ch, true, tmp_prefix, + msg_event->event); + } + + if (msg_event->default_cs) { + SET_TMP_PREFIX("default-cs-"); + format_clock_snapshot(buf_ch, true, tmp_prefix, + msg_event->default_cs); } break; } - case BT_NOTIFICATION_TYPE_STREAM_BEGIN: + case BT_MESSAGE_TYPE_STREAM_BEGINNING: + case BT_MESSAGE_TYPE_STREAM_END: { - const struct bt_notification_stream_begin *notif_stream = - (const void *) notif; + const struct bt_message_stream *msg_stream = (const void *) msg; - if (notif_stream->stream) { + if (msg_stream->stream) { SET_TMP_PREFIX("stream-"); - format_stream(buf_ch, true, tmp_prefix, notif_stream->stream); + format_stream(buf_ch, true, tmp_prefix, + msg_stream->stream); } break; } - case BT_NOTIFICATION_TYPE_STREAM_END: + case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING: + case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END: { - const struct bt_notification_stream_end *notif_stream = - (const void *) notif; + const struct bt_message_stream_activity *msg_stream_activity = + (const void *) msg; - if (notif_stream->stream) { + if (msg_stream_activity->stream) { SET_TMP_PREFIX("stream-"); - format_stream(buf_ch, true, tmp_prefix, notif_stream->stream); + format_stream(buf_ch, true, tmp_prefix, + msg_stream_activity->stream); + } + + BUF_APPEND(", %sdefault-cs-state=%s", + PRFIELD(bt_message_stream_activity_clock_snapshot_state_string( + msg_stream_activity->default_cs_state))); + + if (msg_stream_activity->default_cs) { + SET_TMP_PREFIX("default-cs-"); + format_clock_snapshot(buf_ch, true, tmp_prefix, + msg_stream_activity->default_cs); } break; } - case BT_NOTIFICATION_TYPE_PACKET_BEGIN: + case BT_MESSAGE_TYPE_PACKET_BEGINNING: + case BT_MESSAGE_TYPE_PACKET_END: { - const struct bt_notification_packet_begin *notif_packet = - (const void *) notif; + const struct bt_message_packet *msg_packet = (const void *) msg; - if (notif_packet->packet) { + if (msg_packet->packet) { SET_TMP_PREFIX("packet-"); - format_packet(buf_ch, true, tmp_prefix, notif_packet->packet); + format_packet(buf_ch, true, tmp_prefix, + msg_packet->packet); + } + + if (msg_packet->default_cs) { + SET_TMP_PREFIX("default-cs-"); + format_clock_snapshot(buf_ch, true, tmp_prefix, + msg_packet->default_cs); } break; } - case BT_NOTIFICATION_TYPE_PACKET_END: + case BT_MESSAGE_TYPE_DISCARDED_EVENTS: + case BT_MESSAGE_TYPE_DISCARDED_PACKETS: { - const struct bt_notification_packet_end *notif_packet = - (const void *) notif; + const struct bt_message_discarded_items *msg_disc_items = + (const void *) msg; - if (notif_packet->packet) { - SET_TMP_PREFIX("packet-"); - format_packet(buf_ch, true, tmp_prefix, notif_packet->packet); + if (msg_disc_items->stream) { + SET_TMP_PREFIX("stream-"); + format_stream(buf_ch, true, tmp_prefix, + msg_disc_items->stream); + } + + if (msg_disc_items->default_begin_cs) { + SET_TMP_PREFIX("default-begin-cs-"); + format_clock_snapshot(buf_ch, true, tmp_prefix, + msg_disc_items->default_begin_cs); + } + + if (msg_disc_items->default_end_cs) { + SET_TMP_PREFIX("default-end-cs-"); + format_clock_snapshot(buf_ch, true, tmp_prefix, + msg_disc_items->default_end_cs); + } + + if (msg_disc_items->count.base.avail) { + BUF_APPEND(", %scount=%" PRIu64, + PRFIELD(msg_disc_items->count.value)); } break; @@ -1093,7 +1094,11 @@ static inline void format_graph(char **buf_ch, bool extended, { char tmp_prefix[64]; - BUF_APPEND(", %sis-canceled=%d", PRFIELD(graph->canceled)); + BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, " + "%sconfig-state=%s", + PRFIELD(graph->canceled), + PRFIELD(graph->can_consume), + PRFIELD(bt_graph_configuration_state_string(graph->config_state))); if (!extended) { return; @@ -1110,27 +1115,27 @@ static inline void format_graph(char **buf_ch, bool extended, } SET_TMP_PREFIX("en-pool-"); - format_object_pool(buf_ch, extended, prefix, - &graph->event_notif_pool); + format_object_pool(buf_ch, extended, tmp_prefix, + &graph->event_msg_pool); SET_TMP_PREFIX("pbn-pool-"); - format_object_pool(buf_ch, extended, prefix, - &graph->packet_begin_notif_pool); + format_object_pool(buf_ch, extended, tmp_prefix, + &graph->packet_begin_msg_pool); SET_TMP_PREFIX("pen-pool-"); - format_object_pool(buf_ch, extended, prefix, - &graph->packet_end_notif_pool); + format_object_pool(buf_ch, extended, tmp_prefix, + &graph->packet_end_msg_pool); } -static inline void format_notification_iterator(char **buf_ch, +static inline void format_message_iterator(char **buf_ch, bool extended, const char *prefix, - const struct bt_notification_iterator *iterator) + const struct bt_message_iterator *iterator) { const char *type; char tmp_prefix[64]; - if (iterator->type == BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT) { - type = "BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT"; - } else if (iterator->type == BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT) { - type = "BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT"; + if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT) { + type = "BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT"; + } else if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT) { + type = "BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT"; } else { type = "(unknown)"; } @@ -1138,9 +1143,9 @@ static inline void format_notification_iterator(char **buf_ch, BUF_APPEND(", %stype=%s", PRFIELD(type)); switch (iterator->type) { - case BT_NOTIFICATION_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT: + case BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT: { - const struct bt_self_component_port_input_notification_iterator * + const struct bt_self_component_port_input_message_iterator * port_in_iter = (const void *) iterator; if (port_in_iter->upstream_component) { @@ -1162,9 +1167,9 @@ static inline void format_notification_iterator(char **buf_ch, } break; } - case BT_NOTIFICATION_ITERATOR_TYPE_PORT_OUTPUT: + case BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT: { - const struct bt_port_output_notification_iterator *port_out_iter = + const struct bt_port_output_message_iterator *port_out_iter = (const void *) iterator; if (port_out_iter->graph) { @@ -1330,16 +1335,16 @@ static inline void handle_conversion_specifier_bt(void *priv_data, 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);