Those functions have a void return type but are returning the created
message using an output parameter.
Make them return the message instead.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Iff60a9436818f38d5b5046b921c0d53cdc1f2c66
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2307
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
-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_ASSERT(notit->stream);
BT_ASSERT(notit->msg_iter);
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,
BT_COMP_LOGE("Cannot create stream beginning message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
BT_COMP_LOGE("Cannot create stream beginning message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
-void create_msg_stream_end(struct bt_msg_iter *notit, bt_message **message)
+bt_message *create_msg_stream_end(struct bt_msg_iter *notit)
if (!notit->stream) {
BT_COMP_LOGE("Cannot create stream for stream message: "
"notit-addr=%p", notit);
if (!notit->stream) {
BT_COMP_LOGE("Cannot create stream for stream message: "
"notit-addr=%p", notit);
+ msg = NULL;
+ goto end;
}
BT_ASSERT(notit->msg_iter);
}
BT_ASSERT(notit->msg_iter);
- ret = bt_message_stream_end_create(notit->msg_iter,
+ msg = bt_message_stream_end_create(notit->msg_iter,
BT_COMP_LOGE("Cannot create stream end message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
BT_COMP_LOGE("Cannot create stream end message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
-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)
- bt_message *msg = NULL;
const bt_stream_class *sc = notit->meta.sc->ir_sc;
BT_ASSERT(notit->packet);
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) {
ret = bt_packet_move_context_field(
notit->packet, notit->packet_context_field);
if (ret) {
-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;
{
bool packet_beg_ts_need_fix_up;
notit->default_clock_snapshot < notit->snapshots.beginning_clock;
/* create_msg_packet_beginning() logs errors */
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);
-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) {
{
bt_message *msg;
bool update_default_cs = true;
if (!notit->packet) {
+ msg = NULL;
+ goto end;
* beginning message instead of the packet end message.
*/
if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) {
* 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;
/* Don't forget to emit the packet end message. */
notit->state = STATE_EMIT_QUEUED_MSG_PACKET_END;
}
/* Check if may be affected by lttng-crash timestamp_end quirk. */
}
/* 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);
BT_COMP_LOGE("Cannot create packet end message: "
"notit-addr=%p, packet-addr=%p",
notit, notit->packet);
}
BT_PACKET_PUT_REF_AND_RESET(notit->packet);
}
BT_PACKET_PUT_REF_AND_RESET(notit->packet);
-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_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);
BT_COMP_LOGE("Cannot create discarded events message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
}
if (notit->prev_packet_snapshots.discarded_events != UINT64_C(-1)) {
}
if (notit->prev_packet_snapshots.discarded_events != UINT64_C(-1)) {
notit->prev_packet_snapshots.discarded_events);
}
notit->prev_packet_snapshots.discarded_events);
}
-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_COMP_LOGE("Cannot create discarded packets message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
BT_COMP_LOGE("Cannot create discarded packets message: "
"notit-addr=%p, stream-addr=%p",
notit, notit->stream);
}
bt_message_discarded_packets_set_count(msg,
notit->snapshots.packets -
notit->prev_packet_snapshots.packets - 1);
}
bt_message_discarded_packets_set_count(msg,
notit->snapshots.packets -
notit->prev_packet_snapshots.packets - 1);
* beginning message instead of the event message.
*/
if (G_UNLIKELY(notit->emit_delayed_packet_beginning_msg)) {
* 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;
}
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
}
goto end;
case STATE_EMIT_MSG_DISCARDED_EVENTS:
/* create_msg_discared_events() logs errors */
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;
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
goto end;
case STATE_EMIT_MSG_DISCARDED_PACKETS:
/* create_msg_discared_packets() logs errors */
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;
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
break;
} else {
/* create_msg_packet_beginning() logs errors */
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;
}
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 */
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;
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
goto end;
case STATE_EMIT_MSG_STREAM_BEGINNING:
/* create_msg_stream_beginning() logs errors */
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;
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;
goto end;
case STATE_EMIT_MSG_STREAM_END:
/* create_msg_stream_end() logs errors */
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;
if (!*message) {
status = BT_MSG_ITER_STATUS_ERROR;