From 83a5656aa74b692254e2580b03786dddb6ce092e Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 3 Jun 2019 11:28:34 -0400 Subject: [PATCH] lib: create_packet_message(): use pool to determine beginning or end msg The `is_beginning` parameter in create_packet_message() is redundant as the function can use `pool` and `msg_iter` to determine if it's creating a packet beginning or end message. Signed-off-by: Philippe Proulx Change-Id: I7f9b4183d004947895fba16b2e8396b8cb5be33a Reviewed-on: https://review.lttng.org/c/babeltrace/+/1363 Tested-by: jenkins Reviewed-by: Francis Deslauriers Reviewed-by: Simon Marchi --- lib/graph/message/packet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/graph/message/packet.c b/lib/graph/message/packet.c index df3e0e99..fe660531 100644 --- a/lib/graph/message/packet.c +++ b/lib/graph/message/packet.c @@ -82,7 +82,7 @@ static inline struct bt_message *create_packet_message( struct bt_self_component_port_input_message_iterator *msg_iter, struct bt_packet *packet, struct bt_object_pool *pool, - bool with_cs, bool is_beginning, uint64_t raw_value) + bool with_cs, uint64_t raw_value) { struct bt_message_packet *message = NULL; struct bt_stream *stream; @@ -96,7 +96,7 @@ struct bt_message *create_packet_message( stream_class = bt_stream_borrow_class(stream); BT_ASSERT(stream_class); - if (is_beginning) { + if (pool == &msg_iter->graph->packet_begin_msg_pool) { packet_has_default_clock_snapshot = stream_class->packets_have_default_beginning_clock_snapshot; } else { @@ -161,7 +161,7 @@ struct bt_message *bt_message_packet_beginning_create( BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator"); return create_packet_message(msg_iter, (void *) packet, - &msg_iter->graph->packet_begin_msg_pool, false, true, 0); + &msg_iter->graph->packet_begin_msg_pool, false, 0); } struct bt_message *bt_message_packet_beginning_create_with_default_clock_snapshot( @@ -173,7 +173,7 @@ struct bt_message *bt_message_packet_beginning_create_with_default_clock_snapsho BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator"); return create_packet_message(msg_iter, (void *) packet, - &msg_iter->graph->packet_begin_msg_pool, true, true, raw_value); + &msg_iter->graph->packet_begin_msg_pool, true, raw_value); } struct bt_message *bt_message_packet_end_create( @@ -185,7 +185,7 @@ struct bt_message *bt_message_packet_end_create( BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator"); return create_packet_message(msg_iter, (void *) packet, - &msg_iter->graph->packet_end_msg_pool, false, false, 0); + &msg_iter->graph->packet_end_msg_pool, false, 0); } struct bt_message *bt_message_packet_end_create_with_default_clock_snapshot( @@ -197,7 +197,7 @@ struct bt_message *bt_message_packet_end_create_with_default_clock_snapshot( BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator"); return create_packet_message(msg_iter, (void *) packet, - &msg_iter->graph->packet_end_msg_pool, true, false, raw_value); + &msg_iter->graph->packet_end_msg_pool, true, raw_value); } BT_HIDDEN -- 2.34.1