X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fmessage.py;h=bf6cf84d8f4a1f275dbade2c2505081218e3b9a2;hb=57081273d1191fc79edc101af619fab96b72460d;hp=a2e885b8208bdd8dfc994d5359bbe7bc5f83cf07;hpb=26fc5aedf48df3f1654fe4d0b6ada1a10cd804f2;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/message.py b/src/bindings/python/bt2/bt2/message.py index a2e885b8..bf6cf84d 100644 --- a/src/bindings/python/bt2/bt2/message.py +++ b/src/bindings/python/bt2/bt2/message.py @@ -21,19 +21,14 @@ # THE SOFTWARE. from bt2 import native_bt, object, utils -import bt2.clock_snapshot -import bt2.packet -import bt2.stream -import bt2.event -import bt2 +from bt2 import clock_snapshot as bt2_clock_snapshot +from bt2 import packet as bt2_packet +from bt2 import stream as bt2_stream +from bt2 import event as bt2_event def _create_from_ptr(ptr): msg_type = native_bt.message_get_type(ptr) - - if msg_type not in _MESSAGE_TYPE_TO_CLS: - raise bt2.Error('unknown message type: {}'.format(msg_type)) - return _MESSAGE_TYPE_TO_CLS[msg_type]._create_from_ptr(ptr) @@ -44,19 +39,24 @@ class _Message(object._SharedObject): @staticmethod def _check_has_default_clock_class(clock_class): if clock_class is None: - raise bt2.NonexistentClockSnapshot('cannot get default clock snapshot: stream class has no default clock class') + raise ValueError( + 'cannot get default clock snapshot: stream class has no default clock class' + ) class _MessageWithDefaultClockSnapshot: def _get_default_clock_snapshot(self, borrow_clock_snapshot_ptr): snapshot_ptr = borrow_clock_snapshot_ptr(self._ptr) - return bt2.clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref( - snapshot_ptr, self._ptr, self._get_ref, self._put_ref) + return bt2_clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref( + snapshot_ptr, self._ptr, self._get_ref, self._put_ref + ) class _EventMessage(_Message, _MessageWithDefaultClockSnapshot): - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_event_borrow_default_clock_snapshot_const) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_event_borrow_default_clock_snapshot_const + ) @property def default_clock_snapshot(self): @@ -67,8 +67,9 @@ class _EventMessage(_Message, _MessageWithDefaultClockSnapshot): def event(self): event_ptr = native_bt.message_event_borrow_event(self._ptr) assert event_ptr is not None - return bt2.event._Event._create_from_ptr_and_get_ref( - event_ptr, self._ptr, self._get_ref, self._put_ref) + return bt2_event._Event._create_from_ptr_and_get_ref( + event_ptr, self._ptr, self._get_ref, self._put_ref + ) class _PacketMessage(_Message, _MessageWithDefaultClockSnapshot): @@ -81,17 +82,21 @@ class _PacketMessage(_Message, _MessageWithDefaultClockSnapshot): def packet(self): packet_ptr = self._borrow_packet_ptr(self._ptr) assert packet_ptr is not None - return bt2.packet._Packet._create_from_ptr_and_get_ref(packet_ptr) + return bt2_packet._Packet._create_from_ptr_and_get_ref(packet_ptr) class _PacketBeginningMessage(_PacketMessage): _borrow_packet_ptr = staticmethod(native_bt.message_packet_beginning_borrow_packet) - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_packet_beginning_borrow_default_clock_snapshot_const) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_packet_beginning_borrow_default_clock_snapshot_const + ) class _PacketEndMessage(_PacketMessage): _borrow_packet_ptr = staticmethod(native_bt.message_packet_end_borrow_packet) - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_packet_end_borrow_default_clock_snapshot_const) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_packet_end_borrow_default_clock_snapshot_const + ) class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot): @@ -99,7 +104,7 @@ class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot): def stream(self): stream_ptr = self._borrow_stream_ptr(self._ptr) assert stream_ptr - return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr) + return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr) @property def default_clock_snapshot(self): @@ -108,10 +113,11 @@ class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot): status, snapshot_ptr = self._borrow_default_clock_snapshot_ptr(self._ptr) if status == native_bt.MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_UNKNOWN: - return bt2.clock_snapshot._UnknownClockSnapshot() + return bt2_clock_snapshot._UnknownClockSnapshot() - return bt2.clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref( - snapshot_ptr, self._ptr, self._get_ref, self._put_ref) + return bt2_clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref( + snapshot_ptr, self._ptr, self._get_ref, self._put_ref + ) def _default_clock_snapshot(self, raw_value): utils._check_uint64(raw_value) @@ -122,18 +128,28 @@ class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot): class _StreamBeginningMessage(_StreamMessage): _borrow_stream_ptr = staticmethod(native_bt.message_stream_beginning_borrow_stream) - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_stream_beginning_borrow_default_clock_snapshot_const) - _set_default_clock_snapshot = staticmethod(native_bt.message_stream_beginning_set_default_clock_snapshot) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_stream_beginning_borrow_default_clock_snapshot_const + ) + _set_default_clock_snapshot = staticmethod( + native_bt.message_stream_beginning_set_default_clock_snapshot + ) class _StreamEndMessage(_StreamMessage): _borrow_stream_ptr = staticmethod(native_bt.message_stream_end_borrow_stream) - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_stream_end_borrow_default_clock_snapshot_const) - _set_default_clock_snapshot = staticmethod(native_bt.message_stream_end_set_default_clock_snapshot) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_stream_end_borrow_default_clock_snapshot_const + ) + _set_default_clock_snapshot = staticmethod( + native_bt.message_stream_end_set_default_clock_snapshot + ) class _MessageIteratorInactivityMessage(_Message, _MessageWithDefaultClockSnapshot): - _borrow_default_clock_snapshot_ptr = staticmethod(native_bt.message_message_iterator_inactivity_borrow_default_clock_snapshot_const) + _borrow_default_clock_snapshot_ptr = staticmethod( + native_bt.message_message_iterator_inactivity_borrow_default_clock_snapshot_const + ) @property def default_clock_snapshot(self): @@ -147,7 +163,7 @@ class _DiscardedMessage(_Message, _MessageWithDefaultClockSnapshot): def stream(self): stream_ptr = self._borrow_stream_ptr(self._ptr) assert stream_ptr - return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr) + return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr) @property def count(self): @@ -163,12 +179,16 @@ class _DiscardedMessage(_Message, _MessageWithDefaultClockSnapshot): def _check_has_default_clock_snapshots(self): if not self._has_default_clock_snapshots: - raise bt2.NonexistentClockSnapshot('cannot get default clock snapshot: such a message has no clock snapshots for this stream class') + raise ValueError( + 'cannot get default clock snapshot: such a message has no clock snapshots for this stream class' + ) @property def beginning_default_clock_snapshot(self): self._check_has_default_clock_snapshots() - return self._get_default_clock_snapshot(self._borrow_beginning_clock_snapshot_ptr) + return self._get_default_clock_snapshot( + self._borrow_beginning_clock_snapshot_ptr + ) @property def end_default_clock_snapshot(self): @@ -177,11 +197,17 @@ class _DiscardedMessage(_Message, _MessageWithDefaultClockSnapshot): class _DiscardedEventsMessage(_DiscardedMessage): - _borrow_stream_ptr = staticmethod(native_bt.message_discarded_events_borrow_stream_const) + _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_beginning_default_clock_snapshot_const) - _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_events_borrow_end_default_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): @@ -189,11 +215,17 @@ class _DiscardedEventsMessage(_DiscardedMessage): class _DiscardedPacketsMessage(_DiscardedMessage): - _borrow_stream_ptr = staticmethod(native_bt.message_discarded_packets_borrow_stream_const) + _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_beginning_default_clock_snapshot_const) - _borrow_end_clock_snapshot_ptr = staticmethod(native_bt.message_discarded_packets_borrow_end_default_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):