struct bt_msg_iter *notit)
{
struct ctf_field_class *packet_header_fc = NULL;
- enum bt_msg_iter_status ret = BT_MSG_ITER_STATUS_OK;
+ 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:
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",
}
end:
- return ret;
+ return status;
}
static
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, "
}
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, bool use_default_cs)
+bt_message *create_msg_packet_beginning(struct bt_msg_iter *notit,
+ bool use_default_cs)
{
int ret;
- bt_message *msg = NULL;
+ bt_message *msg;
const bt_stream_class *sc = notit->meta.sc->ir_sc;
BT_ASSERT(notit->packet);
ret = bt_packet_move_context_field(
notit->packet, notit->packet_context_field);
if (ret) {
+ msg = NULL;
goto end;
}
goto end;
}
- *message = msg;
-
end:
- return;
+ return msg;
}
static
-void emit_delayed_packet_beg_msg(struct bt_msg_iter *notit,
- bt_message **message)
+bt_message *emit_delayed_packet_beg_msg(struct bt_msg_iter *notit)
{
bool packet_beg_ts_need_fix_up;
notit->default_clock_snapshot < notit->snapshots.beginning_clock;
/* create_msg_packet_beginning() logs errors */
- create_msg_packet_beginning(notit, message, packet_beg_ts_need_fix_up);
-
- return;
+ 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;
}
/*
* beginning message instead of the packet end message.
*/
if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) {
- emit_delayed_packet_beg_msg(notit, message);
+ msg = emit_delayed_packet_beg_msg(notit);
/* Don't forget to emit the packet end message. */
notit->state = STATE_EMIT_QUEUED_MSG_PACKET_END;
- return;
+ goto end;
}
/* Check if may be affected by lttng-crash timestamp_end quirk. */
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);
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)) {
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;
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
* beginning message instead of the event message.
*/
if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) {
- emit_delayed_packet_beg_msg(notit, message);
+ *message = emit_delayed_packet_beg_msg(notit);
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
}
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;
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;
break;
} else {
/* create_msg_packet_beginning() logs errors */
- create_msg_packet_beginning(notit, message, false);
+ *message = create_msg_packet_beginning(notit, false);
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
}
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;
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;
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;
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", (intmax_t) offset);
- ret = BT_MSG_ITER_STATUS_INVAL;
+ 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;
}
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;
}
}
notit->cur_packet_offset = offset;
end:
- return ret;
+ return status;
}
static
projects / babeltrace.git / blobdiff