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 <simon.marchi@efficios.com>
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I9fdd32c6acefc51b63b322dc41470c50b9226dfa
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1369
Tested-by: jenkins
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
28 files changed:
_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_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):
@property
def _has_default_clock_snapshots(self):
_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_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):
@property
def _has_default_clock_snapshots(self):
def _create_packet_beginning_message(self, packet, default_clock_snapshot=None):
utils._check_type(packet, bt2.packet._Packet)
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")
if default_clock_snapshot is None:
raise ValueError("packet beginning messages in this stream must have a default clock snapshots")
def _create_packet_end_message(self, packet, default_clock_snapshot=None):
utils._check_type(packet, bt2.packet._Packet)
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")
if default_clock_snapshot is None:
raise ValueError("packet end messages in this stream must have a default clock snapshots")
/* From message-discarded-events-const.h */
extern const bt_clock_snapshot *
/* 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 *
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 *
const bt_message *msg);
extern const bt_clock_class *
/* From message-discarded-packets-const.h */
extern const bt_clock_snapshot *
/* 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 *
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 *
const bt_message *msg);
extern const bt_clock_class *
extern bt_bool bt_stream_class_assigns_automatic_stream_id(
const bt_stream_class *stream_class);
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);
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(
const bt_stream_class *stream_class);
extern bt_bool bt_stream_class_supports_discarded_events(
extern void bt_stream_class_set_assigns_automatic_stream_id(
bt_stream_class *stream_class, bt_bool value);
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);
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(
bt_stream_class *stream_class, bt_bool value);
extern void bt_stream_class_set_supports_discarded_events(
_assigns_automatic_stream_id = property(fset=_assigns_automatic_stream_id)
@property
_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):
- 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)
- 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):
- 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):
@property
def supports_discarded_events(self):
default_clock_class=None,
assigns_automatic_event_class_id=True,
assigns_automatic_stream_id=True,
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,
supports_discarded_events=False,
discarded_events_have_default_clock_snapshots=False,
supports_discarded_packets=False,
sc._assigns_automatic_event_class_id = assigns_automatic_event_class_id
sc._assigns_automatic_stream_id = assigns_automatic_stream_id
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,
sc._set_supports_discarded_events(supports_discarded_events,
discarded_events_have_default_clock_snapshots)
sc._set_supports_discarded_packets(supports_discarded_packets,
#endif
extern const bt_clock_snapshot *
#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 *
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 *
const bt_message *msg);
extern const bt_clock_class *
#endif
extern const bt_clock_snapshot *
#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 *
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 *
const bt_message *msg);
extern const bt_clock_class *
extern bt_bool bt_stream_class_assigns_automatic_stream_id(
const bt_stream_class *stream_class);
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);
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(
const bt_stream_class *stream_class);
extern bt_bool bt_stream_class_supports_discarded_events(
uint64_t id;
bool assigns_automatic_event_class_id;
bool assigns_automatic_stream_id;
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;
bool supports_discarded_events;
bool supports_discarded_packets;
bool discarded_events_have_default_clock_snapshots;
extern void bt_stream_class_set_assigns_automatic_stream_id(
bt_stream_class *stream_class, bt_bool value);
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);
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(
bt_stream_class *stream_class, bt_bool value);
extern void bt_stream_class_set_supports_discarded_events(
static inline
const struct bt_clock_snapshot *
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;
const struct bt_message *message)
{
struct bt_message_discarded_items *disc_items_msg = (void *) message;
static inline
const struct bt_clock_snapshot *
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;
const struct bt_message *message)
{
struct bt_message_discarded_items *disc_items_msg = (void *) message;
}
const struct bt_clock_snapshot *
}
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);
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 *
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);
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(
}
const struct bt_clock_snapshot *
}
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);
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 *
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);
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(
if (pool == &msg_iter->graph->packet_begin_msg_pool) {
packet_has_default_clock_snapshot =
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 =
} else {
packet_has_default_clock_snapshot =
- stream_class->packets_have_default_end_clock_snapshot;
+ stream_class->packets_have_end_default_clock_snapshot;
"%sdiscarded-packets-have-default-cs=%d",
PRFIELD(stream_class->assigns_automatic_event_class_id),
PRFIELD(stream_class->assigns_automatic_stream_id),
"%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),
PRFIELD(stream_class->supports_discarded_events),
PRFIELD(stream_class->discarded_events_have_default_clock_snapshots),
PRFIELD(stream_class->supports_discarded_packets),
"assignment property: %!+S", stream_class);
}
"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");
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);
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);
}
(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");
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);
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);
(bool) value;
BT_LIB_LOGV("Set stream class's \"packets have default end "
"clock snapshot\" property: %!+S", stream_class);
- 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);
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,
ctx->ir_sc, ctx->sc->packets_have_ts_end);
bt_stream_class_set_supports_discarded_events(ctx->ir_sc,
ctx->sc->has_discarded_events,
g_direct_equal);
BT_ASSERT(sc->event_classes_from_ir);
sc->packets_have_ts_begin =
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 =
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);
sc->has_discarded_events =
bt_stream_class_supports_discarded_events(ir_sc);
bt_stream_borrow_class_const(ir_stream);
struct fs_sink_stream *stream;
bool packets_have_beginning_end_cs =
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,
/*
* Not supported: discarded events with default clock snapshots,
* The clock snapshot values will be validated when
* handling the next "packet beginning" message.
*/
* 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);
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);
msg);
BT_ASSERT(cs);
stream->discarded_events_state.end_cs = bt_clock_snapshot_get_value(cs);
* The clock snapshot values will be validated when
* handling the next "packet beginning" message.
*/
* 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);
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 =
msg);
BT_ASSERT(cs);
stream->discarded_packets_state.end_cs =
msg);
BT_ASSERT(clock_class);
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:
msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
msg);
BT_ASSERT(clock_class);
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:
msg);
break;
case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
BT_ASSERT(out_packet);
has_default_clock_snapshot =
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) {
bt_stream_borrow_class_const(
bt_packet_borrow_stream_const(in_packet)));
if (has_default_clock_snapshot) {
BT_ASSERT(out_packet);
has_default_clock_snapshot =
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) {
bt_stream_borrow_class_const(
bt_packet_borrow_stream_const(in_packet)));
if (has_default_clock_snapshot) {
bt_stream_borrow_class_const(in_stream));
if (has_default_clock_snapshots) {
begin_cs =
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(
- 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);
in_message);
begin_cs_value = bt_clock_snapshot_get_value(begin_cs);
bt_stream_borrow_class_const(in_stream));
if (has_default_clock_snapshots) {
begin_cs =
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(
- 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);
in_message);
begin_cs_value = bt_clock_snapshot_get_value(begin_cs);
- bt_stream_class_set_packets_have_default_beginning_clock_snapshot(
+ bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
- bt_stream_class_packets_have_default_beginning_clock_snapshot(
+ bt_stream_class_packets_have_beginning_default_clock_snapshot(
- bt_stream_class_set_packets_have_default_end_clock_snapshot(
+ bt_stream_class_set_packets_have_end_default_clock_snapshot(
- 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,
in_stream_class));
bt_stream_class_set_supports_discarded_events(
out_stream_class,
- 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);
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);
}
dmesg_comp->stream_class, BT_TRUE);
}
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
if (bt_stream_class_discarded_events_have_default_clock_snapshots(
stream_class)) {
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(
- end = bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
+ end = bt_message_discarded_events_borrow_end_default_clock_snapshot_const(
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
if (bt_stream_class_discarded_packets_have_default_clock_snapshots(
stream_class)) {
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(
- end = bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
+ end = bt_message_discarded_packets_borrow_end_default_clock_snapshot_const(
msg);
break;
case BT_MESSAGE_TYPE_PACKET_BEGINNING:
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);
stream_class)) {
clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(
msg);
break;
case BT_MESSAGE_TYPE_PACKET_END:
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);
stream_class)) {
clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(
msg);
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
if (bt_stream_class_discarded_events_have_default_clock_snapshots(
stream_class)) {
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;
msg);
} else {
goto no_clock_snapshot;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
if (bt_stream_class_discarded_packets_have_default_clock_snapshots(
stream_class)) {
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;
msg);
} else {
goto no_clock_snapshot;
- 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:
msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
- 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:
msg);
break;
case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
* know there's a default clock and it's always
* known.
*/
* 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(
* know there's a default clock and it's always
* known.
*/
* 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(
}
if (msg_type == BT_MESSAGE_TYPE_DISCARDED_EVENTS) {
}
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,
msg);
new_msg = bt_message_discarded_events_create_with_default_clock_snapshots(
trimmer_it->self_msg_iter,
bt_clock_snapshot_get_value(begin_cs),
end_raw_value);
} else {
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,
msg);
new_msg = bt_message_discarded_packets_create_with_default_clock_snapshots(
trimmer_it->self_msg_iter,
* the support for not having them is
* implemented.
*/
* 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: "
sc)) {
BT_LOGE("Unsupported stream: packets have "
"no beginning clock snapshot: "
- 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: "
sc)) {
BT_LOGE("Unsupported stream: packets have "
"no end clock snapshot: "
_cc, _tc = run_in_component_init(f)
_trace = _tc()
_sc = _tc.create_stream_class(default_clock_class=_cc,
_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()
_ec = _sc.create_event_class(name='salut')
_stream = _trace.create_stream(_sc)
_packet = _stream.create_packet()
cc = None
sc = tc.create_stream_class(default_clock_class=cc,
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,
supports_discarded_events=True,
discarded_events_have_default_clock_snapshots=with_cc,
supports_discarded_packets=True,
self.assertIsNone(sc.default_clock_class)
self.assertTrue(sc.assigns_automatic_event_class_id)
self.assertTrue(sc.assigns_automatic_stream_id)
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)
self.assertFalse(sc.supports_discarded_events)
self.assertFalse(sc.discarded_events_have_default_clock_snapshots)
self.assertFalse(sc.supports_discarded_packets)
with self.assertRaises(ValueError):
sc.create_event_class()
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):
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):
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,
def test_supports_discarded_events_without_cs(self):
sc = self._tc.create_stream_class(default_clock_class=self._cc,