This patch changes the minimum necessary to make the bt2 package
importable. In other words, for this command to succeed:
$ tests/utils/test_python_bt2_env python3 -c "import bt2"
In some cases, I've replaced some references to concepts that don't
exist with the new concepts (e.g. some NOTIFICATION_TYPE_* to
MESSAGE_TYPE_*). In other cases, (e.g. fields.py and field_types.py),
it was easier to remove the code, knowing we'll add it back when
tackling the tests that require these files.
After this milestone, we'll be able to at least run some tests that
import the bt2 package, so we'll be able to make sure we don't regress
things while we fix others.
Change-Id: I930d5a4dd129777cb40c607670e27002bb727e39
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.gerrithub.io/c/eepp/babeltrace/+/452154
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: Philippe Proulx <eeppeliteloop@gmail.com>
class EventClassLogLevel:
class EventClassLogLevel:
- UNKNOWN = native_bt.EVENT_CLASS_LOG_LEVEL_UNKNOWN
- UNSPECIFIED = native_bt.EVENT_CLASS_LOG_LEVEL_UNSPECIFIED
EMERGENCY = native_bt.EVENT_CLASS_LOG_LEVEL_EMERGENCY
ALERT = native_bt.EVENT_CLASS_LOG_LEVEL_ALERT
CRITICAL = native_bt.EVENT_CLASS_LOG_LEVEL_CRITICAL
EMERGENCY = native_bt.EVENT_CLASS_LOG_LEVEL_EMERGENCY
ALERT = native_bt.EVENT_CLASS_LOG_LEVEL_ALERT
CRITICAL = native_bt.EVENT_CLASS_LOG_LEVEL_CRITICAL
-class ByteOrder:
- NATIVE = native_bt.BYTE_ORDER_NATIVE
- LITTLE_ENDIAN = native_bt.BYTE_ORDER_LITTLE_ENDIAN
- BIG_ENDIAN = native_bt.BYTE_ORDER_BIG_ENDIAN
- NETWORK = native_bt.BYTE_ORDER_NETWORK
-
-
-class Encoding:
- NONE = native_bt.STRING_ENCODING_NONE
- UTF8 = native_bt.STRING_ENCODING_UTF8
- ASCII = native_bt.STRING_ENCODING_ASCII
-
-
-class Base:
- BINARY = native_bt.INTEGER_BASE_BINARY
- OCTAL = native_bt.INTEGER_BASE_OCTAL
- DECIMAL = native_bt.INTEGER_BASE_DECIMAL
- HEXADECIMAL = native_bt.INTEGER_BASE_HEXADECIMAL
-
-
class _AlignmentProp:
@property
def alignment(self):
class _AlignmentProp:
@property
def alignment(self):
- native_bt.FIELD_TYPE_ID_INTEGER: IntegerFieldType,
- native_bt.FIELD_TYPE_ID_FLOAT: FloatingPointNumberFieldType,
- native_bt.FIELD_TYPE_ID_ENUM: EnumerationFieldType,
- native_bt.FIELD_TYPE_ID_STRING: StringFieldType,
- native_bt.FIELD_TYPE_ID_STRUCT: StructureFieldType,
- native_bt.FIELD_TYPE_ID_ARRAY: ArrayFieldType,
- native_bt.FIELD_TYPE_ID_SEQUENCE: SequenceFieldType,
- native_bt.FIELD_TYPE_ID_VARIANT: VariantFieldType,
- native_bt.FIELD_TYPE_ID_INTEGER: _IntegerField,
- native_bt.FIELD_TYPE_ID_FLOAT: _FloatingPointNumberField,
- native_bt.FIELD_TYPE_ID_ENUM: _EnumerationField,
- native_bt.FIELD_TYPE_ID_STRING: _StringField,
- native_bt.FIELD_TYPE_ID_STRUCT: _StructureField,
- native_bt.FIELD_TYPE_ID_ARRAY: _ArrayField,
- native_bt.FIELD_TYPE_ID_SEQUENCE: _SequenceField,
- native_bt.FIELD_TYPE_ID_VARIANT: _VariantField,
class EventNotification(_CopyableNotification):
class EventNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_EVENT
+ _TYPE = native_bt.MESSAGE_TYPE_EVENT
def __init__(self, event, cc_prio_map=None):
utils._check_type(event, bt2.event._Event)
def __init__(self, event, cc_prio_map=None):
utils._check_type(event, bt2.event._Event)
class PacketBeginningNotification(_CopyableNotification):
class PacketBeginningNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_PACKET_BEGIN
+ _TYPE = native_bt.MESSAGE_TYPE_PACKET_BEGINNING
def __init__(self, packet):
utils._check_type(packet, bt2.packet._Packet)
def __init__(self, packet):
utils._check_type(packet, bt2.packet._Packet)
class PacketEndNotification(_CopyableNotification):
class PacketEndNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_PACKET_END
+ _TYPE = native_bt.MESSAGE_TYPE_PACKET_END
def __init__(self, packet):
utils._check_type(packet, bt2.packet._Packet)
def __init__(self, packet):
utils._check_type(packet, bt2.packet._Packet)
class StreamBeginningNotification(_CopyableNotification):
class StreamBeginningNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_STREAM_BEGIN
+ _TYPE = native_bt.MESSAGE_TYPE_STREAM_BEGINNING
def __init__(self, stream):
utils._check_type(stream, bt2.stream._Stream)
def __init__(self, stream):
utils._check_type(stream, bt2.stream._Stream)
class StreamEndNotification(_CopyableNotification):
class StreamEndNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_STREAM_END
+ _TYPE = native_bt.MESSAGE_TYPE_STREAM_END
def __init__(self, stream):
utils._check_type(stream, bt2.stream._Stream)
def __init__(self, stream):
utils._check_type(stream, bt2.stream._Stream)
class InactivityNotification(_CopyableNotification):
class InactivityNotification(_CopyableNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_INACTIVITY
+ _TYPE = native_bt.MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY
def __init__(self, cc_prio_map=None):
if cc_prio_map is not None:
def __init__(self, cc_prio_map=None):
if cc_prio_map is not None:
class _DiscardedPacketsNotification(_DiscardedElementsNotification):
class _DiscardedPacketsNotification(_DiscardedElementsNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_DISCARDED_PACKETS
+ _TYPE = native_bt.MESSAGE_TYPE_DISCARDED_PACKETS
@property
def count(self):
@property
def count(self):
class _DiscardedEventsNotification(_DiscardedElementsNotification):
class _DiscardedEventsNotification(_DiscardedElementsNotification):
- _TYPE = native_bt.NOTIFICATION_TYPE_DISCARDED_EVENTS
+ _TYPE = native_bt.MESSAGE_TYPE_DISCARDED_EVENTS
@property
def count(self):
@property
def count(self):
- native_bt.NOTIFICATION_TYPE_EVENT: EventNotification,
- native_bt.NOTIFICATION_TYPE_PACKET_BEGIN: PacketBeginningNotification,
- native_bt.NOTIFICATION_TYPE_PACKET_END: PacketEndNotification,
- native_bt.NOTIFICATION_TYPE_STREAM_BEGIN: StreamBeginningNotification,
- native_bt.NOTIFICATION_TYPE_STREAM_END: StreamEndNotification,
- native_bt.NOTIFICATION_TYPE_INACTIVITY: InactivityNotification,
- native_bt.NOTIFICATION_TYPE_DISCARDED_PACKETS: _DiscardedPacketsNotification,
- native_bt.NOTIFICATION_TYPE_DISCARDED_EVENTS: _DiscardedEventsNotification,
+ native_bt.MESSAGE_TYPE_EVENT: EventNotification,
+ native_bt.MESSAGE_TYPE_PACKET_BEGINNING: PacketBeginningNotification,
+ native_bt.MESSAGE_TYPE_PACKET_END: PacketEndNotification,
+ native_bt.MESSAGE_TYPE_STREAM_BEGINNING: StreamBeginningNotification,
+ native_bt.MESSAGE_TYPE_STREAM_END: StreamEndNotification,
+ native_bt.MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: InactivityNotification,
+ native_bt.MESSAGE_TYPE_DISCARDED_PACKETS: _DiscardedPacketsNotification,
+ native_bt.MESSAGE_TYPE_DISCARDED_EVENTS: _DiscardedEventsNotification,
_TYPE_TO_OBJ = {
native_bt.VALUE_TYPE_BOOL: BoolValue,
native_bt.VALUE_TYPE_INTEGER: IntegerValue,
_TYPE_TO_OBJ = {
native_bt.VALUE_TYPE_BOOL: BoolValue,
native_bt.VALUE_TYPE_INTEGER: IntegerValue,
- native_bt.VALUE_TYPE_FLOAT: FloatValue,
+ native_bt.VALUE_TYPE_REAL: FloatValue,
native_bt.VALUE_TYPE_STRING: StringValue,
native_bt.VALUE_TYPE_ARRAY: ArrayValue,
native_bt.VALUE_TYPE_MAP: MapValue,
native_bt.VALUE_TYPE_STRING: StringValue,
native_bt.VALUE_TYPE_ARRAY: ArrayValue,
native_bt.VALUE_TYPE_MAP: MapValue,