From: Francis Deslauriers Date: Tue, 18 Dec 2018 17:49:57 +0000 (-0500) Subject: Cleanup: remove bt_clock_snapshot_set_value_inline function X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=f0ebeace0134a23b7a85baa9da86394e99c33284 Cleanup: remove bt_clock_snapshot_set_value_inline function The `bt_clock_snapshot_set_value_inline` function used to be an augmented version of the `bt_clock_snapshot_set_raw_value` containing extra pre-condition checks. Those checks were removed by a previous commit titled: "CTF IR -> Trace IR" so this extra function is not needed anymore. Signed-off-by: Francis Deslauriers --- diff --git a/include/babeltrace/trace-ir/clock-snapshot-internal.h b/include/babeltrace/trace-ir/clock-snapshot-internal.h index a4b41ac2..364fe3cf 100644 --- a/include/babeltrace/trace-ir/clock-snapshot-internal.h +++ b/include/babeltrace/trace-ir/clock-snapshot-internal.h @@ -75,13 +75,6 @@ void bt_clock_snapshot_set_raw_value(struct bt_clock_snapshot *clock_snapshot, bt_clock_snapshot_set(clock_snapshot); } -static inline -void bt_clock_snapshot_set_value_inline(struct bt_clock_snapshot *clock_snapshot, - uint64_t raw_value) -{ - bt_clock_snapshot_set_raw_value(clock_snapshot, raw_value); -} - BT_HIDDEN void bt_clock_snapshot_destroy(struct bt_clock_snapshot *clock_snapshot); diff --git a/include/babeltrace/trace-ir/clock-snapshot-set-internal.h b/include/babeltrace/trace-ir/clock-snapshot-set-internal.h index 69412ca0..2adb52c1 100644 --- a/include/babeltrace/trace-ir/clock-snapshot-set-internal.h +++ b/include/babeltrace/trace-ir/clock-snapshot-set-internal.h @@ -141,7 +141,7 @@ int bt_clock_snapshot_set_set_clock_snapshot(struct bt_clock_snapshot_set *cs_se g_ptr_array_add(cs_set->clock_snapshots, clock_snapshot); } - bt_clock_snapshot_set_value_inline(clock_snapshot, raw_value); + bt_clock_snapshot_set_raw_value(clock_snapshot, raw_value); end: return ret; @@ -153,7 +153,7 @@ void bt_clock_snapshot_set_set_default_clock_snapshot( { BT_ASSERT(cs_set); BT_ASSERT(cs_set->default_cs); - bt_clock_snapshot_set_value_inline(cs_set->default_cs, raw_value); + bt_clock_snapshot_set_raw_value(cs_set->default_cs, raw_value); } #endif /* BABELTRACE_GRAPH_CLOCK_SNAPSHOT_SET_H */ diff --git a/lib/graph/message/inactivity.c b/lib/graph/message/inactivity.c index 7a766677..afab60dd 100644 --- a/lib/graph/message/inactivity.c +++ b/lib/graph/message/inactivity.c @@ -94,7 +94,7 @@ void bt_message_inactivity_set_default_clock_snapshot( BT_ASSERT_PRE_NON_NULL(msg, "Message"); BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_INACTIVITY); BT_ASSERT_PRE_HOT(msg, "Message", ": %!+n", msg); - bt_clock_snapshot_set_value_inline(inactivity->default_cs, value_cycles); + bt_clock_snapshot_set_raw_value(inactivity->default_cs, value_cycles); BT_LIB_LOGV("Set inactivity message's default clock snapshot: " "%![msg-]+n, value=%" PRIu64, msg, value_cycles); } diff --git a/lib/graph/message/stream.c b/lib/graph/message/stream.c index fe35f1f6..2bfa5600 100644 --- a/lib/graph/message/stream.c +++ b/lib/graph/message/stream.c @@ -123,7 +123,7 @@ void bt_message_stream_end_set_default_clock_snapshot( se_msg->default_cs = bt_clock_snapshot_create( se_msg->stream->class->default_clock_class); BT_ASSERT(se_msg->default_cs); - bt_clock_snapshot_set_value_inline(se_msg->default_cs, value_cycles); + bt_clock_snapshot_set_raw_value(se_msg->default_cs, value_cycles); BT_LIB_LOGV("Set message's default clock snapshot: %![msg-]+n, " "value=%" PRIu64, value_cycles); } @@ -228,7 +228,7 @@ void bt_message_stream_beginning_set_default_clock_snapshot( sb_msg->default_cs = bt_clock_snapshot_create( sb_msg->stream->class->default_clock_class); BT_ASSERT(sb_msg->default_cs); - bt_clock_snapshot_set_value_inline(sb_msg->default_cs, value_cycles); + bt_clock_snapshot_set_raw_value(sb_msg->default_cs, value_cycles); BT_LIB_LOGV("Set message's default clock snapshot: %![msg-]+n, " "value=%" PRIu64, value_cycles); } diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c index e245d793..1badd83a 100644 --- a/lib/trace-ir/event.c +++ b/lib/trace-ir/event.c @@ -257,7 +257,7 @@ void bt_event_set_default_clock_snapshot(struct bt_event *event, "Event's stream class has no default clock class: " "%![ev-]+e, %![sc-]+S", event, sc); BT_ASSERT(event->default_cs); - bt_clock_snapshot_set_value_inline(event->default_cs, value_cycles); + bt_clock_snapshot_set_raw_value(event->default_cs, value_cycles); BT_LIB_LOGV("Set event's default clock snapshot: %![event-]+e, " "value=%" PRIu64, event, value_cycles); } diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c index 5a8f8156..f3e27dd2 100644 --- a/lib/trace-ir/packet.c +++ b/lib/trace-ir/packet.c @@ -332,7 +332,7 @@ void bt_packet_set_default_beginning_clock_snapshot(struct bt_packet *packet, "no default beginning clock snapshot: %![packet-]+a, %![sc-]+S", packet, sc); BT_ASSERT(packet->default_beginning_cs); - bt_clock_snapshot_set_value_inline(packet->default_beginning_cs, + bt_clock_snapshot_set_raw_value(packet->default_beginning_cs, value_cycles); BT_LIB_LOGV("Set packet's default beginning clock snapshot: " "%![packet-]+a, value=%" PRIu64, packet, value_cycles); @@ -365,7 +365,7 @@ void bt_packet_set_default_end_clock_snapshot(struct bt_packet *packet, "no default end clock snapshot: %![packet-]+a, %![sc-]+S", packet, sc); BT_ASSERT(packet->default_end_cs); - bt_clock_snapshot_set_value_inline(packet->default_end_cs, value_cycles); + bt_clock_snapshot_set_raw_value(packet->default_end_cs, value_cycles); BT_LIB_LOGV("Set packet's default end clock snapshot: " "%![packet-]+a, value=%" PRIu64, packet, value_cycles); }