BT_LOGV_MEM(buffer_addr, buffer_sz, "Returned bytes at %p:",
buffer_addr);
} else if (m_status == BT_NOTIF_ITER_MEDIUM_STATUS_EOF) {
- struct bt_field_type *ph_ft =
- bt_trace_get_packet_header_type(notit->meta.trace);
- struct bt_field_type *eh_ft = NULL;
- struct bt_field_type *sec_ft = NULL;
- struct bt_field_type *ec_ft = NULL;
-
/*
* User returned end of stream: validate that we're not
* in the middle of a packet header, packet context, or
* event.
*/
- if (notit->state == STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN) {
- /* Beginning of packet: always valid */
- goto good_state;
- }
-
- if (!notit->meta.stream_class) {
- goto bad_state;
- }
-
- if (notit->state == STATE_DSCOPE_STREAM_PACKET_CONTEXT_BEGIN) {
- /*
- * Beginning of packet context context is only
- * valid if there's no packet header.
- */
- if (!ph_ft) {
- goto good_state;
- }
- }
-
- eh_ft = bt_stream_class_get_event_header_type(
- notit->meta.stream_class);
- sec_ft = bt_stream_class_get_event_context_type(
- notit->meta.stream_class);
-
- if (notit->state == STATE_DSCOPE_STREAM_EVENT_HEADER_BEGIN) {
- /*
- * Beginning of event's header is only valid if
- * the packet is not supposed to have a specific
- * size (whole packet sequence has in fact only
- * one packet).
- */
- if (notit->cur_packet_size == -1) {
- goto good_state;
+ if (notit->cur_packet_size >= 0) {
+ if (packet_at(notit) == notit->cur_packet_size) {
+ goto end;
}
- }
-
- if (notit->state == STATE_DSCOPE_STREAM_EVENT_CONTEXT_BEGIN) {
- /*
- * Beginning of event's stream event context is
- * only valid if the packet is not supposed to
- * have a specific size (whole packet sequence
- * has in fact only one packet), and there's no
- * event header.
- */
- if (notit->cur_packet_size == -1 && !eh_ft) {
- goto good_state;
- }
- }
-
- if (!notit->meta.event_class) {
- goto bad_state;
- }
-
- ec_ft = bt_event_class_get_context_type(
- notit->meta.event_class);
-
- if (notit->state == STATE_DSCOPE_EVENT_CONTEXT_BEGIN) {
- /*
- * Beginning of event's context is only valid if
- * the packet is not supposed to have a specific
- * size (whole packet sequence has in fact only
- * one packet), and there's no event header and
- * no stream event context.
- */
- if (notit->cur_packet_size == -1 && !eh_ft && !sec_ft) {
- goto good_state;
+ } else {
+ if (packet_at(notit) == 0) {
+ goto end;
}
- }
- if (notit->state == STATE_DSCOPE_EVENT_PAYLOAD_BEGIN) {
- /*
- * Beginning of event's context is only valid if
- * the packet is not supposed to have a specific
- * size (whole packet sequence has in fact only
- * one packet), and there's no event header, no
- * stream event context, and no event context.
- */
- if (notit->cur_packet_size == -1 && !eh_ft && !sec_ft &&
- !ec_ft) {
- goto good_state;
+ if (notit->buf.last_eh_at != SIZE_MAX &&
+ notit->buf.at == notit->buf.last_eh_at) {
+ goto end;
}
}
-bad_state:
/* All other states are invalid */
BT_LOGW("User function returned %s, but notification iterator is in an unexpected state: "
- "state=%s",
+ "state=%s, cur-packet-size=%" PRId64 ", cur=%zu, "
+ "packet-cur=%zu, last-eh-at=%zu",
bt_notif_iter_medium_status_string(m_status),
- state_string(notit->state));
+ state_string(notit->state),
+ notit->cur_packet_size,
+ notit->buf.at, packet_at(notit),
+ notit->buf.last_eh_at);
m_status = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR;
-
-good_state:
- bt_put(ph_ft);
- bt_put(eh_ft);
- bt_put(sec_ft);
- bt_put(ec_ft);
} else if (m_status < 0) {
BT_LOGW("User function failed: status=%s",
bt_notif_iter_medium_status_string(m_status));
}
+end:
return notif_iter_status_from_m_status(m_status);
}
enum bt_btr_status btr_status;
size_t consumed_bits;
- status = buf_ensure_available_bits(notit);
- if (status != BT_NOTIF_ITER_STATUS_OK) {
- if (status < 0) {
- BT_LOGW("Cannot ensure that buffer has at least one byte: "
- "notif-addr=%p, status=%s",
- notit, bt_notif_iter_status_string(status));
- } else {
- BT_LOGV("Cannot ensure that buffer has at least one byte: "
- "notif-addr=%p, status=%s",
- notit, bt_notif_iter_status_string(status));
- }
-
- goto end;
- }
-
bt_put(*dscope_field);
notit->cur_dscope_field = dscope_field;
BT_LOGV("Starting BTR: notit-addr=%p, btr-addr=%p, ft-addr=%p",
enum bt_btr_status btr_status;
size_t consumed_bits;
+ BT_LOGV("Continuing BTR: notit-addr=%p, btr-addr=%p",
+ notit, notit->btr);
+
status = buf_ensure_available_bits(notit);
if (status != BT_NOTIF_ITER_STATUS_OK) {
if (status < 0) {
goto end;
}
- BT_LOGV("Continuing BTR: notit-addr=%p, btr-addr=%p",
- notit, notit->btr);
+
consumed_bits = bt_btr_continue(notit->btr, notit->buf.addr,
notit->buf.sz, &btr_status);
BT_LOGV("BTR consumed bits: size=%zu", consumed_bits);
projects / babeltrace.git / blobdiff