From 9b24b6aa4258079f2b59fa156dd3e070969f6f2a Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 3 Jun 2019 16:23:07 -0400 Subject: [PATCH] Rename "default beginning/end CS" -> "beginning/end default CS" Because the target is the "default clock", it makes more sense to keep those words together and have the beginning/end adjective outside. Suggested-by: Simon Marchi Signed-off-by: Philippe Proulx Change-Id: I9fdd32c6acefc51b63b322dc41470c50b9226dfa Reviewed-on: https://review.lttng.org/c/babeltrace/+/1369 Tested-by: jenkins Reviewed-by: Simon Marchi --- bindings/python/bt2/bt2/message.py | 8 +++---- bindings/python/bt2/bt2/message_iterator.py | 4 ++-- bindings/python/bt2/bt2/native_bt_message.i | 8 +++---- .../python/bt2/bt2/native_bt_stream_class.i | 8 +++---- bindings/python/bt2/bt2/stream_class.py | 20 ++++++++-------- bindings/python/bt2/bt2/trace_class.py | 8 +++---- .../graph/message-discarded-events-const.h | 4 ++-- .../graph/message-discarded-packets-const.h | 4 ++-- .../babeltrace/trace-ir/stream-class-const.h | 4 ++-- .../trace-ir/stream-class-internal.h | 4 ++-- include/babeltrace/trace-ir/stream-class.h | 4 ++-- lib/graph/message/discarded-items.c | 20 ++++++++-------- lib/graph/message/packet.c | 4 ++-- lib/lib-logging.c | 4 ++-- lib/trace-ir/stream-class.c | 16 ++++++------- .../ctf/common/metadata/ctf-meta-translate.c | 4 ++-- plugins/ctf/fs-sink/fs-sink-ctf-meta.h | 4 ++-- plugins/ctf/fs-sink/fs-sink.c | 12 +++++----- plugins/ctf/lttng-live/lttng-live.c | 4 ++-- plugins/lttng-utils/debug-info/debug-info.c | 12 +++++----- .../debug-info/trace-ir-metadata-copy.c | 8 +++---- plugins/text/dmesg/dmesg.c | 4 ++-- plugins/text/pretty/print.c | 8 +++---- plugins/utils/muxer/muxer.c | 8 +++---- plugins/utils/trimmer/trimmer.c | 16 ++++++------- tests/bindings/python/bt2/test_clock_class.py | 4 ++-- tests/bindings/python/bt2/test_message.py | 4 ++-- .../bindings/python/bt2/test_stream_class.py | 24 +++++++++---------- 28 files changed, 116 insertions(+), 116 deletions(-) diff --git a/bindings/python/bt2/bt2/message.py b/bindings/python/bt2/bt2/message.py index fdce1f89..179a38ff 100644 --- a/bindings/python/bt2/bt2/message.py +++ b/bindings/python/bt2/bt2/message.py @@ -202,8 +202,8 @@ class _DiscardedEventsMessage(_DiscardedMessage): _borrow_stream_ptr = staticmethod(native_bt.message_discarded_events_borrow_stream_const) _get_count = staticmethod(native_bt.message_discarded_events_get_count) _set_count = staticmethod(native_bt.message_discarded_events_set_count) - _borrow_beginning_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_events_borrow_default_beginning_clock_snapshot_const) - _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_events_borrow_default_end_clock_snapshot_const) + _borrow_beginning_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_events_borrow_beginning_default_clock_snapshot_const) + _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_events_borrow_end_default_clock_snapshot_const) @property def _has_default_clock_snapshots(self): @@ -214,8 +214,8 @@ class _DiscardedPacketsMessage(_DiscardedMessage): _borrow_stream_ptr = staticmethod(native_bt.message_discarded_packets_borrow_stream_const) _get_count = staticmethod(native_bt.message_discarded_packets_get_count) _set_count = staticmethod(native_bt.message_discarded_packets_set_count) - _borrow_beginning_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_packets_borrow_default_beginning_clock_snapshot_const) - _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_packets_borrow_default_end_clock_snapshot_const) + _borrow_beginning_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_packets_borrow_beginning_default_clock_snapshot_const) + _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_packets_borrow_end_default_clock_snapshot_const) @property def _has_default_clock_snapshots(self): diff --git a/bindings/python/bt2/bt2/message_iterator.py b/bindings/python/bt2/bt2/message_iterator.py index fad4c4d6..26ec4091 100644 --- a/bindings/python/bt2/bt2/message_iterator.py +++ b/bindings/python/bt2/bt2/message_iterator.py @@ -232,7 +232,7 @@ class _UserMessageIterator(_MessageIterator): def _create_packet_beginning_message(self, packet, default_clock_snapshot=None): utils._check_type(packet, bt2.packet._Packet) - if packet.stream.stream_class.packets_have_default_beginning_clock_snapshot: + if packet.stream.stream_class.packets_have_beginning_default_clock_snapshot: if default_clock_snapshot is None: raise ValueError("packet beginning messages in this stream must have a default clock snapshots") @@ -253,7 +253,7 @@ class _UserMessageIterator(_MessageIterator): def _create_packet_end_message(self, packet, default_clock_snapshot=None): utils._check_type(packet, bt2.packet._Packet) - if packet.stream.stream_class.packets_have_default_end_clock_snapshot: + if packet.stream.stream_class.packets_have_end_default_clock_snapshot: if default_clock_snapshot is None: raise ValueError("packet end messages in this stream must have a default clock snapshots") diff --git a/bindings/python/bt2/bt2/native_bt_message.i b/bindings/python/bt2/bt2/native_bt_message.i index 2c3f850e..0c81b938 100644 --- a/bindings/python/bt2/bt2/native_bt_message.i +++ b/bindings/python/bt2/bt2/native_bt_message.i @@ -265,11 +265,11 @@ extern bt_stream *bt_message_stream_activity_end_borrow_stream( /* From message-discarded-events-const.h */ extern const bt_clock_snapshot * -bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_snapshot * -bt_message_discarded_events_borrow_default_end_clock_snapshot_const( +bt_message_discarded_events_borrow_end_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_class * @@ -302,11 +302,11 @@ extern void bt_message_discarded_events_set_count(bt_message *message, /* From message-discarded-packets-const.h */ extern const bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( +bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_class * diff --git a/bindings/python/bt2/bt2/native_bt_stream_class.i b/bindings/python/bt2/bt2/native_bt_stream_class.i index 7538ae35..e5927043 100644 --- a/bindings/python/bt2/bt2/native_bt_stream_class.i +++ b/bindings/python/bt2/bt2/native_bt_stream_class.i @@ -41,10 +41,10 @@ extern bt_bool bt_stream_class_assigns_automatic_event_class_id( extern bt_bool bt_stream_class_assigns_automatic_stream_id( const bt_stream_class *stream_class); -extern bt_bool bt_stream_class_packets_have_default_beginning_clock_snapshot( +extern bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot( const bt_stream_class *stream_class); -extern bt_bool bt_stream_class_packets_have_default_end_clock_snapshot( +extern bt_bool bt_stream_class_packets_have_end_default_clock_snapshot( const bt_stream_class *stream_class); extern bt_bool bt_stream_class_supports_discarded_events( @@ -109,10 +109,10 @@ extern void bt_stream_class_set_assigns_automatic_event_class_id( extern void bt_stream_class_set_assigns_automatic_stream_id( bt_stream_class *stream_class, bt_bool value); -extern void bt_stream_class_set_packets_have_default_beginning_clock_snapshot( +extern void bt_stream_class_set_packets_have_beginning_default_clock_snapshot( bt_stream_class *stream_class, bt_bool value); -extern void bt_stream_class_set_packets_have_default_end_clock_snapshot( +extern void bt_stream_class_set_packets_have_end_default_clock_snapshot( bt_stream_class *stream_class, bt_bool value); extern void bt_stream_class_set_supports_discarded_events( diff --git a/bindings/python/bt2/bt2/stream_class.py b/bindings/python/bt2/bt2/stream_class.py index 20dd006c..048cb70d 100644 --- a/bindings/python/bt2/bt2/stream_class.py +++ b/bindings/python/bt2/bt2/stream_class.py @@ -129,24 +129,24 @@ class StreamClass(object._SharedObject, collections.abc.Mapping): _assigns_automatic_stream_id = property(fset=_assigns_automatic_stream_id) @property - def packets_have_default_beginning_clock_snapshot(self): - return native_bt.stream_class_packets_have_default_beginning_clock_snapshot(self._ptr) + def packets_have_beginning_default_clock_snapshot(self): + return native_bt.stream_class_packets_have_beginning_default_clock_snapshot(self._ptr) - def _packets_have_default_beginning_clock_snapshot(self, value): + def _packets_have_beginning_default_clock_snapshot(self, value): utils._check_bool(value) - native_bt.stream_class_set_packets_have_default_beginning_clock_snapshot(self._ptr, value) + native_bt.stream_class_set_packets_have_beginning_default_clock_snapshot(self._ptr, value) - _packets_have_default_beginning_clock_snapshot = property(fset=_packets_have_default_beginning_clock_snapshot) + _packets_have_beginning_default_clock_snapshot = property(fset=_packets_have_beginning_default_clock_snapshot) @property - def packets_have_default_end_clock_snapshot(self): - return native_bt.stream_class_packets_have_default_end_clock_snapshot(self._ptr) + def packets_have_end_default_clock_snapshot(self): + return native_bt.stream_class_packets_have_end_default_clock_snapshot(self._ptr) - def _packets_have_default_end_clock_snapshot(self, value): + def _packets_have_end_default_clock_snapshot(self, value): utils._check_bool(value) - native_bt.stream_class_set_packets_have_default_end_clock_snapshot(self._ptr, value) + native_bt.stream_class_set_packets_have_end_default_clock_snapshot(self._ptr, value) - _packets_have_default_end_clock_snapshot = property(fset=_packets_have_default_end_clock_snapshot) + _packets_have_end_default_clock_snapshot = property(fset=_packets_have_end_default_clock_snapshot) @property def supports_discarded_events(self): diff --git a/bindings/python/bt2/bt2/trace_class.py b/bindings/python/bt2/bt2/trace_class.py index a28a20ea..40783b41 100644 --- a/bindings/python/bt2/bt2/trace_class.py +++ b/bindings/python/bt2/bt2/trace_class.py @@ -171,8 +171,8 @@ class TraceClass(object._SharedObject, collections.abc.Mapping): default_clock_class=None, assigns_automatic_event_class_id=True, assigns_automatic_stream_id=True, - packets_have_default_beginning_clock_snapshot=False, - packets_have_default_end_clock_snapshot=False, + packets_have_beginning_default_clock_snapshot=False, + packets_have_end_default_clock_snapshot=False, supports_discarded_events=False, discarded_events_have_default_clock_snapshots=False, supports_discarded_packets=False, @@ -206,8 +206,8 @@ class TraceClass(object._SharedObject, collections.abc.Mapping): sc._assigns_automatic_event_class_id = assigns_automatic_event_class_id sc._assigns_automatic_stream_id = assigns_automatic_stream_id - sc._packets_have_default_beginning_clock_snapshot = packets_have_default_beginning_clock_snapshot - sc._packets_have_default_end_clock_snapshot = packets_have_default_end_clock_snapshot + sc._packets_have_beginning_default_clock_snapshot = packets_have_beginning_default_clock_snapshot + sc._packets_have_end_default_clock_snapshot = packets_have_end_default_clock_snapshot sc._set_supports_discarded_events(supports_discarded_events, discarded_events_have_default_clock_snapshots) sc._set_supports_discarded_packets(supports_discarded_packets, diff --git a/include/babeltrace/graph/message-discarded-events-const.h b/include/babeltrace/graph/message-discarded-events-const.h index 0ac57439..37a7bd69 100644 --- a/include/babeltrace/graph/message-discarded-events-const.h +++ b/include/babeltrace/graph/message-discarded-events-const.h @@ -31,11 +31,11 @@ extern "C" { #endif extern const bt_clock_snapshot * -bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_snapshot * -bt_message_discarded_events_borrow_default_end_clock_snapshot_const( +bt_message_discarded_events_borrow_end_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_class * diff --git a/include/babeltrace/graph/message-discarded-packets-const.h b/include/babeltrace/graph/message-discarded-packets-const.h index 4c80b528..2ca8434a 100644 --- a/include/babeltrace/graph/message-discarded-packets-const.h +++ b/include/babeltrace/graph/message-discarded-packets-const.h @@ -31,11 +31,11 @@ extern "C" { #endif extern const bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( +bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( const bt_message *msg); extern const bt_clock_class * diff --git a/include/babeltrace/trace-ir/stream-class-const.h b/include/babeltrace/trace-ir/stream-class-const.h index 6b84ead5..84a4ba77 100644 --- a/include/babeltrace/trace-ir/stream-class-const.h +++ b/include/babeltrace/trace-ir/stream-class-const.h @@ -56,10 +56,10 @@ extern bt_bool bt_stream_class_assigns_automatic_event_class_id( extern bt_bool bt_stream_class_assigns_automatic_stream_id( const bt_stream_class *stream_class); -extern bt_bool bt_stream_class_packets_have_default_beginning_clock_snapshot( +extern bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot( const bt_stream_class *stream_class); -extern bt_bool bt_stream_class_packets_have_default_end_clock_snapshot( +extern bt_bool bt_stream_class_packets_have_end_default_clock_snapshot( const bt_stream_class *stream_class); extern bt_bool bt_stream_class_supports_discarded_events( diff --git a/include/babeltrace/trace-ir/stream-class-internal.h b/include/babeltrace/trace-ir/stream-class-internal.h index b996d969..2f806ffc 100644 --- a/include/babeltrace/trace-ir/stream-class-internal.h +++ b/include/babeltrace/trace-ir/stream-class-internal.h @@ -48,8 +48,8 @@ struct bt_stream_class { uint64_t id; bool assigns_automatic_event_class_id; bool assigns_automatic_stream_id; - bool packets_have_default_beginning_clock_snapshot; - bool packets_have_default_end_clock_snapshot; + bool packets_have_beginning_default_clock_snapshot; + bool packets_have_end_default_clock_snapshot; bool supports_discarded_events; bool supports_discarded_packets; bool discarded_events_have_default_clock_snapshots; diff --git a/include/babeltrace/trace-ir/stream-class.h b/include/babeltrace/trace-ir/stream-class.h index c7e1fb7f..ca130a0c 100644 --- a/include/babeltrace/trace-ir/stream-class.h +++ b/include/babeltrace/trace-ir/stream-class.h @@ -60,10 +60,10 @@ extern void bt_stream_class_set_assigns_automatic_event_class_id( extern void bt_stream_class_set_assigns_automatic_stream_id( bt_stream_class *stream_class, bt_bool value); -extern void bt_stream_class_set_packets_have_default_beginning_clock_snapshot( +extern void bt_stream_class_set_packets_have_beginning_default_clock_snapshot( bt_stream_class *stream_class, bt_bool value); -extern void bt_stream_class_set_packets_have_default_end_clock_snapshot( +extern void bt_stream_class_set_packets_have_end_default_clock_snapshot( bt_stream_class *stream_class, bt_bool value); extern void bt_stream_class_set_supports_discarded_events( diff --git a/lib/graph/message/discarded-items.c b/lib/graph/message/discarded-items.c index a6924aae..9a8b0a1d 100644 --- a/lib/graph/message/discarded-items.c +++ b/lib/graph/message/discarded-items.c @@ -183,7 +183,7 @@ enum bt_property_availability get_discarded_items_message_count( static inline const struct bt_clock_snapshot * -borrow_discarded_items_message_default_beginning_clock_snapshot_const( +borrow_discarded_items_message_beginning_default_clock_snapshot_const( const struct bt_message *message) { struct bt_message_discarded_items *disc_items_msg = (void *) message; @@ -198,7 +198,7 @@ borrow_discarded_items_message_default_beginning_clock_snapshot_const( static inline const struct bt_clock_snapshot * -borrow_discarded_items_message_default_end_clock_snapshot_const( +borrow_discarded_items_message_end_default_clock_snapshot_const( const struct bt_message *message) { struct bt_message_discarded_items *disc_items_msg = (void *) message; @@ -247,22 +247,22 @@ void bt_message_discarded_events_set_count(struct bt_message *message, } const struct bt_clock_snapshot * -bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( const struct bt_message *msg) { BT_ASSERT_PRE_NON_NULL(msg, "Message"); BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_DISCARDED_EVENTS); - return borrow_discarded_items_message_default_beginning_clock_snapshot_const( + return borrow_discarded_items_message_beginning_default_clock_snapshot_const( msg); } const struct bt_clock_snapshot * -bt_message_discarded_events_borrow_default_end_clock_snapshot_const( +bt_message_discarded_events_borrow_end_default_clock_snapshot_const( const struct bt_message *msg) { BT_ASSERT_PRE_NON_NULL(msg, "Message"); BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_DISCARDED_EVENTS); - return borrow_discarded_items_message_default_end_clock_snapshot_const( + return borrow_discarded_items_message_end_default_clock_snapshot_const( msg); } @@ -317,22 +317,22 @@ void bt_message_discarded_packets_set_count(struct bt_message *message, } const struct bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( +bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( const struct bt_message *msg) { BT_ASSERT_PRE_NON_NULL(msg, "Message"); BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_DISCARDED_PACKETS); - return borrow_discarded_items_message_default_beginning_clock_snapshot_const( + return borrow_discarded_items_message_beginning_default_clock_snapshot_const( msg); } const struct bt_clock_snapshot * -bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( +bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( const struct bt_message *msg) { BT_ASSERT_PRE_NON_NULL(msg, "Message"); BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_DISCARDED_PACKETS); - return borrow_discarded_items_message_default_end_clock_snapshot_const( + return borrow_discarded_items_message_end_default_clock_snapshot_const( msg); } diff --git a/lib/graph/message/packet.c b/lib/graph/message/packet.c index 94047895..070a56c5 100644 --- a/lib/graph/message/packet.c +++ b/lib/graph/message/packet.c @@ -98,10 +98,10 @@ struct bt_message *create_packet_message( if (pool == &msg_iter->graph->packet_begin_msg_pool) { packet_has_default_clock_snapshot = - stream_class->packets_have_default_beginning_clock_snapshot; + stream_class->packets_have_beginning_default_clock_snapshot; } else { packet_has_default_clock_snapshot = - stream_class->packets_have_default_end_clock_snapshot; + stream_class->packets_have_end_default_clock_snapshot; } /* diff --git a/lib/lib-logging.c b/lib/lib-logging.c index c966648f..a516cb84 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -543,8 +543,8 @@ static inline void format_stream_class(char **buf_ch, bool extended, "%sdiscarded-packets-have-default-cs=%d", PRFIELD(stream_class->assigns_automatic_event_class_id), PRFIELD(stream_class->assigns_automatic_stream_id), - PRFIELD(stream_class->packets_have_default_beginning_clock_snapshot), - PRFIELD(stream_class->packets_have_default_end_clock_snapshot), + PRFIELD(stream_class->packets_have_beginning_default_clock_snapshot), + PRFIELD(stream_class->packets_have_end_default_clock_snapshot), PRFIELD(stream_class->supports_discarded_events), PRFIELD(stream_class->discarded_events_have_default_clock_snapshots), PRFIELD(stream_class->supports_discarded_packets), diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index 0f333869..ebe3a1cc 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -451,41 +451,41 @@ void bt_stream_class_set_assigns_automatic_event_class_id( "assignment property: %!+S", stream_class); } -bt_bool bt_stream_class_packets_have_default_beginning_clock_snapshot( +bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot( const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - return (bt_bool) stream_class->packets_have_default_beginning_clock_snapshot; + return (bt_bool) stream_class->packets_have_beginning_default_clock_snapshot; } -void bt_stream_class_set_packets_have_default_beginning_clock_snapshot( +void bt_stream_class_set_packets_have_beginning_default_clock_snapshot( struct bt_stream_class *stream_class, bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(!value || stream_class->default_clock_class, "Stream class has no default clock class: %!+S", stream_class); - stream_class->packets_have_default_beginning_clock_snapshot = + stream_class->packets_have_beginning_default_clock_snapshot = (bool) value; BT_LIB_LOGV("Set stream class's \"packets have default beginning " "clock snapshot\" property: %!+S", stream_class); } -bt_bool bt_stream_class_packets_have_default_end_clock_snapshot( +bt_bool bt_stream_class_packets_have_end_default_clock_snapshot( const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - return (bt_bool) stream_class->packets_have_default_end_clock_snapshot; + return (bt_bool) stream_class->packets_have_end_default_clock_snapshot; } -void bt_stream_class_set_packets_have_default_end_clock_snapshot( +void bt_stream_class_set_packets_have_end_default_clock_snapshot( struct bt_stream_class *stream_class, bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(!value || stream_class->default_clock_class, "Stream class has no default clock class: %!+S", stream_class); - stream_class->packets_have_default_end_clock_snapshot = + stream_class->packets_have_end_default_clock_snapshot = (bool) value; BT_LIB_LOGV("Set stream class's \"packets have default end " "clock snapshot\" property: %!+S", stream_class); diff --git a/plugins/ctf/common/metadata/ctf-meta-translate.c b/plugins/ctf/common/metadata/ctf-meta-translate.c index 2bf1d0b7..5c2623a4 100644 --- a/plugins/ctf/common/metadata/ctf-meta-translate.c +++ b/plugins/ctf/common/metadata/ctf-meta-translate.c @@ -487,9 +487,9 @@ void ctf_stream_class_to_ir(struct ctx *ctx) BT_ASSERT(ret == 0); } - bt_stream_class_set_packets_have_default_beginning_clock_snapshot( + bt_stream_class_set_packets_have_beginning_default_clock_snapshot( ctx->ir_sc, ctx->sc->packets_have_ts_begin); - bt_stream_class_set_packets_have_default_end_clock_snapshot( + bt_stream_class_set_packets_have_end_default_clock_snapshot( ctx->ir_sc, ctx->sc->packets_have_ts_end); bt_stream_class_set_supports_discarded_events(ctx->ir_sc, ctx->sc->has_discarded_events, diff --git a/plugins/ctf/fs-sink/fs-sink-ctf-meta.h b/plugins/ctf/fs-sink/fs-sink-ctf-meta.h index 04ef5afb..3bc55855 100644 --- a/plugins/ctf/fs-sink/fs-sink-ctf-meta.h +++ b/plugins/ctf/fs-sink/fs-sink-ctf-meta.h @@ -737,10 +737,10 @@ struct fs_sink_ctf_stream_class *fs_sink_ctf_stream_class_create( g_direct_equal); BT_ASSERT(sc->event_classes_from_ir); sc->packets_have_ts_begin = - bt_stream_class_packets_have_default_beginning_clock_snapshot( + bt_stream_class_packets_have_beginning_default_clock_snapshot( ir_sc); sc->packets_have_ts_end = - bt_stream_class_packets_have_default_end_clock_snapshot(ir_sc); + bt_stream_class_packets_have_end_default_clock_snapshot(ir_sc); sc->has_discarded_events = bt_stream_class_supports_discarded_events(ir_sc); diff --git a/plugins/ctf/fs-sink/fs-sink.c b/plugins/ctf/fs-sink/fs-sink.c index 0d79c992..5f04496f 100644 --- a/plugins/ctf/fs-sink/fs-sink.c +++ b/plugins/ctf/fs-sink/fs-sink.c @@ -526,8 +526,8 @@ bt_self_component_status handle_stream_beginning_msg( bt_stream_borrow_class_const(ir_stream); struct fs_sink_stream *stream; bool packets_have_beginning_end_cs = - bt_stream_class_packets_have_default_beginning_clock_snapshot(ir_sc) && - bt_stream_class_packets_have_default_end_clock_snapshot(ir_sc); + bt_stream_class_packets_have_beginning_default_clock_snapshot(ir_sc) && + bt_stream_class_packets_have_end_default_clock_snapshot(ir_sc); /* * Not supported: discarded events with default clock snapshots, @@ -682,12 +682,12 @@ bt_self_component_status handle_discarded_events_msg( * The clock snapshot values will be validated when * handling the next "packet beginning" message. */ - cs = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + cs = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); BT_ASSERT(cs); stream->discarded_events_state.beginning_cs = bt_clock_snapshot_get_value(cs); - cs = bt_message_discarded_events_borrow_default_end_clock_snapshot_const( + cs = bt_message_discarded_events_borrow_end_default_clock_snapshot_const( msg); BT_ASSERT(cs); stream->discarded_events_state.end_cs = bt_clock_snapshot_get_value(cs); @@ -756,12 +756,12 @@ bt_self_component_status handle_discarded_packets_msg( * The clock snapshot values will be validated when * handling the next "packet beginning" message. */ - cs = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + cs = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); BT_ASSERT(cs); stream->discarded_packets_state.beginning_cs = bt_clock_snapshot_get_value(cs); - cs = bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( + cs = bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( msg); BT_ASSERT(cs); stream->discarded_packets_state.end_cs = diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index e3c1738d..85825d5e 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -658,7 +658,7 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter, msg); BT_ASSERT(clock_class); - clock_snapshot = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); break; case BT_MESSAGE_TYPE_DISCARDED_PACKETS: @@ -667,7 +667,7 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter, msg); BT_ASSERT(clock_class); - clock_snapshot = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); break; case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING: diff --git a/plugins/lttng-utils/debug-info/debug-info.c b/plugins/lttng-utils/debug-info/debug-info.c index e26e360b..60d3f982 100644 --- a/plugins/lttng-utils/debug-info/debug-info.c +++ b/plugins/lttng-utils/debug-info/debug-info.c @@ -1353,7 +1353,7 @@ bt_message *handle_packet_begin_message(struct debug_info_msg_iter *debug_it, BT_ASSERT(out_packet); has_default_clock_snapshot = - bt_stream_class_packets_have_default_beginning_clock_snapshot( + bt_stream_class_packets_have_beginning_default_clock_snapshot( bt_stream_borrow_class_const( bt_packet_borrow_stream_const(in_packet))); if (has_default_clock_snapshot) { @@ -1394,7 +1394,7 @@ bt_message *handle_packet_end_message(struct debug_info_msg_iter *debug_it, BT_ASSERT(out_packet); has_default_clock_snapshot = - bt_stream_class_packets_have_default_end_clock_snapshot( + bt_stream_class_packets_have_end_default_clock_snapshot( bt_stream_borrow_class_const( bt_packet_borrow_stream_const(in_packet))); if (has_default_clock_snapshot) { @@ -1559,10 +1559,10 @@ bt_message *handle_discarded_events_message(struct debug_info_msg_iter *debug_it bt_stream_borrow_class_const(in_stream)); if (has_default_clock_snapshots) { begin_cs = - bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( in_message); end_cs = - bt_message_discarded_events_borrow_default_end_clock_snapshot_const( + bt_message_discarded_events_borrow_end_default_clock_snapshot_const( in_message); begin_cs_value = bt_clock_snapshot_get_value(begin_cs); @@ -1619,11 +1619,11 @@ bt_message *handle_discarded_packets_message(struct debug_info_msg_iter *debug_i bt_stream_borrow_class_const(in_stream)); if (has_default_clock_snapshots) { begin_cs = - bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( in_message); end_cs = - bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( + bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( in_message); begin_cs_value = bt_clock_snapshot_get_value(begin_cs); diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c index e651dce9..a4c57ba7 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c @@ -255,13 +255,13 @@ int copy_stream_class_content(struct trace_ir_maps *ir_maps, } - bt_stream_class_set_packets_have_default_beginning_clock_snapshot( + bt_stream_class_set_packets_have_beginning_default_clock_snapshot( out_stream_class, - bt_stream_class_packets_have_default_beginning_clock_snapshot( + bt_stream_class_packets_have_beginning_default_clock_snapshot( in_stream_class)); - bt_stream_class_set_packets_have_default_end_clock_snapshot( + bt_stream_class_set_packets_have_end_default_clock_snapshot( out_stream_class, - bt_stream_class_packets_have_default_end_clock_snapshot( + bt_stream_class_packets_have_end_default_clock_snapshot( in_stream_class)); bt_stream_class_set_supports_discarded_events( out_stream_class, diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 4e0bb16a..068403d8 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -162,9 +162,9 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) goto error; } - bt_stream_class_set_packets_have_default_beginning_clock_snapshot( + bt_stream_class_set_packets_have_beginning_default_clock_snapshot( dmesg_comp->stream_class, BT_TRUE); - bt_stream_class_set_packets_have_default_end_clock_snapshot( + bt_stream_class_set_packets_have_end_default_clock_snapshot( dmesg_comp->stream_class, BT_TRUE); } diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c index fed8ca8c..87d9950b 100644 --- a/plugins/text/pretty/print.c +++ b/plugins/text/pretty/print.c @@ -1363,9 +1363,9 @@ int pretty_print_discarded_items(struct pretty_component *pretty, case BT_MESSAGE_TYPE_DISCARDED_EVENTS: if (bt_stream_class_discarded_events_have_default_clock_snapshots( stream_class)) { - begin = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + begin = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); - end = bt_message_discarded_events_borrow_default_end_clock_snapshot_const( + end = bt_message_discarded_events_borrow_end_default_clock_snapshot_const( msg); } @@ -1373,9 +1373,9 @@ int pretty_print_discarded_items(struct pretty_component *pretty, case BT_MESSAGE_TYPE_DISCARDED_PACKETS: if (bt_stream_class_discarded_packets_have_default_clock_snapshots( stream_class)) { - begin = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + begin = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); - end = bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( + end = bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( msg); } diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index 8fa4ebad..be4522f0 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -550,7 +550,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, msg); break; case BT_MESSAGE_TYPE_PACKET_BEGINNING: - if (bt_stream_class_packets_have_default_beginning_clock_snapshot( + if (bt_stream_class_packets_have_beginning_default_clock_snapshot( stream_class)) { clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const( msg); @@ -560,7 +560,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, break; case BT_MESSAGE_TYPE_PACKET_END: - if (bt_stream_class_packets_have_default_end_clock_snapshot( + if (bt_stream_class_packets_have_end_default_clock_snapshot( stream_class)) { clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const( msg); @@ -572,7 +572,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, case BT_MESSAGE_TYPE_DISCARDED_EVENTS: if (bt_stream_class_discarded_events_have_default_clock_snapshots( stream_class)) { - clock_snapshot = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); } else { goto no_clock_snapshot; @@ -582,7 +582,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, case BT_MESSAGE_TYPE_DISCARDED_PACKETS: if (bt_stream_class_discarded_packets_have_default_clock_snapshots( stream_class)) { - clock_snapshot = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); } else { goto no_clock_snapshot; diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c index 0a5557e4..2a40da74 100644 --- a/plugins/utils/trimmer/trimmer.c +++ b/plugins/utils/trimmer/trimmer.c @@ -669,7 +669,7 @@ int get_msg_ns_from_origin(const bt_message *msg, int64_t *ns_from_origin, goto error; } - clock_snapshot = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); break; case BT_MESSAGE_TYPE_DISCARDED_PACKETS: @@ -680,7 +680,7 @@ int get_msg_ns_from_origin(const bt_message *msg, int64_t *ns_from_origin, goto error; } - clock_snapshot = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); break; case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING: @@ -1424,7 +1424,7 @@ bt_self_message_iterator_status handle_message_with_stream_state( * know there's a default clock and it's always * known. */ - end_cs = bt_message_discarded_events_borrow_default_end_clock_snapshot_const( + end_cs = bt_message_discarded_events_borrow_end_default_clock_snapshot_const( msg); } else { /* @@ -1432,7 +1432,7 @@ bt_self_message_iterator_status handle_message_with_stream_state( * know there's a default clock and it's always * known. */ - end_cs = bt_message_discarded_packets_borrow_default_end_clock_snapshot_const( + end_cs = bt_message_discarded_packets_borrow_end_default_clock_snapshot_const( msg); } @@ -1475,7 +1475,7 @@ bt_self_message_iterator_status handle_message_with_stream_state( } if (msg_type == BT_MESSAGE_TYPE_DISCARDED_EVENTS) { - begin_cs = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const( + begin_cs = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const( msg); new_msg = bt_message_discarded_events_create_with_default_clock_snapshots( trimmer_it->self_msg_iter, @@ -1483,7 +1483,7 @@ bt_self_message_iterator_status handle_message_with_stream_state( bt_clock_snapshot_get_value(begin_cs), end_raw_value); } else { - begin_cs = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const( + begin_cs = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const( msg); new_msg = bt_message_discarded_packets_create_with_default_clock_snapshots( trimmer_it->self_msg_iter, @@ -1740,7 +1740,7 @@ bt_self_message_iterator_status handle_message( * the support for not having them is * implemented. */ - if (!bt_stream_class_packets_have_default_beginning_clock_snapshot( + if (!bt_stream_class_packets_have_beginning_default_clock_snapshot( sc)) { BT_LOGE("Unsupported stream: packets have " "no beginning clock snapshot: " @@ -1753,7 +1753,7 @@ bt_self_message_iterator_status handle_message( goto end; } - if (!bt_stream_class_packets_have_default_end_clock_snapshot( + if (!bt_stream_class_packets_have_end_default_clock_snapshot( sc)) { BT_LOGE("Unsupported stream: packets have " "no end clock snapshot: " diff --git a/tests/bindings/python/bt2/test_clock_class.py b/tests/bindings/python/bt2/test_clock_class.py index 8be327bd..ddded862 100644 --- a/tests/bindings/python/bt2/test_clock_class.py +++ b/tests/bindings/python/bt2/test_clock_class.py @@ -190,8 +190,8 @@ class ClockSnapshotTestCase(unittest.TestCase): _cc, _tc = run_in_component_init(f) _trace = _tc() _sc = _tc.create_stream_class(default_clock_class=_cc, - packets_have_default_beginning_clock_snapshot=True, - packets_have_default_end_clock_snapshot=True) + packets_have_beginning_default_clock_snapshot=True, + packets_have_end_default_clock_snapshot=True) _ec = _sc.create_event_class(name='salut') _stream = _trace.create_stream(_sc) _packet = _stream.create_packet() diff --git a/tests/bindings/python/bt2/test_message.py b/tests/bindings/python/bt2/test_message.py index 986c708c..e9ef1587 100644 --- a/tests/bindings/python/bt2/test_message.py +++ b/tests/bindings/python/bt2/test_message.py @@ -71,8 +71,8 @@ class AllMessagesTestCase(unittest.TestCase): cc = None sc = tc.create_stream_class(default_clock_class=cc, - packets_have_default_beginning_clock_snapshot=with_cc, - packets_have_default_end_clock_snapshot=with_cc, + packets_have_beginning_default_clock_snapshot=with_cc, + packets_have_end_default_clock_snapshot=with_cc, supports_discarded_events=True, discarded_events_have_default_clock_snapshots=with_cc, supports_discarded_packets=True, diff --git a/tests/bindings/python/bt2/test_stream_class.py b/tests/bindings/python/bt2/test_stream_class.py index 9c52801b..b090ca40 100644 --- a/tests/bindings/python/bt2/test_stream_class.py +++ b/tests/bindings/python/bt2/test_stream_class.py @@ -22,8 +22,8 @@ class StreamClassTestCase(unittest.TestCase): self.assertIsNone(sc.default_clock_class) self.assertTrue(sc.assigns_automatic_event_class_id) self.assertTrue(sc.assigns_automatic_stream_id) - self.assertFalse(sc.packets_have_default_beginning_clock_snapshot) - self.assertFalse(sc.packets_have_default_end_clock_snapshot) + self.assertFalse(sc.packets_have_beginning_default_clock_snapshot) + self.assertFalse(sc.packets_have_end_default_clock_snapshot) self.assertFalse(sc.supports_discarded_events) self.assertFalse(sc.discarded_events_have_default_clock_snapshots) self.assertFalse(sc.supports_discarded_packets) @@ -119,21 +119,21 @@ class StreamClassTestCase(unittest.TestCase): with self.assertRaises(ValueError): sc.create_event_class() - def test_packets_have_default_beginning_clock_snapshot(self): - sc = self._tc.create_stream_class(default_clock_class=self._cc, packets_have_default_beginning_clock_snapshot=True) - self.assertTrue(sc.packets_have_default_beginning_clock_snapshot) + def test_packets_have_beginning_default_clock_snapshot(self): + sc = self._tc.create_stream_class(default_clock_class=self._cc, packets_have_beginning_default_clock_snapshot=True) + self.assertTrue(sc.packets_have_beginning_default_clock_snapshot) - def test_packets_have_default_beginning_clock_snapshot_raises(self): + def test_packets_have_beginning_default_clock_snapshot_raises(self): with self.assertRaises(TypeError): - sc = self._tc.create_stream_class(packets_have_default_beginning_clock_snapshot="something") + sc = self._tc.create_stream_class(packets_have_beginning_default_clock_snapshot="something") - def test_packets_have_default_end_clock_snapshot(self): - sc = self._tc.create_stream_class(default_clock_class=self._cc, packets_have_default_end_clock_snapshot=True) - self.assertTrue(sc.packets_have_default_end_clock_snapshot) + def test_packets_have_end_default_clock_snapshot(self): + sc = self._tc.create_stream_class(default_clock_class=self._cc, packets_have_end_default_clock_snapshot=True) + self.assertTrue(sc.packets_have_end_default_clock_snapshot) - def test_packets_have_default_end_clock_snapshot_raises(self): + def test_packets_have_end_default_clock_snapshot_raises(self): with self.assertRaises(TypeError): - sc = self._tc.create_stream_class(packets_have_default_end_clock_snapshot="something") + sc = self._tc.create_stream_class(packets_have_end_default_clock_snapshot="something") def test_supports_discarded_events_without_cs(self): sc = self._tc.create_stream_class(default_clock_class=self._cc, -- 2.34.1