X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmsg-iter%2Fmsg-iter.c;h=f941970db67c3fdbc92866c8889d4a78979efdc5;hb=977d6cc05226fb841d687e64fc4f101bac3c512e;hp=12fc7885c75d0f6abb1ad1aecc41245ea0631388;hpb=02b61fe03bc4519c74169f997c93a80b16039272;p=babeltrace.git diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index 12fc7885..f941970d 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -26,7 +26,7 @@ #define BT_COMP_LOG_SELF_COMP (notit->self_comp) #define BT_LOG_OUTPUT_LEVEL (notit->log_level) #define BT_LOG_TAG "PLUGIN/CTF/MSG-ITER" -#include "plugins/comp-logging.h" +#include "logging/comp-logging.h" #include #include @@ -80,6 +80,7 @@ struct stack { /* State */ enum state { STATE_INIT, + STATE_SWITCH_PACKET, STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN, STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE, STATE_AFTER_TRACE_PACKET_HEADER, @@ -103,10 +104,12 @@ enum state { STATE_DSCOPE_EVENT_PAYLOAD_BEGIN, STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE, STATE_EMIT_MSG_EVENT, + STATE_EMIT_QUEUED_MSG_EVENT, STATE_SKIP_PACKET_PADDING, STATE_EMIT_MSG_PACKET_END_MULTI, STATE_EMIT_MSG_PACKET_END_SINGLE, STATE_CHECK_EMIT_MSG_STREAM_END, + STATE_EMIT_QUEUED_MSG_PACKET_END, STATE_EMIT_MSG_STREAM_END, STATE_DONE, }; @@ -132,6 +135,12 @@ struct bt_msg_iter { /* True to emit a stream end message. */ bool emit_stream_end_msg; + /* + * True if library objects are unavailable during the decoding and + * should not be created/used. + */ + bool dry_run; + /* True to set the stream */ bool set_stream; @@ -174,6 +183,12 @@ struct bt_msg_iter { /* Current event message (NULL if not created yet) */ bt_message *event_msg; + /* + * True if we need to emit a packet beginning message before we emit + * the next event message or the packet end message. + */ + bool emit_delayed_packet_beginning_msg; + /* Database of current dynamic scopes */ struct { bt_field *stream_packet_context; @@ -258,65 +273,68 @@ const char *state_string(enum state state) { switch (state) { case STATE_INIT: - return "STATE_INIT"; + return "INIT"; + case STATE_SWITCH_PACKET: + return "SWITCH_PACKET"; case STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN: - return "STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN"; + return "DSCOPE_TRACE_PACKET_HEADER_BEGIN"; case STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE: - return "STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE"; + return "DSCOPE_TRACE_PACKET_HEADER_CONTINUE"; case STATE_AFTER_TRACE_PACKET_HEADER: - return "STATE_AFTER_TRACE_PACKET_HEADER"; + return "AFTER_TRACE_PACKET_HEADER"; case STATE_DSCOPE_STREAM_PACKET_CONTEXT_BEGIN: - return "STATE_DSCOPE_STREAM_PACKET_CONTEXT_BEGIN"; + return "DSCOPE_STREAM_PACKET_CONTEXT_BEGIN"; case STATE_DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE: - return "STATE_DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE"; + return "DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE"; case STATE_AFTER_STREAM_PACKET_CONTEXT: - return "STATE_AFTER_STREAM_PACKET_CONTEXT"; + return "AFTER_STREAM_PACKET_CONTEXT"; case STATE_EMIT_MSG_STREAM_BEGINNING: - return "STATE_EMIT_MSG_STREAM_BEGINNING"; + return "EMIT_MSG_STREAM_BEGINNING"; case STATE_EMIT_MSG_PACKET_BEGINNING: - return "STATE_EMIT_MSG_PACKET_BEGINNING"; + return "EMIT_MSG_PACKET_BEGINNING"; case STATE_EMIT_MSG_DISCARDED_EVENTS: - return "STATE_EMIT_MSG_DISCARDED_EVENTS"; + return "EMIT_MSG_DISCARDED_EVENTS"; case STATE_EMIT_MSG_DISCARDED_PACKETS: - return "STATE_EMIT_MSG_DISCARDED_PACKETS"; + return "EMIT_MSG_DISCARDED_PACKETS"; case STATE_DSCOPE_EVENT_HEADER_BEGIN: - return "STATE_DSCOPE_EVENT_HEADER_BEGIN"; + return "DSCOPE_EVENT_HEADER_BEGIN"; case STATE_DSCOPE_EVENT_HEADER_CONTINUE: - return "STATE_DSCOPE_EVENT_HEADER_CONTINUE"; + return "DSCOPE_EVENT_HEADER_CONTINUE"; case STATE_AFTER_EVENT_HEADER: - return "STATE_AFTER_EVENT_HEADER"; + return "AFTER_EVENT_HEADER"; case STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN: - return "STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN"; + return "DSCOPE_EVENT_COMMON_CONTEXT_BEGIN"; case STATE_DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE: - return "STATE_DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE"; + return "DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE"; case STATE_DSCOPE_EVENT_SPEC_CONTEXT_BEGIN: - return "STATE_DSCOPE_EVENT_SPEC_CONTEXT_BEGIN"; + return "DSCOPE_EVENT_SPEC_CONTEXT_BEGIN"; case STATE_DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE: - return "STATE_DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE"; + return "DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE"; case STATE_DSCOPE_EVENT_PAYLOAD_BEGIN: - return "STATE_DSCOPE_EVENT_PAYLOAD_BEGIN"; + return "DSCOPE_EVENT_PAYLOAD_BEGIN"; case STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE: - return "STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE"; + return "DSCOPE_EVENT_PAYLOAD_CONTINUE"; case STATE_EMIT_MSG_EVENT: - return "STATE_EMIT_MSG_EVENT"; + return "EMIT_MSG_EVENT"; + case STATE_EMIT_QUEUED_MSG_EVENT: + return "EMIT_QUEUED_MSG_EVENT"; case STATE_SKIP_PACKET_PADDING: - return "STATE_SKIP_PACKET_PADDING"; + return "SKIP_PACKET_PADDING"; case STATE_EMIT_MSG_PACKET_END_MULTI: - return "STATE_EMIT_MSG_PACKET_END_MULTI"; + return "EMIT_MSG_PACKET_END_MULTI"; case STATE_EMIT_MSG_PACKET_END_SINGLE: - return "STATE_EMIT_MSG_PACKET_END_SINGLE"; + return "EMIT_MSG_PACKET_END_SINGLE"; + case STATE_EMIT_QUEUED_MSG_PACKET_END: + return "EMIT_QUEUED_MSG_PACKET_END"; case STATE_EMIT_MSG_STREAM_END: - return "STATE_EMIT_MSG_STREAM_END"; + return "EMIT_MSG_STREAM_END"; case STATE_DONE: - return "STATE_DONE"; + return "DONE"; default: return "(unknown)"; } } -static -int bt_msg_iter_switch_packet(struct bt_msg_iter *notit); - static struct stack *stack_new(struct bt_msg_iter *notit) { @@ -351,7 +369,7 @@ void stack_destroy(struct stack *stack) { struct bt_msg_iter *notit; - BT_ASSERT(stack); + BT_ASSERT_DBG(stack); notit = stack->notit; BT_COMP_LOGD("Destroying stack: addr=%p", stack); @@ -368,9 +386,9 @@ void stack_push(struct stack *stack, bt_field *base) struct stack_entry *entry; struct bt_msg_iter *notit; - BT_ASSERT(stack); + BT_ASSERT_DBG(stack); notit = stack->notit; - BT_ASSERT(base); + BT_ASSERT_DBG(base); BT_COMP_LOGT("Pushing base field on stack: stack-addr=%p, " "stack-size-before=%zu, stack-size-after=%zu", stack, stack->size, stack->size + 1); @@ -388,7 +406,7 @@ void stack_push(struct stack *stack, bt_field *base) static inline unsigned int stack_size(struct stack *stack) { - BT_ASSERT(stack); + BT_ASSERT_DBG(stack); return stack->size; } @@ -397,8 +415,8 @@ void stack_pop(struct stack *stack) { struct bt_msg_iter *notit; - BT_ASSERT(stack); - BT_ASSERT(stack_size(stack)); + BT_ASSERT_DBG(stack); + BT_ASSERT_DBG(stack_size(stack)); notit = stack->notit; BT_COMP_LOGT("Popping from stack: " "stack-addr=%p, stack-size-before=%zu, stack-size-after=%zu", @@ -409,8 +427,8 @@ void stack_pop(struct stack *stack) static inline struct stack_entry *stack_top(struct stack *stack) { - BT_ASSERT(stack); - BT_ASSERT(stack_size(stack)); + BT_ASSERT_DBG(stack); + BT_ASSERT_DBG(stack_size(stack)); return &g_array_index(stack->entries, struct stack_entry, stack->size - 1); } @@ -424,7 +442,7 @@ bool stack_empty(struct stack *stack) static void stack_clear(struct stack *stack) { - BT_ASSERT(stack); + BT_ASSERT_DBG(stack); stack->size = 0; } @@ -677,30 +695,89 @@ void release_all_dscopes(struct bt_msg_iter *notit) release_event_dscopes(notit); } +static +enum bt_msg_iter_status switch_packet_state(struct bt_msg_iter *notit) +{ + enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; + + /* + * We don't put the stream class here because we need to make + * sure that all the packets processed by the same message + * iterator refer to the same stream class (the first one). + */ + BT_ASSERT(notit); + + if (notit->cur_exp_packet_total_size != -1) { + notit->cur_packet_offset += notit->cur_exp_packet_total_size; + } + + BT_COMP_LOGD("Switching packet: notit-addr=%p, cur=%zu, " + "packet-offset=%" PRId64, notit, notit->buf.at, + notit->cur_packet_offset); + stack_clear(notit->stack); + notit->meta.ec = NULL; + BT_PACKET_PUT_REF_AND_RESET(notit->packet); + BT_MESSAGE_PUT_REF_AND_RESET(notit->event_msg); + release_all_dscopes(notit); + notit->cur_dscope_field = NULL; + + /* + * Adjust current buffer so that addr points to the beginning of the new + * packet. + */ + if (notit->buf.addr) { + size_t consumed_bytes = (size_t) (notit->buf.at / CHAR_BIT); + + /* Packets are assumed to start on a byte frontier. */ + if (notit->buf.at % CHAR_BIT) { + BT_COMP_LOGW("Cannot switch packet: current position is not a multiple of 8: " + "notit-addr=%p, cur=%zu", notit, notit->buf.at); + status = BT_MSG_ITER_STATUS_ERROR; + goto end; + } + + notit->buf.addr += consumed_bytes; + notit->buf.sz -= consumed_bytes; + notit->buf.at = 0; + notit->buf.packet_offset = 0; + BT_COMP_LOGD("Adjusted buffer: addr=%p, size=%zu", + notit->buf.addr, notit->buf.sz); + } + + notit->cur_exp_packet_content_size = -1; + notit->cur_exp_packet_total_size = -1; + notit->cur_stream_class_id = -1; + notit->cur_event_class_id = -1; + notit->cur_data_stream_id = -1; + notit->prev_packet_snapshots = notit->snapshots; + notit->snapshots.discarded_events = UINT64_C(-1); + notit->snapshots.packets = UINT64_C(-1); + notit->snapshots.beginning_clock = UINT64_C(-1); + notit->snapshots.end_clock = UINT64_C(-1); + notit->state = STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN; + +end: + return status; +} + static enum bt_msg_iter_status read_packet_header_begin_state( struct bt_msg_iter *notit) { struct ctf_field_class *packet_header_fc = NULL; - enum bt_msg_iter_status ret = BT_MSG_ITER_STATUS_OK; - - if (bt_msg_iter_switch_packet(notit)) { - BT_COMP_LOGW("Cannot switch packet: notit-addr=%p", notit); - ret = BT_MSG_ITER_STATUS_ERROR; - goto end; - } + enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; /* * Make sure at least one bit is available for this packet. An * empty packet is impossible. If we reach the end of the medium * at this point, then it's considered the end of the stream. */ - ret = buf_ensure_available_bits(notit); - switch (ret) { + status = buf_ensure_available_bits(notit); + switch (status) { case BT_MSG_ITER_STATUS_OK: break; case BT_MSG_ITER_STATUS_EOF: - ret = BT_MSG_ITER_STATUS_OK; + status = BT_MSG_ITER_STATUS_OK; notit->state = STATE_CHECK_EMIT_MSG_STREAM_END; goto end; default: @@ -720,10 +797,10 @@ enum bt_msg_iter_status read_packet_header_begin_state( BT_COMP_LOGD("Decoding packet header field:" "notit-addr=%p, trace-class-addr=%p, fc-addr=%p", notit, notit->meta.tc, packet_header_fc); - ret = read_dscope_begin_state(notit, packet_header_fc, + status = read_dscope_begin_state(notit, packet_header_fc, STATE_AFTER_TRACE_PACKET_HEADER, STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE, NULL); - if (ret < 0) { + if (status < 0) { BT_COMP_LOGW("Cannot decode packet header field: " "notit-addr=%p, trace-class-addr=%p, " "fc-addr=%p", @@ -731,7 +808,7 @@ enum bt_msg_iter_status read_packet_header_begin_state( } end: - return ret; + return status; } static @@ -847,8 +924,6 @@ enum bt_msg_iter_status set_current_packet(struct bt_msg_iter *notit) enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; bt_packet *packet = NULL; - BT_COMP_LOGD("Creating packet for packet message: " - "notit-addr=%p", notit); BT_COMP_LOGD("Creating packet from stream: " "notit-addr=%p, stream-addr=%p, " "stream-class-addr=%p, " @@ -918,7 +993,7 @@ enum bt_msg_iter_status read_packet_context_begin_state( BT_ASSERT(!notit->packet_context_field); - if (packet_context_fc->in_ir) { + if (packet_context_fc->in_ir && !notit->dry_run) { /* * Create free packet context field from stream class. * This field is going to be moved to the packet once we @@ -1186,15 +1261,15 @@ enum bt_msg_iter_status set_current_event_message( enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; bt_message *msg = NULL; - BT_ASSERT(notit->meta.ec); - BT_ASSERT(notit->packet); + BT_ASSERT_DBG(notit->meta.ec); + BT_ASSERT_DBG(notit->packet); BT_COMP_LOGD("Creating event message from event class and packet: " "notit-addr=%p, ec-addr=%p, ec-name=\"%s\", packet-addr=%p", notit, notit->meta.ec, notit->meta.ec->name->str, notit->packet); - BT_ASSERT(notit->msg_iter); - BT_ASSERT(notit->meta.sc); + BT_ASSERT_DBG(notit->msg_iter); + BT_ASSERT_DBG(notit->meta.sc); if (bt_stream_class_borrow_default_clock_class(notit->meta.sc->ir_sc)) { msg = bt_message_event_create_with_packet_and_default_clock_snapshot( @@ -1237,6 +1312,10 @@ enum bt_msg_iter_status after_event_header_state( goto end; } + if (G_UNLIKELY(notit->dry_run)) { + goto next_state; + } + status = set_current_event_message(notit); if (status != BT_MSG_ITER_STATUS_OK) { goto end; @@ -1244,7 +1323,9 @@ enum bt_msg_iter_status after_event_header_state( notit->event = bt_message_event_borrow_event( notit->event_msg); - BT_ASSERT(notit->event); + BT_ASSERT_DBG(notit->event); + +next_state: notit->state = STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN; end: @@ -1264,12 +1345,12 @@ enum bt_msg_iter_status read_event_common_context_begin_state( goto end; } - if (event_common_context_fc->in_ir) { - BT_ASSERT(!notit->dscopes.event_common_context); + if (event_common_context_fc->in_ir && !notit->dry_run) { + BT_ASSERT_DBG(!notit->dscopes.event_common_context); notit->dscopes.event_common_context = bt_event_borrow_common_context_field( notit->event); - BT_ASSERT(notit->dscopes.event_common_context); + BT_ASSERT_DBG(notit->dscopes.event_common_context); } BT_COMP_LOGT("Decoding event common context field: " @@ -1317,12 +1398,12 @@ enum bt_msg_iter_status read_event_spec_context_begin_state( goto end; } - if (event_spec_context_fc->in_ir) { - BT_ASSERT(!notit->dscopes.event_spec_context); + if (event_spec_context_fc->in_ir && !notit->dry_run) { + BT_ASSERT_DBG(!notit->dscopes.event_spec_context); notit->dscopes.event_spec_context = bt_event_borrow_specific_context_field( notit->event); - BT_ASSERT(notit->dscopes.event_spec_context); + BT_ASSERT_DBG(notit->dscopes.event_spec_context); } BT_COMP_LOGT("Decoding event specific context field: " @@ -1373,12 +1454,12 @@ enum bt_msg_iter_status read_event_payload_begin_state( goto end; } - if (event_payload_fc->in_ir) { - BT_ASSERT(!notit->dscopes.event_payload); + if (event_payload_fc->in_ir && !notit->dry_run) { + BT_ASSERT_DBG(!notit->dscopes.event_payload); notit->dscopes.event_payload = bt_event_borrow_payload_field( notit->event); - BT_ASSERT(notit->dscopes.event_payload); + BT_ASSERT_DBG(notit->dscopes.event_payload); } BT_COMP_LOGT("Decoding event payload field: " @@ -1420,11 +1501,12 @@ enum bt_msg_iter_status skip_packet_padding_state(struct bt_msg_iter *notit) { enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; size_t bits_to_skip; + const enum state next_state = STATE_SWITCH_PACKET; BT_ASSERT(notit->cur_exp_packet_total_size > 0); bits_to_skip = notit->cur_exp_packet_total_size - packet_at(notit); if (bits_to_skip == 0) { - notit->state = STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN; + notit->state = next_state; goto end; } else { size_t bits_to_consume; @@ -1443,7 +1525,7 @@ enum bt_msg_iter_status skip_packet_padding_state(struct bt_msg_iter *notit) bits_to_skip = notit->cur_exp_packet_total_size - packet_at(notit); if (bits_to_skip == 0) { - notit->state = STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN; + notit->state = next_state; goto end; } } @@ -1585,7 +1667,10 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit) // TODO: optimalize! switch (state) { case STATE_INIT: - notit->state = STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN; + notit->state = STATE_SWITCH_PACKET; + break; + case STATE_SWITCH_PACKET: + status = switch_packet_state(notit); break; case STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN: status = read_packet_header_begin_state(notit); @@ -1656,6 +1741,9 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit) case STATE_EMIT_MSG_EVENT: notit->state = STATE_DSCOPE_EVENT_HEADER_BEGIN; break; + case STATE_EMIT_QUEUED_MSG_EVENT: + notit->state = STATE_EMIT_MSG_EVENT; + break; case STATE_SKIP_PACKET_PADDING: status = skip_packet_padding_state(notit); break; @@ -1668,6 +1756,9 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit) case STATE_CHECK_EMIT_MSG_STREAM_END: status = check_emit_msg_stream_end(notit); break; + case STATE_EMIT_QUEUED_MSG_PACKET_END: + notit->state = STATE_EMIT_MSG_PACKET_END_SINGLE; + break; case STATE_EMIT_MSG_STREAM_END: notit->state = STATE_DONE; break; @@ -1728,8 +1819,6 @@ void bt_msg_iter_reset(struct bt_msg_iter *notit) bt_msg_iter_reset_for_next_stream_file(notit); notit->cur_stream_class_id = -1; notit->cur_data_stream_id = -1; - notit->emit_stream_begin_msg = true; - notit->emit_stream_end_msg = true; notit->snapshots.discarded_events = UINT64_C(-1); notit->snapshots.packets = UINT64_C(-1); notit->prev_packet_snapshots.discarded_events = UINT64_C(-1); @@ -1738,115 +1827,46 @@ void bt_msg_iter_reset(struct bt_msg_iter *notit) notit->prev_packet_snapshots.end_clock = UINT64_C(-1); } -static -int bt_msg_iter_switch_packet(struct bt_msg_iter *notit) -{ - int ret = 0; - - /* - * We don't put the stream class here because we need to make - * sure that all the packets processed by the same message - * iterator refer to the same stream class (the first one). - */ - BT_ASSERT(notit); - - if (notit->cur_exp_packet_total_size != -1) { - notit->cur_packet_offset += notit->cur_exp_packet_total_size; - } - - BT_COMP_LOGD("Switching packet: notit-addr=%p, cur=%zu, " - "packet-offset=%" PRId64, notit, notit->buf.at, - notit->cur_packet_offset); - stack_clear(notit->stack); - notit->meta.ec = NULL; - BT_PACKET_PUT_REF_AND_RESET(notit->packet); - BT_MESSAGE_PUT_REF_AND_RESET(notit->event_msg); - release_all_dscopes(notit); - notit->cur_dscope_field = NULL; - - /* - * Adjust current buffer so that addr points to the beginning of the new - * packet. - */ - if (notit->buf.addr) { - size_t consumed_bytes = (size_t) (notit->buf.at / CHAR_BIT); - - /* Packets are assumed to start on a byte frontier. */ - if (notit->buf.at % CHAR_BIT) { - BT_COMP_LOGW("Cannot switch packet: current position is not a multiple of 8: " - "notit-addr=%p, cur=%zu", notit, notit->buf.at); - ret = -1; - goto end; - } - - notit->buf.addr += consumed_bytes; - notit->buf.sz -= consumed_bytes; - notit->buf.at = 0; - notit->buf.packet_offset = 0; - BT_COMP_LOGD("Adjusted buffer: addr=%p, size=%zu", - notit->buf.addr, notit->buf.sz); - } - - notit->cur_exp_packet_content_size = -1; - notit->cur_exp_packet_total_size = -1; - notit->cur_stream_class_id = -1; - notit->cur_event_class_id = -1; - notit->cur_data_stream_id = -1; - notit->prev_packet_snapshots = notit->snapshots; - notit->snapshots.discarded_events = UINT64_C(-1); - notit->snapshots.packets = UINT64_C(-1); - notit->snapshots.beginning_clock = UINT64_C(-1); - notit->snapshots.end_clock = UINT64_C(-1); - -end: - return ret; -} - static bt_field *borrow_next_field(struct bt_msg_iter *notit) { bt_field *next_field = NULL; bt_field *base_field; const bt_field_class *base_fc; + bt_field_class_type base_fc_type; size_t index; - BT_ASSERT(!stack_empty(notit->stack)); + BT_ASSERT_DBG(!stack_empty(notit->stack)); index = stack_top(notit->stack)->index; base_field = stack_top(notit->stack)->base; - BT_ASSERT(base_field); + BT_ASSERT_DBG(base_field); base_fc = bt_field_borrow_class_const(base_field); - BT_ASSERT(base_fc); + BT_ASSERT_DBG(base_fc); + base_fc_type = bt_field_class_get_type(base_fc); - switch (bt_field_class_get_type(base_fc)) { - case BT_FIELD_CLASS_TYPE_STRUCTURE: - { - BT_ASSERT(index < + if (base_fc_type == BT_FIELD_CLASS_TYPE_STRUCTURE) { + BT_ASSERT_DBG(index < bt_field_class_structure_get_member_count( bt_field_borrow_class_const( base_field))); next_field = bt_field_structure_borrow_member_field_by_index( base_field, index); - break; - } - case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - BT_ASSERT(index < bt_field_array_get_length(base_field)); + } else if (bt_field_class_type_is(base_fc_type, + BT_FIELD_CLASS_TYPE_ARRAY)) { + BT_ASSERT_DBG(index < bt_field_array_get_length(base_field)); next_field = bt_field_array_borrow_element_field_by_index( base_field, index); - break; - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - BT_ASSERT(index == 0); + } else if (bt_field_class_type_is(base_fc_type, + BT_FIELD_CLASS_TYPE_VARIANT)) { + BT_ASSERT_DBG(index == 0); next_field = bt_field_variant_borrow_selected_option_field( base_field); - break; - default: + } else { abort(); } - BT_ASSERT(next_field); + BT_ASSERT_DBG(next_field); return next_field; } @@ -1857,7 +1877,7 @@ void update_default_clock(struct bt_msg_iter *notit, uint64_t new_val, uint64_t new_val_mask; uint64_t cur_value_masked; - BT_ASSERT(new_val_size > 0); + BT_ASSERT_DBG(new_val_size > 0); /* * Special case for a 64-bit new value, which is the limit @@ -1961,18 +1981,16 @@ update_def_clock: (uint64_t) int_fc->storing_index) = value; } - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } field = borrow_next_field(notit); - BT_ASSERT(field); - BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc); - BT_ASSERT(bt_field_get_class_type(field) == - BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || - bt_field_get_class_type(field) == - BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION); - bt_field_unsigned_integer_set_value(field, value); + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(bt_field_borrow_class_const(field) == fc->ir_fc); + BT_ASSERT_DBG(bt_field_class_type_is(bt_field_get_class_type(field), + BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER)); + bt_field_integer_unsigned_set_value(field, value); stack_top(notit->stack)->index++; end: @@ -1994,11 +2012,11 @@ enum bt_bfcr_status bfcr_unsigned_int_char_cb(uint64_t value, "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%" PRIu64, notit, notit->bfcr, fc, fc->type, fc->in_ir, value); - BT_ASSERT(int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE); - BT_ASSERT(!int_fc->mapped_clock_class); - BT_ASSERT(int_fc->storing_index < 0); + BT_ASSERT_DBG(int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE); + BT_ASSERT_DBG(!int_fc->mapped_clock_class); + BT_ASSERT_DBG(int_fc->storing_index < 0); - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } @@ -2012,8 +2030,8 @@ enum bt_bfcr_status bfcr_unsigned_int_char_cb(uint64_t value, } string_field = stack_top(notit->stack)->base; - BT_ASSERT(bt_field_get_class_type(string_field) == - BT_FIELD_CLASS_TYPE_STRING); + BT_ASSERT_DBG(bt_field_get_class_type(string_field) == + BT_FIELD_CLASS_TYPE_STRING); /* Append character */ str[0] = (char) value; @@ -2043,25 +2061,23 @@ enum bt_bfcr_status bfcr_signed_int_cb(int64_t value, "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%" PRId64, notit, notit->bfcr, fc, fc->type, fc->in_ir, value); - BT_ASSERT(int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE); + BT_ASSERT_DBG(int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE); if (G_UNLIKELY(int_fc->storing_index >= 0)) { g_array_index(notit->stored_values, uint64_t, (uint64_t) int_fc->storing_index) = (uint64_t) value; } - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } field = borrow_next_field(notit); - BT_ASSERT(field); - BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc); - BT_ASSERT(bt_field_get_class_type(field) == - BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || - bt_field_get_class_type(field) == - BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION); - bt_field_signed_integer_set_value(field, value); + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(bt_field_borrow_class_const(field) == fc->ir_fc); + BT_ASSERT_DBG(bt_field_class_type_is(bt_field_get_class_type(field), + BT_FIELD_CLASS_TYPE_SIGNED_INTEGER)); + bt_field_integer_signed_set_value(field, value); stack_top(notit->stack)->index++; end: @@ -2075,22 +2091,28 @@ enum bt_bfcr_status bfcr_floating_point_cb(double value, enum bt_bfcr_status status = BT_BFCR_STATUS_OK; bt_field *field = NULL; struct bt_msg_iter *notit = data; + bt_field_class_type type; BT_COMP_LOGT("Floating point number function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%f", notit, notit->bfcr, fc, fc->type, fc->in_ir, value); - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } field = borrow_next_field(notit); - BT_ASSERT(field); - BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc); - BT_ASSERT(bt_field_get_class_type(field) == - BT_FIELD_CLASS_TYPE_REAL); - bt_field_real_set_value(field, value); + type = bt_field_get_class_type(field); + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(bt_field_borrow_class_const(field) == fc->ir_fc); + BT_ASSERT_DBG(bt_field_class_type_is(type, BT_FIELD_CLASS_TYPE_REAL)); + + if (type == BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL) { + bt_field_real_single_precision_set_value(field, (float) value); + } else { + bt_field_real_double_precision_set_value(field, value); + } stack_top(notit->stack)->index++; end: @@ -2109,14 +2131,14 @@ enum bt_bfcr_status bfcr_string_begin_cb( "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } field = borrow_next_field(notit); - BT_ASSERT(field); - BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc); - BT_ASSERT(bt_field_get_class_type(field) == + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(bt_field_borrow_class_const(field) == fc->ir_fc); + BT_ASSERT_DBG(bt_field_get_class_type(field) == BT_FIELD_CLASS_TYPE_STRING); bt_field_string_clear(field); @@ -2146,12 +2168,12 @@ enum bt_bfcr_status bfcr_string_cb(const char *value, notit, notit->bfcr, fc, fc->type, fc->in_ir, len); - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } field = stack_top(notit->stack)->base; - BT_ASSERT(field); + BT_ASSERT_DBG(field); /* Append current substring */ ret = bt_field_string_append_with_length(field, value, len); @@ -2178,7 +2200,7 @@ enum bt_bfcr_status bfcr_string_end_cb( "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); - if (G_UNLIKELY(!fc->in_ir)) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } @@ -2192,6 +2214,7 @@ end: return BT_BFCR_STATUS_OK; } +static enum bt_bfcr_status bfcr_compound_begin_cb( struct ctf_field_class *fc, void *data) { @@ -2203,7 +2226,7 @@ enum bt_bfcr_status bfcr_compound_begin_cb( "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); - if (!fc->in_ir) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } @@ -2213,12 +2236,12 @@ enum bt_bfcr_status bfcr_compound_begin_cb( field = notit->cur_dscope_field; } else { field = borrow_next_field(notit); - BT_ASSERT(field); + BT_ASSERT_DBG(field); } /* Push field */ - BT_ASSERT(field); - BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc); + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(bt_field_borrow_class_const(field) == fc->ir_fc); stack_push(notit->stack, field); /* @@ -2230,7 +2253,7 @@ enum bt_bfcr_status bfcr_compound_begin_cb( struct ctf_field_class_array_base *array_fc = (void *) fc; if (array_fc->is_text) { - BT_ASSERT(bt_field_get_class_type(field) == + BT_ASSERT_DBG(bt_field_get_class_type(field) == BT_FIELD_CLASS_TYPE_STRING); notit->done_filling_string = false; bt_field_string_clear(field); @@ -2243,6 +2266,7 @@ end: return BT_BFCR_STATUS_OK; } +static enum bt_bfcr_status bfcr_compound_end_cb( struct ctf_field_class *fc, void *data) { @@ -2253,12 +2277,12 @@ enum bt_bfcr_status bfcr_compound_end_cb( "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); - if (!fc->in_ir) { + if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) { goto end; } - BT_ASSERT(!stack_empty(notit->stack)); - BT_ASSERT(bt_field_borrow_class_const(stack_top(notit->stack)->base) == + BT_ASSERT_DBG(!stack_empty(notit->stack)); + BT_ASSERT_DBG(bt_field_borrow_class_const(stack_top(notit->stack)->base) == fc->ir_fc); /* @@ -2270,7 +2294,7 @@ enum bt_bfcr_status bfcr_compound_end_cb( struct ctf_field_class_array_base *array_fc = (void *) fc; if (array_fc->is_text) { - BT_ASSERT(bt_field_get_class_type( + BT_ASSERT_DBG(bt_field_get_class_type( stack_top(notit->stack)->base) == BT_FIELD_CLASS_TYPE_STRING); bt_bfcr_set_unsigned_int_cb(notit->bfcr, @@ -2301,8 +2325,13 @@ int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data) length = (uint64_t) g_array_index(notit->stored_values, uint64_t, seq_fc->stored_length_index); + + if (G_UNLIKELY(notit->dry_run)){ + goto end; + } + seq_field = stack_top(notit->stack)->base; - BT_ASSERT(seq_field); + BT_ASSERT_DBG(seq_field); /* * bfcr_get_sequence_length_cb() also gets called back for a @@ -2311,9 +2340,10 @@ int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data) * is a sequence field. */ if (!seq_fc->base.is_text) { - BT_ASSERT(bt_field_get_class_type(seq_field) == - BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY); - ret = bt_field_dynamic_array_set_length(seq_field, + BT_ASSERT_DBG(bt_field_class_type_is( + bt_field_get_class_type(seq_field), + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY)); + ret = bt_field_array_dynamic_set_length(seq_field, (uint64_t) length); if (ret) { BT_COMP_LOGE("Cannot set dynamic array field's length field: " @@ -2322,6 +2352,7 @@ int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data) } } +end: return length; } @@ -2384,7 +2415,7 @@ struct ctf_field_class *bfcr_borrow_variant_selected_field_class_cb( selected_option = ctf_field_class_variant_borrow_option_by_index( var_fc, (uint64_t) option_index); - if (selected_option->fc->in_ir) { + if (selected_option->fc->in_ir && !notit->dry_run) { bt_field *var_field = stack_top(notit->stack)->base; ret = bt_field_variant_select_option_field_by_index( @@ -2405,71 +2436,64 @@ end: } static -void create_msg_stream_beginning(struct bt_msg_iter *notit, - bt_message **message) +bt_message *create_msg_stream_beginning(struct bt_msg_iter *notit) { - bt_message *ret = NULL; + bt_message *msg; BT_ASSERT(notit->stream); BT_ASSERT(notit->msg_iter); - ret = bt_message_stream_beginning_create(notit->msg_iter, + msg = bt_message_stream_beginning_create(notit->msg_iter, notit->stream); - if (!ret) { + if (!msg) { BT_COMP_LOGE("Cannot create stream beginning message: " "notit-addr=%p, stream-addr=%p", notit, notit->stream); - return; } - *message = ret; + return msg; } static -void create_msg_stream_end(struct bt_msg_iter *notit, bt_message **message) +bt_message *create_msg_stream_end(struct bt_msg_iter *notit) { - bt_message *ret; + bt_message *msg; if (!notit->stream) { BT_COMP_LOGE("Cannot create stream for stream message: " "notit-addr=%p", notit); - return; + msg = NULL; + goto end; } BT_ASSERT(notit->msg_iter); - ret = bt_message_stream_end_create(notit->msg_iter, + msg = bt_message_stream_end_create(notit->msg_iter, notit->stream); - if (!ret) { + if (!msg) { BT_COMP_LOGE("Cannot create stream end message: " "notit-addr=%p, stream-addr=%p", notit, notit->stream); - return; } - *message = ret; +end: + return msg; } static -void create_msg_packet_beginning(struct bt_msg_iter *notit, - bt_message **message) +bt_message *create_msg_packet_beginning(struct bt_msg_iter *notit, + bool use_default_cs) { int ret; - enum bt_msg_iter_status status; - bt_message *msg = NULL; - const bt_stream_class *sc; - - status = set_current_packet(notit); - if (status != BT_MSG_ITER_STATUS_OK) { - goto end; - } + bt_message *msg; + const bt_stream_class *sc = notit->meta.sc->ir_sc; BT_ASSERT(notit->packet); - sc = notit->meta.sc->ir_sc; BT_ASSERT(sc); if (notit->packet_context_field) { ret = bt_packet_move_context_field( notit->packet, notit->packet_context_field); if (ret) { + msg = NULL; goto end; } @@ -2489,9 +2513,21 @@ void create_msg_packet_beginning(struct bt_msg_iter *notit, if (notit->meta.sc->packets_have_ts_begin) { BT_ASSERT(notit->snapshots.beginning_clock != UINT64_C(-1)); + uint64_t raw_cs_value; + + /* + * Either use the decoded packet `timestamp_begin` field or the + * current stream's default clock_snapshot. + */ + if (use_default_cs) { + raw_cs_value = notit->default_clock_snapshot; + } else { + raw_cs_value = notit->snapshots.beginning_clock; + } + msg = bt_message_packet_beginning_create_with_default_clock_snapshot( notit->msg_iter, notit->packet, - notit->snapshots.beginning_clock); + raw_cs_value); } else { msg = bt_message_packet_beginning_create(notit->msg_iter, notit->packet); @@ -2504,23 +2540,88 @@ void create_msg_packet_beginning(struct bt_msg_iter *notit, goto end; } - *message = msg; - end: - return; + return msg; +} + +static +bt_message *emit_delayed_packet_beg_msg(struct bt_msg_iter *notit) +{ + bool packet_beg_ts_need_fix_up; + + notit->emit_delayed_packet_beginning_msg = false; + + /* + * Only fix the packet's timestamp_begin if it's larger than the first + * event of the packet. If there was no event in the packet, the + * `default_clock_snapshot` field will be either equal or greater than + * `snapshots.beginning_clock` so there is not fix needed. + */ + packet_beg_ts_need_fix_up = + notit->default_clock_snapshot < notit->snapshots.beginning_clock; + + /* create_msg_packet_beginning() logs errors */ + return create_msg_packet_beginning(notit, packet_beg_ts_need_fix_up); } + static -void create_msg_packet_end(struct bt_msg_iter *notit, bt_message **message) +bt_message *create_msg_packet_end(struct bt_msg_iter *notit) { bt_message *msg; + bool update_default_cs = true; if (!notit->packet) { - return; + msg = NULL; + goto end; + } + + /* + * Check if we need to emit the delayed packet + * beginning message instead of the packet end message. + */ + if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) { + msg = emit_delayed_packet_beg_msg(notit); + /* Don't forget to emit the packet end message. */ + notit->state = STATE_EMIT_QUEUED_MSG_PACKET_END; + goto end; + } + + /* Check if may be affected by lttng-crash timestamp_end quirk. */ + if (G_UNLIKELY(notit->meta.tc->quirks.lttng_crash)) { + /* + * Check if the `timestamp_begin` field is non-zero but + * `timestamp_end` is zero. It means the trace is affected by + * the lttng-crash packet `timestamp_end` quirk and must be + * fixed up by omitting to update the default clock snapshot to + * the `timestamp_end` as is typically done. + */ + if (notit->snapshots.beginning_clock != 0 && + notit->snapshots.end_clock == 0) { + update_default_cs = false; + } + } + + /* + * Check if may be affected by lttng event-after-packet `timestamp_end` + * quirk. + */ + if (notit->meta.tc->quirks.lttng_event_after_packet) { + /* + * Check if `timestamp_end` is smaller then the current + * default_clock_snapshot (which is set to the last event + * decoded). It means the trace is affected by the lttng + * `event-after-packet` packet `timestamp_end` quirk and must + * be fixed up by omitting to update the default clock snapshot + * to the `timestamp_end` as is typically done. + */ + if (notit->snapshots.end_clock < notit->default_clock_snapshot) { + update_default_cs = false; + } } - /* Update default clock from packet's end time */ - if (notit->snapshots.end_clock != UINT64_C(-1)) { + /* Update default clock from packet's end time. */ + if (notit->snapshots.end_clock != UINT64_C(-1) && update_default_cs) { notit->default_clock_snapshot = notit->snapshots.end_clock; } @@ -2530,7 +2631,7 @@ void create_msg_packet_end(struct bt_msg_iter *notit, bt_message **message) BT_ASSERT(notit->snapshots.end_clock != UINT64_C(-1)); msg = bt_message_packet_end_create_with_default_clock_snapshot( notit->msg_iter, notit->packet, - notit->snapshots.end_clock); + notit->default_clock_snapshot); } else { msg = bt_message_packet_end_create(notit->msg_iter, notit->packet); @@ -2540,17 +2641,18 @@ void create_msg_packet_end(struct bt_msg_iter *notit, bt_message **message) BT_COMP_LOGE("Cannot create packet end message: " "notit-addr=%p, packet-addr=%p", notit, notit->packet); - return; + goto end; } BT_PACKET_PUT_REF_AND_RESET(notit->packet); - *message = msg; + +end: + return msg; } static -void create_msg_discarded_events(struct bt_msg_iter *notit, - bt_message **message) +bt_message *create_msg_discarded_events(struct bt_msg_iter *notit) { bt_message *msg; uint64_t beginning_raw_value = UINT64_C(-1); @@ -2588,7 +2690,7 @@ void create_msg_discarded_events(struct bt_msg_iter *notit, BT_COMP_LOGE("Cannot create discarded events message: " "notit-addr=%p, stream-addr=%p", notit, notit->stream); - return; + goto end; } if (notit->prev_packet_snapshots.discarded_events != UINT64_C(-1)) { @@ -2597,12 +2699,12 @@ void create_msg_discarded_events(struct bt_msg_iter *notit, notit->prev_packet_snapshots.discarded_events); } - *message = msg; +end: + return msg; } static -void create_msg_discarded_packets(struct bt_msg_iter *notit, - bt_message **message) +bt_message *create_msg_discarded_packets(struct bt_msg_iter *notit) { bt_message *msg; @@ -2628,13 +2730,15 @@ void create_msg_discarded_packets(struct bt_msg_iter *notit, BT_COMP_LOGE("Cannot create discarded packets message: " "notit-addr=%p, stream-addr=%p", notit, notit->stream); - return; + goto end; } bt_message_discarded_packets_set_count(msg, notit->snapshots.packets - notit->prev_packet_snapshots.packets - 1); - *message = msg; + +end: + return msg; } BT_HIDDEN @@ -2744,8 +2848,8 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( { enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; - BT_ASSERT(notit); - BT_ASSERT(message); + BT_ASSERT_DBG(notit); + BT_ASSERT_DBG(message); notit->msg_iter = msg_iter; notit->set_stream = true; BT_COMP_LOGD("Getting next message: notit-addr=%p", notit); @@ -2763,13 +2867,32 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( switch (notit->state) { case STATE_EMIT_MSG_EVENT: - BT_ASSERT(notit->event_msg); - *message = notit->event_msg; - notit->event_msg = NULL; + BT_ASSERT_DBG(notit->event_msg); + + /* + * Check if we need to emit the delayed packet + * beginning message instead of the event message. + */ + if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) { + *message = emit_delayed_packet_beg_msg(notit); + if (!*message) { + status = BT_MSG_ITER_STATUS_ERROR; + } + + /* + * Don't forget to emit the event message of + * the event record that was just decoded. + */ + notit->state = STATE_EMIT_QUEUED_MSG_EVENT; + + } else { + *message = notit->event_msg; + notit->event_msg = NULL; + } goto end; case STATE_EMIT_MSG_DISCARDED_EVENTS: /* create_msg_discared_events() logs errors */ - create_msg_discarded_events(notit, message); + *message = create_msg_discarded_events(notit); if (!*message) { status = BT_MSG_ITER_STATUS_ERROR; @@ -2778,7 +2901,7 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( goto end; case STATE_EMIT_MSG_DISCARDED_PACKETS: /* create_msg_discared_packets() logs errors */ - create_msg_discarded_packets(notit, message); + *message = create_msg_discarded_packets(notit); if (!*message) { status = BT_MSG_ITER_STATUS_ERROR; @@ -2786,18 +2909,33 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( goto end; case STATE_EMIT_MSG_PACKET_BEGINNING: - /* create_msg_packet_beginning() logs errors */ - create_msg_packet_beginning(notit, message); + status = set_current_packet(notit); + if (status != BT_MSG_ITER_STATUS_OK) { + goto end; + } - if (!*message) { - status = BT_MSG_ITER_STATUS_ERROR; + if (G_UNLIKELY(notit->meta.tc->quirks.barectf_event_before_packet)) { + notit->emit_delayed_packet_beginning_msg = true; + /* + * There is no message to return yet as this + * packet beginning message is delayed until we + * decode the first event message of the + * packet. + */ + break; + } else { + /* create_msg_packet_beginning() logs errors */ + *message = create_msg_packet_beginning(notit, false); + if (!*message) { + status = BT_MSG_ITER_STATUS_ERROR; + } } goto end; case STATE_EMIT_MSG_PACKET_END_SINGLE: case STATE_EMIT_MSG_PACKET_END_MULTI: /* create_msg_packet_end() logs errors */ - create_msg_packet_end(notit, message); + *message = create_msg_packet_end(notit); if (!*message) { status = BT_MSG_ITER_STATUS_ERROR; @@ -2806,7 +2944,7 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( goto end; case STATE_EMIT_MSG_STREAM_BEGINNING: /* create_msg_stream_beginning() logs errors */ - create_msg_stream_beginning(notit, message); + *message = create_msg_stream_beginning(notit); if (!*message) { status = BT_MSG_ITER_STATUS_ERROR; @@ -2815,7 +2953,7 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message( goto end; case STATE_EMIT_MSG_STREAM_END: /* create_msg_stream_end() logs errors */ - create_msg_stream_end(notit, message); + *message = create_msg_stream_end(notit); if (!*message) { status = BT_MSG_ITER_STATUS_ERROR; @@ -2836,21 +2974,24 @@ end: } static -enum bt_msg_iter_status read_packet_header_context_fields( - struct bt_msg_iter *notit) +enum bt_msg_iter_status decode_until_state( struct bt_msg_iter *notit, + enum state target_state_1, enum state target_state_2) { - int ret; enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; - BT_ASSERT(notit); + BT_ASSERT_DBG(notit); notit->set_stream = false; - if (notit->state == STATE_EMIT_MSG_PACKET_BEGINNING) { - /* We're already there */ - goto end; - } + do { + /* + * Check if we reached the state at which we want to stop + * decoding. + */ + if (notit->state == target_state_1 || + notit->state == target_state_2) { + goto end; + } - while (true) { status = handle_state(notit); if (G_UNLIKELY(status == BT_MSG_ITER_STATUS_AGAIN)) { BT_COMP_LOGD_STR("Medium returned BT_MSG_ITER_STATUS_AGAIN."); @@ -2862,13 +3003,8 @@ enum bt_msg_iter_status read_packet_header_context_fields( } switch (notit->state) { - case STATE_EMIT_MSG_PACKET_BEGINNING: - /* - * Packet header and context fields are - * potentially decoded (or they don't exist). - */ - goto end; case STATE_INIT: + case STATE_SWITCH_PACKET: case STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN: case STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE: case STATE_AFTER_TRACE_PACKET_HEADER: @@ -2881,25 +3017,58 @@ enum bt_msg_iter_status read_packet_header_context_fields( case STATE_EMIT_MSG_DISCARDED_EVENTS: case STATE_CHECK_EMIT_MSG_DISCARDED_PACKETS: case STATE_EMIT_MSG_DISCARDED_PACKETS: - /* Non-emitting state: continue */ + case STATE_EMIT_MSG_PACKET_BEGINNING: + case STATE_DSCOPE_EVENT_HEADER_BEGIN: + case STATE_DSCOPE_EVENT_HEADER_CONTINUE: + case STATE_AFTER_EVENT_HEADER: + case STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN: + case STATE_DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE: + case STATE_DSCOPE_EVENT_SPEC_CONTEXT_BEGIN: + case STATE_DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE: + case STATE_DSCOPE_EVENT_PAYLOAD_BEGIN: + case STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE: + case STATE_EMIT_MSG_EVENT: + case STATE_EMIT_QUEUED_MSG_EVENT: + case STATE_SKIP_PACKET_PADDING: + case STATE_EMIT_MSG_PACKET_END_MULTI: + case STATE_EMIT_MSG_PACKET_END_SINGLE: + case STATE_EMIT_QUEUED_MSG_PACKET_END: + case STATE_CHECK_EMIT_MSG_STREAM_END: + case STATE_EMIT_MSG_STREAM_END: break; + case STATE_DONE: + /* fall-through */ default: - /* - * We should never get past the - * STATE_EMIT_MSG_PACKET_BEGINNING state. - */ + /* We should never get to the STATE_DONE state. */ BT_COMP_LOGF("Unexpected state: notit-addr=%p, state=%s", notit, state_string(notit->state)); abort(); } - } + } while (true); end: + return status; +} + +static +enum bt_msg_iter_status read_packet_header_context_fields( + struct bt_msg_iter *notit) +{ + int ret; + enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; + + status = decode_until_state(notit, STATE_EMIT_MSG_PACKET_BEGINNING, -1); + if (status != BT_MSG_ITER_STATUS_OK) { + goto end; + } + ret = set_current_packet_content_sizes(notit); if (ret) { status = BT_MSG_ITER_STATUS_ERROR; + goto end; } +end: return status; } @@ -2915,18 +3084,18 @@ BT_HIDDEN enum bt_msg_iter_status bt_msg_iter_seek(struct bt_msg_iter *notit, off_t offset) { - enum bt_msg_iter_status ret = BT_MSG_ITER_STATUS_OK; + enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; enum bt_msg_iter_medium_status medium_status; BT_ASSERT(notit); if (offset < 0) { - BT_COMP_LOGE("Cannot seek to negative offset: offset=%jd", offset); - ret = BT_MSG_ITER_STATUS_INVAL; + BT_COMP_LOGE("Cannot seek to negative offset: offset=%jd", (intmax_t) offset); + status = BT_MSG_ITER_STATUS_INVAL; goto end; } if (!notit->medium.medops.seek) { - ret = BT_MSG_ITER_STATUS_UNSUPPORTED; + status = BT_MSG_ITER_STATUS_UNSUPPORTED; BT_COMP_LOGD("Aborting seek as the iterator's underlying media does not implement seek support."); goto end; } @@ -2935,9 +3104,9 @@ enum bt_msg_iter_status bt_msg_iter_seek(struct bt_msg_iter *notit, BT_MSG_ITER_SEEK_WHENCE_SET, offset, notit->medium.data); if (medium_status != BT_MSG_ITER_MEDIUM_STATUS_OK) { if (medium_status == BT_MSG_ITER_MEDIUM_STATUS_EOF) { - ret = BT_MSG_ITER_STATUS_EOF; + status = BT_MSG_ITER_STATUS_EOF; } else { - ret = BT_MSG_ITER_STATUS_ERROR; + status = BT_MSG_ITER_STATUS_ERROR; goto end; } } @@ -2946,7 +3115,43 @@ enum bt_msg_iter_status bt_msg_iter_seek(struct bt_msg_iter *notit, notit->cur_packet_offset = offset; end: - return ret; + return status; +} + +static +enum bt_msg_iter_status clock_snapshot_at_msg_iter_state( + struct bt_msg_iter *notit, enum state target_state_1, + enum state target_state_2, uint64_t *clock_snapshot) +{ + enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; + + BT_ASSERT_DBG(notit); + BT_ASSERT_DBG(clock_snapshot); + status = decode_until_state(notit, target_state_1, target_state_2); + if (status != BT_MSG_ITER_STATUS_OK) { + goto end; + } + + *clock_snapshot = notit->default_clock_snapshot; +end: + return status; +} + +BT_HIDDEN +enum bt_msg_iter_status bt_msg_iter_curr_packet_first_event_clock_snapshot( + struct bt_msg_iter *notit, uint64_t *first_clock_snapshot) +{ + return clock_snapshot_at_msg_iter_state(notit, + STATE_AFTER_EVENT_HEADER, -1, first_clock_snapshot); +} + +BT_HIDDEN +enum bt_msg_iter_status bt_msg_iter_curr_packet_last_event_clock_snapshot( + struct bt_msg_iter *notit, uint64_t *last_clock_snapshot) +{ + return clock_snapshot_at_msg_iter_state(notit, + STATE_EMIT_MSG_PACKET_END_SINGLE, + STATE_EMIT_MSG_PACKET_END_MULTI, last_clock_snapshot); } BT_HIDDEN @@ -2956,8 +3161,8 @@ enum bt_msg_iter_status bt_msg_iter_get_packet_properties( { enum bt_msg_iter_status status; - BT_ASSERT(notit); - BT_ASSERT(props); + BT_ASSERT_DBG(notit); + BT_ASSERT_DBG(props); status = read_packet_header_context_fields(notit); if (status != BT_MSG_ITER_STATUS_OK) { goto end; @@ -2989,3 +3194,10 @@ void bt_msg_iter_set_emit_stream_end_message(struct bt_msg_iter *notit, { notit->emit_stream_end_msg = val; } + +BT_HIDDEN +void bt_msg_iter_set_dry_run(struct bt_msg_iter *notit, + bool val) +{ + notit->dry_run = val; +}