#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 <stdint.h>
#include <inttypes.h>
/* 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,
/* 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;
{
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_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_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)
{
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;
- }
-
/*
* Make sure at least one bit is available for this packet. An
* empty packet is impossible. If we reach the end of the medium
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
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;
notit->event = bt_message_event_borrow_event(
notit->event_msg);
BT_ASSERT(notit->event);
+
+next_state:
notit->state = STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN;
end:
goto end;
}
- if (event_common_context_fc->in_ir) {
+ if (event_common_context_fc->in_ir && !notit->dry_run) {
BT_ASSERT(!notit->dscopes.event_common_context);
notit->dscopes.event_common_context =
bt_event_borrow_common_context_field(
goto end;
}
- if (event_spec_context_fc->in_ir) {
+ if (event_spec_context_fc->in_ir && !notit->dry_run) {
BT_ASSERT(!notit->dscopes.event_spec_context);
notit->dscopes.event_spec_context =
bt_event_borrow_specific_context_field(
goto end;
}
- if (event_payload_fc->in_ir) {
+ if (event_payload_fc->in_ir && !notit->dry_run) {
BT_ASSERT(!notit->dscopes.event_payload);
notit->dscopes.event_payload =
bt_event_borrow_payload_field(
{
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;
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;
}
}
// 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);
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);
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)
{
next_field = bt_field_array_borrow_element_field_by_index(
base_field, index);
break;
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ 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);
next_field = bt_field_variant_borrow_selected_option_field(
base_field);
(uint64_t) int_fc->storing_index) = value;
}
- if (G_UNLIKELY(!fc->in_ir)) {
+ if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) {
goto end;
}
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_field_integer_unsigned_set_value(field, value);
stack_top(notit->stack)->index++;
end:
BT_ASSERT(!int_fc->mapped_clock_class);
BT_ASSERT(int_fc->storing_index < 0);
- if (G_UNLIKELY(!fc->in_ir)) {
+ if (G_UNLIKELY(!fc->in_ir || notit->dry_run)) {
goto end;
}
(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;
}
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_field_integer_signed_set_value(field, value);
stack_top(notit->stack)->index++;
end:
"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;
}
"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;
}
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;
}
"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;
}
"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;
}
"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;
}
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);
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,
+ 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: "
}
}
+end:
return length;
}
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(
+ ret = bt_field_variant_select_option_field_by_index(
var_field, option_index);
if (ret) {
BT_COMP_LOGW("Cannot select variant field's option field: "
*/
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:
BT_ASSERT(notit);
if (offset < 0) {
- BT_COMP_LOGE("Cannot seek to negative offset: offset=%jd", offset);
+ BT_COMP_LOGE("Cannot seek to negative offset: offset=%jd", (intmax_t) offset);
ret = BT_MSG_ITER_STATUS_INVAL;
goto end;
}
{
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;
+}
projects / babeltrace.git / blobdiff