- gerrit-log - lists.osmocom.org

[XS] Change in osmocom-bb[master]: trx_toolkit/data_msg: Remove burst from *Msg constructor arguments
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40074?usp=email ) Change subject: trx_toolkit/data_msg: Remove burst from *Msg constructor arguments ...................................................................... trx_toolkit/data_msg: Remove burst from *Msg constructor arguments Grepping through whole codebase does not reveal any place which invokes *Msg(burst=...). Sonn we will add type to burst and it will be different types for TxMsg and RxMsg. Adjust *Msg signature not to accept any burst argument as a preparatory step for that. Change-Id: I189956fdc0591ec64c09d4c7e1e3659dfc630fc0 --- M src/target/trx_toolkit/data_msg.pyx 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/40074/1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index ccbdd71..4b59fce 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -77,8 +77,8 @@ CHDR_VERSION_MAX = 0b1111 KNOWN_VERSIONS = tuple(range(KNOWN_VERSION_MAX+1)) - def __init__(self, fn = None, tn = None, burst = None, ver = 0): - self.burst = burst # bytes|bytearray for ubit, array[b] for sbit, array[B] for usbit + def __init__(self, fn = None, tn = None, ver = 0): + self.burst = None # bytes|bytearray for ubit, array[b] for sbit, array[B] for usbit self.ver = ver self.fn = fn self.tn = tn -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40074?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I189956fdc0591ec64c09d4c7e1e3659dfc630fc0 Gerrit-Change-Number: 40074 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/data_msg: Optimize bit conversions
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40076?usp=email ) Change subject: trx_toolkit/data_msg: Optimize bit conversions ...................................................................... trx_toolkit/data_msg: Optimize bit conversions - implement convertions in C (via pyx) directly - add in-place versions - use those in-place versions as needed Change-Id: Ib8237a277f97292cd99dfda44972372d370f0ada --- M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx M src/target/trx_toolkit/test_data_msg.py 3 files changed, 97 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/40076/1 diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index cbdca4b..2823b82 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -3,7 +3,7 @@ from cython cimport final from cpython cimport array -from libc.stdint cimport uint8_t +from libc.stdint cimport int8_t, uint8_t cdef class Modulation: cdef int coding # Coding in TRXD header @@ -36,6 +36,24 @@ cdef parse_burst(self, burst) cdef _validate(self) + @staticmethod + cdef void __usbit2sbit(const uint8_t *usbits, Py_ssize_t l, int8_t *sbits) noexcept + @staticmethod + cdef void __sbit2usbit(const int8_t *sbits, Py_ssize_t l, uint8_t *usbits) noexcept + @staticmethod + cdef void __sbit2ubit(const int8_t *sbits, Py_ssize_t l, uint8_t *ubits) noexcept + @staticmethod + cdef void __ubit2sbit(const uint8_t *ubits, Py_ssize_t l, int8_t *sbits) noexcept + + @staticmethod + cdef array.array[int8_t] _usbit2sbit(const uint8_t[::1] usbits) + @staticmethod + cdef array.array[uint8_t] _sbit2usbit(const int8_t[::1] sbits) + @staticmethod + cdef array.array[uint8_t] _sbit2ubit(const int8_t[::1] sbits) + @staticmethod + cdef array.array[int8_t] _ubit2sbit(const uint8_t[::1] ubits) + @final cdef class TxMsg(Msg): diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 02194ba..5929b47 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # cython: language_level=3 +# cython: initializedcheck=False, wraparound=False, boundscheck=False, infer_types=True # TRX Toolkit # DATA interface message definitions and helpers @@ -20,22 +21,25 @@ from cython cimport final +from cpython cimport array +cdef array.array _Bempty = array.array('B', []) +cdef array.array _bempty = array.array('b', []) + +from cpython.bytearray cimport PyByteArray_FromStringAndSize +from cpython.bytearray cimport PyByteArray_AS_STRING, PyByteArray_GET_SIZE +from xpy cimport PyByteArray_Resize + import random import struct import abc from typing import List -from array import array import gsm_shared cdef int GMSK_BURST_LEN = gsm_shared.GMSK_BURST_LEN cdef int EDGE_BURST_LEN = gsm_shared.EDGE_BURST_LEN cdef int GSM_HYPERFRAME = gsm_shared.GSM_HYPERFRAME -# _bu2s converts unsigned byte to signed. -def _bu2s(x): - return struct.unpack('b', struct.pack('B', x))[0] - cdef list[Modulation] _mod_registry = [] cdef class Modulation: def __cinit__(self, int coding, int bl): @@ -145,29 +149,74 @@ return result + @staticmethod - def usbit2sbit(bits): # array[B] -> array[b] + cdef array.array[int8_t] _usbit2sbit(const uint8_t[::1] usbits): # array[B] -> array[b] ''' Convert unsigned soft-bits {254..0} to soft-bits {-127..127}. ''' - return array('b', bits.tobytes().translate(Msg._tab_usbit2sbit)) - _tab_usbit2sbit = array('b', [-127 if (b == 0xff) else 127 - b for b in range(0x100)]) + l = len(usbits) + cdef array.array[int8_t] sbits = array.clone(_bempty, l, zero=False) + Msg.__usbit2sbit(&usbits[0], l, &sbits[0]) + return sbits @staticmethod - def sbit2usbit(bits): # array[b] -> array[B] + cdef array.array[uint8_t] _sbit2usbit(const int8_t[::1] sbits): # array[b] -> array[B] ''' Convert soft-bits {-127..127} to unsigned soft-bits {254..0}. ''' - return array('B', bits.tobytes().translate(Msg._tab_sbit2usbit)) - _tab_sbit2usbit = array('B', [127 - _bu2s(b) for b in range(0x100)]) + l = len(sbits) + cdef array.array[uint8_t] usbits = array.clone(_Bempty, l, zero=False) + Msg.__sbit2usbit(&sbits[0], l, &usbits[0]) + return usbits @staticmethod - def sbit2ubit(bits): # array[b] -> bytearray + cdef array.array[uint8_t] _sbit2ubit(const int8_t[::1] sbits): # array[b] -> array[B] ''' Convert soft-bits {-127..127} to bits {1..0}. ''' - return bytearray(bits).translate(Msg._tab_sbit2ubit) - _tab_sbit2ubit = array('B', [int(_bu2s(b) < 0) for b in range(0x100)]) + l = len(sbits) + cdef array.array[uint8_t] ubits = array.clone(_Bempty, l, zero=False) + Msg.__sbit2ubit(&sbits[0], l, &ubits[0]) + return ubits @staticmethod - def ubit2sbit(bits: bytearray): # -> array[b] + cdef array.array[int8_t] _ubit2sbit(const uint8_t[::1] ubits): # array[B] -> array[b] ''' Convert bits {1..0} to soft-bits {-127..127}. ''' - return array('b', bits.translate(Msg._tab_ubit2sbit)) - _tab_ubit2sbit = array('b', [-127 if b else 127 for b in range(0x100)]) + l = len(ubits) + cdef array.array[int8_t] sbits = array.clone(_bempty, l, zero=False) + Msg.__ubit2sbit(&ubits[0], l, &sbits[0]) + return sbits + + # inplace versions of Xbit2Ybit + @staticmethod + cdef void __usbit2sbit(const uint8_t *usbits, Py_ssize_t l, int8_t *sbits) noexcept: + for i in range(l): + b = usbits[i] + sbits[i] = -127 if (b == 0xff) else 127 - b + + @staticmethod + cdef void __sbit2usbit(const int8_t *sbits, Py_ssize_t l, uint8_t *usbits) noexcept: + for i in range(l): + b = sbits[i] + usbits[i] = 127 - b + + @staticmethod + cdef void __sbit2ubit(const int8_t *sbits, Py_ssize_t l, uint8_t *ubits) noexcept: + for i in range(l): + b = sbits[i] + ubits[i] = 1 if b < 0 else 0 + + @staticmethod + cdef void __ubit2sbit(const uint8_t *ubits, Py_ssize_t l, int8_t *sbits) noexcept: + for i in range(l): + b = ubits[i] + sbits[i] = -127 if b else 127 + + + # for tests (`@staticmethod cpdef` is not supported: github.com/cython/cython/issues/3327) + @staticmethod + def usbit2sbit(usbits): return Msg._usbit2sbit(usbits) + @staticmethod + def sbit2usbit(sbits): return Msg._sbit2usbit(sbits) + @staticmethod + def sbit2ubit(sbits): return Msg._sbit2ubit(sbits) + @staticmethod + def ubit2sbit(ubits): return Msg._ubit2sbit(ubits) cdef _validate(self): @@ -370,7 +419,7 @@ # Convert burst bits if self.burst is not None: - msg.burst = self.ubit2sbit(self.burst) + msg.burst = Msg._ubit2sbit(self.burst) else: msg.nope_ind = True @@ -659,7 +708,10 @@ ''' Generate message specific burst appending it to buf. ''' # Convert soft-bits to unsigned soft-bits - buf.extend( self.sbit2usbit(self.burst) ) # XXX copies; can probably remove them with numpy + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+len(self.burst)) + Msg.__sbit2usbit(<int8_t*>self.burst.data.as_chars, len(self.burst), + <uint8_t*>&PyByteArray_AS_STRING(buf)[l]) cdef _parse_burst_v0(self, burst): ''' Parse message specific burst for header version 0. ''' @@ -680,13 +732,13 @@ cdef parse_burst(self, burst): ''' Parse message specific burst. ''' - burst = array('B', burst) + burst = array.array('B', burst) if self.ver == 0x00: burst = self._parse_burst_v0(burst) # Convert unsigned soft-bits to soft-bits - self.burst = self.usbit2sbit(burst) + self.burst = Msg._usbit2sbit(burst) def rand_burst(self, length = None): ''' Generate a random message specific burst. ''' @@ -694,7 +746,7 @@ if length is None: length = self.mod_type.bl - self.burst = array('b', [random.randint(-127, 127) for _ in range(length)]) + self.burst = array.array('b', [random.randint(-127, 127) for _ in range(length)]) def trans(self, ver = None): ''' Transform this message to TxMsg. ''' @@ -705,6 +757,8 @@ # Convert burst bits if self.burst is not None: - msg.burst = self.sbit2ubit(self.burst) + msg.burst = PyByteArray_FromStringAndSize(NULL, len(self.burst)) + Msg.__sbit2ubit(<int8_t*>&self.burst.data.as_chars[0], len(self.burst), + <uint8_t*>PyByteArray_AS_STRING(msg.burst)) return msg diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py index 13a64a6..e6cb906 100644 --- a/src/target/trx_toolkit/test_data_msg.py +++ b/src/target/trx_toolkit/test_data_msg.py @@ -148,7 +148,7 @@ # Test both sbit2ubit() and ubit2sbit() ubits = Msg.sbit2ubit(sbits_ref) - self.assertEqual(ubits, bytearray([1] * 127 + [0] * 128)) + self.assertEqual(ubits, array('B', [1] * 127 + [0] * 128)) sbits = Msg.ubit2sbit(ubits) self.assertEqual(sbits, array('b', [-127] * 127 + [127] * 128)) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib8237a277f97292cd99dfda44972372d370f0ada Gerrit-Change-Number: 40076 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/data_msg: Switch *Msg to cdef classes
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40075?usp=email ) Change subject: trx_toolkit/data_msg: Switch *Msg to cdef classes ...................................................................... trx_toolkit/data_msg: Switch *Msg to cdef classes - Put fields into the object struct; fields are now accessed directly via that C-level struct instead of via __dict__ lookup - Type .burst explicitly: it is bytearray for TxMsg and array.array[int8_t] for RxMsg(*) - switch to invoke several internal *Msg functions via C-level where appropriate. - cimport instead of import *Msg at the users - type-annotate users appropriately - switch Modulation .bl and .coding to be cdef-only, as the only users of those fields are *Msg classes, and they now access Modulation via C. (*) it was also considered to use either array.array[uint8_t] or uint8_t[::1] memoryview for tx burst. Unfortunately that is not good for performance as converting explicit types, e.g. bytearray, to memoryview on a call is relatively costly, and also because cython generates suboptimal code with lots of overhead when passing/returning arrays. This way we use concrete type bytearray for tx bursts which does not have those problems. For rx burst, we cannot use bytearray because existing semantic requires rx_burst[i] to return signed int8_t, which bytearray does not provide. So we use the least bad array.array[int8_t] for that. Change-Id: Icb63ec0a0d899e352400915bb163a3e2f354c280 --- M src/target/trx_toolkit/_fake_trx.pyx M src/target/trx_toolkit/burst_fwd.pxd M src/target/trx_toolkit/burst_fwd.pyx M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx M src/target/trx_toolkit/transceiver.pxd M src/target/trx_toolkit/transceiver.pyx 7 files changed, 142 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/75/40075/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index fd12863..5c55486 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -24,7 +24,7 @@ from burst_fwd cimport BurstForwarder from _clck_gen cimport CLCKGen from transceiver cimport Transceiver -from data_msg cimport Modulation, ModGMSK +from data_msg cimport Modulation, ModGMSK, TxMsg, RxMsg from udp_link cimport _raise_oserr import gsm_shared cdef object TrainingSeqGMSK = gsm_shared.TrainingSeqGMSK @@ -198,7 +198,7 @@ return False - cdef _handle_data_msg_v1(self, src_msg, msg): + cdef _handle_data_msg_v1(self, TxMsg src_msg, RxMsg msg): # C/I (Carrier-to-Interference ratio) msg.ci = self.ci() @@ -218,7 +218,7 @@ # Takes (partially initialized) TRXD Rx message, # simulates RF path parameters (such as RSSI), # and sends towards the L1 - cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): + cdef handle_data_msg(self, Transceiver src_trx, TxMsg src_msg, RxMsg msg): if self.rf_muted: msg.nope_ind = True elif not msg.nope_ind: diff --git a/src/target/trx_toolkit/burst_fwd.pxd b/src/target/trx_toolkit/burst_fwd.pxd index 43b788c..486faa1 100644 --- a/src/target/trx_toolkit/burst_fwd.pxd +++ b/src/target/trx_toolkit/burst_fwd.pxd @@ -1,8 +1,9 @@ # cython: language_level=3 +from data_msg cimport TxMsg from transceiver cimport Transceiver cdef class BurstForwarder: cdef list[Transceiver] trx_list - cdef forward_msg(self, Transceiver src_trx, rx_msg) + cdef forward_msg(self, Transceiver src_trx, TxMsg rx_msg) diff --git a/src/target/trx_toolkit/burst_fwd.pyx b/src/target/trx_toolkit/burst_fwd.pyx index 4c8a0ef..d13f784 100644 --- a/src/target/trx_toolkit/burst_fwd.pyx +++ b/src/target/trx_toolkit/burst_fwd.pyx @@ -43,7 +43,7 @@ def __cinit__(self, list trx_list): self.trx_list = trx_list - cdef forward_msg(self, Transceiver src_trx, rx_msg): + cdef forward_msg(self, Transceiver src_trx, TxMsg rx_msg): # Originating Transceiver may use frequency hopping, # so let's precalculate its Tx frequency in advance tx_freq = src_trx.get_tx_freq(rx_msg.fn) diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index a1b2192..cbdca4b 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -1,9 +1,13 @@ # -*- coding: utf-8 -*- # cython: language_level=3 +from cython cimport final +from cpython cimport array +from libc.stdint cimport uint8_t + cdef class Modulation: - cdef readonly int coding # Coding in TRXD header - cdef readonly int bl # Burst length + cdef int coding # Coding in TRXD header + cdef int bl # Burst length @staticmethod cdef Modulation pick(int coding) # -> Modulation | None @@ -13,3 +17,54 @@ cdef Modulation ModGMSK + + +cdef class Msg: + cdef readonly int ver + cdef readonly object fn # int | None + cdef readonly object tn # int | None + cdef public bint nope_ind + + + @staticmethod + cdef int CHDR_LEN() noexcept + cdef int HDR_LEN(self) except -1 + + cdef append_hdr_to(self, bytearray buf) + cdef append_burst_to(self, bytearray buf) + cdef parse_hdr(self, msg) + cdef parse_burst(self, burst) + cdef _validate(self) + + +@final +cdef class TxMsg(Msg): + cdef public bytearray burst # | None + cdef readonly object pwr # int | None + + cpdef validate(self) + + +@final +cdef class RxMsg(Msg): + cdef public array.array burst # array.array[b] | None + + cdef public object rssi # int | None + cdef public object toa256 # int | None + + # Version 0x01 specific + cdef public Modulation mod_type # Modulation | None + + cdef public object tsc_set # int | None + cdef public object tsc # int | None + cdef public object ci # int | None + + + cdef _validate_burst_v0(self) + cdef _validate_burst_v1(self) + cdef validate_burst(self) + cpdef validate(self) + cdef int gen_mts(self) except -1 + + cdef _parse_burst_v0(self, burst) + cdef int parse_mts(self, uint8_t mts) except -1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 4b59fce..02194ba 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -18,6 +18,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +from cython cimport final + import random import struct import abc @@ -70,39 +72,42 @@ cdef int KNOWN_VERSION_MAX = 1 # 0, 1 -class Msg(abc.ABC): +cdef class Msg: ''' TRXD (DATA) message coding API (common part). ''' # NOTE: up to 16 versions can be encoded CHDR_VERSION_MAX = 0b1111 KNOWN_VERSIONS = tuple(range(KNOWN_VERSION_MAX+1)) - def __init__(self, fn = None, tn = None, ver = 0): - self.burst = None # bytes|bytearray for ubit, array[b] for sbit, array[B] for usbit + def __cinit__(self, fn = -1, tn = -1, int ver = 0): self.ver = ver self.fn = fn self.tn = tn + self.nope_ind = False - @property - def CHDR_LEN(self): + @staticmethod + cdef int CHDR_LEN() noexcept: ''' The common header length. ''' return 1 + 4 # (VER + TN) + FN - @abc.abstractmethod - def append_hdr_to(self, buf): + cdef int HDR_LEN(self) except -1: + raise NotImplementedError + + cdef append_hdr_to(self, bytearray buf): ''' Generate message specific header by appending it to buf. ''' + raise NotImplementedError - @abc.abstractmethod - def parse_hdr(self, hdr): + cdef parse_hdr(self, msg): ''' Parse message specific header. ''' + raise NotImplementedError - @abc.abstractmethod - def append_burst_to(self, buf): + cdef append_burst_to(self, bytearray buf): ''' Generate message specific burst by appending it to buf. ''' + raise NotImplementedError - @abc.abstractmethod - def parse_burst(self, burst): - ''' Parse message specific burst. ''' + cdef parse_burst(self, burst): + ''' Parse message specific burst to burst. ''' + raise NotImplementedError @abc.abstractmethod def rand_burst(self): @@ -165,7 +170,7 @@ _tab_ubit2sbit = array('b', [-127 if b else 127 for b in range(0x100)]) - def validate(self): + cdef _validate(self): ''' Validate the message fields (throws ValueError). ''' if not (0 <= self.ver <= KNOWN_VERSION_MAX): @@ -187,7 +192,7 @@ ''' Generate a TRX DATA message. ''' # Validate all the fields - self.validate() + self._validate() # Allocate an empty byte-array buf = bytearray() @@ -216,7 +221,7 @@ ''' Parse a TRX DATA message. ''' # Make sure we have at least common header - if len(msg) < self.CHDR_LEN: + if len(msg) < Msg.CHDR_LEN(): raise ValueError("Message is to short: missing common header") # Parse the header version first @@ -230,17 +235,17 @@ # Make sure we have the whole header, # including the version specific fields - if len(msg) < self.HDR_LEN: + if len(msg) < self.HDR_LEN(): raise ValueError("Message is to short: missing version specific header") # Specific message part self.parse_hdr(msg) # Copy burst, skipping header - if len(msg) == self.HDR_LEN: + if len(msg) == self.HDR_LEN(): self.burst = None return - msg_burst = memoryview(msg)[self.HDR_LEN:] + msg_burst = memoryview(msg)[self.HDR_LEN():] self.parse_burst(msg_burst) @@ -248,18 +253,19 @@ cdef int PWR_MIN = 0x00 cdef int PWR_MAX = 0xff -class TxMsg(Msg): +@final +cdef class TxMsg(Msg): ''' Tx (L1 -> TRX) message coding API. ''' - # Specific message fields - pwr = None + def __cinit__(self): + self.burst = None + self.pwr = None - @property - def HDR_LEN(self): + cdef int HDR_LEN(self) except -1: ''' Calculate header length depending on its version. ''' # Common header length - length = self.CHDR_LEN + length = Msg.CHDR_LEN() # Message specific header length if self.ver in (0x00, 0x01): @@ -269,11 +275,11 @@ return length - def validate(self): + cpdef validate(self): ''' Validate the message fields (throws ValueError). ''' # Validate common fields - Msg.validate(self) + Msg._validate(self) if self.pwr is None: raise ValueError("Tx Attenuation level is not set") @@ -318,25 +324,25 @@ # Strip useless whitespace and return return result.strip() - def append_hdr_to(self, buf): + cdef append_hdr_to(self, bytearray buf): ''' Generate message specific header by appending it to buf. ''' # Put power buf.append(self.pwr) - def parse_hdr(self, hdr): + cdef parse_hdr(self, hdr): ''' Parse message specific header part. ''' # Parse power level self.pwr = hdr[5] - def append_burst_to(self, buf): + cdef append_burst_to(self, bytearray buf): ''' Generate message specific burst by appending it to buf. ''' # Copy burst 'as is' return buf.extend(self.burst) - def parse_burst(self, burst): + cdef parse_burst(self, burst): ''' Parse message specific burst. ''' length = len(burst) @@ -389,27 +395,28 @@ # IDLE frame / nope detection indicator cdef int NOPE_IND = (1 << 7) -class RxMsg(Msg): + +@final +cdef class RxMsg(Msg): ''' Rx (TRX -> L1) message coding API. ''' - # Specific message fields - rssi = None - toa256 = None + def __cinit__(self): + self.rssi = None + self.toa256 = None - # Version 0x01 specific (default values) - mod_type = ModGMSK - nope_ind = False + # Version 0x01 specific (default values) + self.mod_type = ModGMSK + self.nope_ind = False - tsc_set = None - tsc = None - ci = None + self.tsc_set = None + self.tsc = None + self.ci = None - @property - def HDR_LEN(self): + cdef int HDR_LEN(self) except -1: ''' Calculate header length depending on its version. ''' # Common header length - length = self.CHDR_LEN + length = Msg.CHDR_LEN() # Message specific header length if self.ver == 0x00: @@ -423,7 +430,7 @@ return length - def _validate_burst_v0(self): + cdef _validate_burst_v0(self): # Burst is mandatory if self.burst is None: raise ValueError("Rx burst bits are not set") @@ -432,7 +439,7 @@ if len(self.burst) not in (GMSK_BURST_LEN, EDGE_BURST_LEN): raise ValueError("Rx burst has odd length %u" % len(self.burst)) - def _validate_burst_v1(self): + cdef _validate_burst_v1(self): # Burst is omitted in case of an IDLE / NOPE indication if self.nope_ind and self.burst is None: return @@ -443,10 +450,11 @@ raise ValueError("Rx burst bits are not set") # Burst length depends on modulation type + assert self.mod_type is not None if len(self.burst) != self.mod_type.bl: raise ValueError("Rx burst has odd length %u" % len(self.burst)) - def validate_burst(self): + cdef validate_burst(self): ''' Validate the burst (throws ValueError). ''' if self.ver == 0x00: @@ -454,11 +462,11 @@ elif self.ver >= 0x01: self._validate_burst_v1() - def validate(self): + cpdef validate(self): ''' Validate the message header fields (throws ValueError). ''' # Validate common fields - Msg.validate(self) + Msg._validate(self) if self.rssi is None: raise ValueError("RSSI is not set") @@ -481,10 +489,10 @@ raise ValueError("TSC set is not set") if self.mod_type is ModGMSK: - if self.tsc_set not in range(0, 4): + if not (0 <= self.tsc_set < 4): raise ValueError("TSC set %d is out of range" % self.tsc_set) else: - if self.tsc_set not in range(0, 2): + if not (0 <= self.tsc_set < 2): raise ValueError("TSC set %d is out of range" % self.tsc_set) if self.tsc is None: @@ -571,7 +579,7 @@ # Strip useless whitespace and return return result.strip() - def gen_mts(self): + cdef int gen_mts(self) except -1: ''' Encode Modulation and Training Sequence info. ''' # IDLE / nope indication has no MTS info @@ -582,12 +590,13 @@ mts = self.tsc & 0b111 # MTS: . X X X X . . . + assert self.mod_type is not None mts |= self.mod_type.coding << 3 mts |= self.tsc_set << 3 return mts - def parse_mts(self, mts): + cdef int parse_mts(self, uint8_t mts) except -1: ''' Parse Modulation and Training Sequence info. ''' # IDLE / nope indication has no MTS info @@ -596,7 +605,7 @@ self.mod_type = None self.tsc_set = None self.tsc = None - return + return 0 # TSC: . . . . . X X X self.tsc = mts & 0b111 @@ -612,7 +621,7 @@ self.mod_type = ModGMSK self.tsc_set = mts & 0b11 - def append_hdr_to(self, buf): + cdef append_hdr_to(self, bytearray buf): ''' Generate message specific header by appending it to buf. ''' # Put RSSI @@ -630,7 +639,7 @@ # C/I: Carrier-to-Interference ratio (in centiBels) buf += struct.pack(">h", self.ci) - def parse_hdr(self, hdr): + cdef parse_hdr(self, hdr): ''' Parse message specific header part. ''' # Parse RSSI @@ -646,13 +655,13 @@ # C/I: Carrier-to-Interference ratio (in centiBels) self.ci = struct.unpack(">h", hdr[9:11])[0] - def append_burst_to(self, buf): + cdef append_burst_to(self, bytearray buf): ''' Generate message specific burst appending it to buf. ''' # Convert soft-bits to unsigned soft-bits buf.extend( self.sbit2usbit(self.burst) ) # XXX copies; can probably remove them with numpy - def _parse_burst_v0(self, burst): + cdef _parse_burst_v0(self, burst): ''' Parse message specific burst for header version 0. ''' bl = len(burst) @@ -668,7 +677,7 @@ return burst[:self.mod_type.bl] - def parse_burst(self, burst): + cdef parse_burst(self, burst): ''' Parse message specific burst. ''' burst = array('B', burst) diff --git a/src/target/trx_toolkit/transceiver.pxd b/src/target/trx_toolkit/transceiver.pxd index 74ee982..2fb2fb7 100644 --- a/src/target/trx_toolkit/transceiver.pxd +++ b/src/target/trx_toolkit/transceiver.pxd @@ -1,6 +1,7 @@ # cython: language_level=3 from data_if cimport DATAInterface +from data_msg cimport TxMsg, RxMsg from burst_fwd cimport BurstForwarder from _clck_gen cimport CLCKGen @@ -41,13 +42,13 @@ object ctrl_if # CTRLInterfaceTRX object clck_if # UDPLink - list _tx_queue # [] of TxMsg + list[TxMsg] _tx_queue cdef get_rx_freq(self, fn) cpdef get_tx_freq(self, fn) - cdef recv_data_msg(self) - cdef send_data_msg(self, msg) - cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg) + cdef TxMsg recv_data_msg(self) + cdef send_data_msg(self, RxMsg msg) + cdef handle_data_msg(self, Transceiver src_trx, TxMsg src_msg, RxMsg msg) cdef clck_tick(self, BurstForwarder fwd, fn) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index 19bdd09..e852eda 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -274,7 +274,7 @@ log.info("Stopping clock generator") self.clck_gen.stop() - cdef recv_data_msg(self): + cdef TxMsg recv_data_msg(self): # -> TxMsg | None # Read and parse data from socket msg = self.data_if.recv_tx_msg() if not msg: @@ -290,17 +290,19 @@ self._tx_queue.append(msg) return msg - cdef send_data_msg(self, msg): + cdef send_data_msg(self, RxMsg msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) - cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): + cdef handle_data_msg(self, Transceiver src_trx, TxMsg src_msg, RxMsg msg): self.send_data_msg(msg) cdef clck_tick(self, BurstForwarder fwd, fn): if not self.running: return + cdef TxMsg msg + drop = [] emit = [] wait = [] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icb63ec0a0d899e352400915bb163a3e2f354c280 Gerrit-Change-Number: 40075 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/data_if: Switch DATAInterface to be used via C-level API ...
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40077?usp=email ) Change subject: trx_toolkit/data_if: Switch DATAInterface to be used via C-level API from *.pyx ...................................................................... trx_toolkit/data_if: Switch DATAInterface to be used via C-level API from *.pyx All those function to recv_tx_msg, recv_rx_msg, send_msg etc are on hot data plane code paths. Switching them to C cuts related py overhead from their invocations. Change-Id: I163836040c794dfa4a757aa798e59f90bebcb2b9 --- M src/target/trx_toolkit/_fake_trx.pyx M src/target/trx_toolkit/data_if.pxd M src/target/trx_toolkit/data_if.pyx M src/target/trx_toolkit/transceiver.pyx 4 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/40077/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index 5c55486..aa56afa 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -238,7 +238,7 @@ msg.rssi = RSSI_NOISE_DEFAULT msg.ci = CI_NOISE_DEFAULT - self.data_if.send_msg(msg) + self.data_if._send_msg(msg) return # Complete message header diff --git a/src/target/trx_toolkit/data_if.pxd b/src/target/trx_toolkit/data_if.pxd index 564a6cd..23dc49e 100644 --- a/src/target/trx_toolkit/data_if.pxd +++ b/src/target/trx_toolkit/data_if.pxd @@ -1,8 +1,13 @@ # cython: language_level=3 from udp_link cimport UDPLink +from data_msg cimport Msg, TxMsg, RxMsg cdef class DATAInterface(UDPLink): cdef readonly int _hdr_ver + cdef bint match_hdr_ver(self, Msg msg) cdef recv_raw_data(self) + cdef TxMsg recv_tx_msg(self) # -> TxMsg | None + cdef RxMsg recv_rx_msg(self) # -> RxMsg | None + cdef _send_msg(self, Msg msg, bint legacy=*) diff --git a/src/target/trx_toolkit/data_if.pyx b/src/target/trx_toolkit/data_if.pyx index d5e4910..c355666 100644 --- a/src/target/trx_toolkit/data_if.pyx +++ b/src/target/trx_toolkit/data_if.pyx @@ -20,7 +20,6 @@ import logging as log -from data_msg import * cdef class DATAInterface(UDPLink): def __init__(self, *udp_link_args): @@ -46,7 +45,7 @@ # No suitable version found return -1 - def match_hdr_ver(self, msg): + cdef bint match_hdr_ver(self, Msg msg): if msg.ver == self._hdr_ver: return True @@ -59,7 +58,7 @@ cdef recv_raw_data(self): return self.recv(512) - def recv_tx_msg(self): + cdef TxMsg recv_tx_msg(self): # -> TxMsg | None # Read raw data from socket data = self.recv_raw_data() @@ -79,7 +78,7 @@ return msg - def recv_rx_msg(self): + cdef RxMsg recv_rx_msg(self): # -> RxMsg | None # Read raw data from socket data = self.recv_raw_data() @@ -99,7 +98,9 @@ return msg - def send_msg(self, msg, legacy = False): + def send_msg(self, Msg msg, bint legacy = False): + self._send_msg(msg, legacy) + cdef _send_msg(self, Msg msg, bint legacy = False): try: # Validate and encode a TRXD message payload = msg.gen_msg(legacy) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index e852eda..2e8a064 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -292,7 +292,7 @@ cdef send_data_msg(self, RxMsg msg): # TODO: make legacy mode configurable (via argv?) - self.data_if.send_msg(msg, legacy = True) + self.data_if._send_msg(msg, legacy = True) cdef handle_data_msg(self, Transceiver src_trx, TxMsg src_msg, RxMsg msg): self.send_data_msg(msg) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40077?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I163836040c794dfa4a757aa798e59f90bebcb2b9 Gerrit-Change-Number: 40077 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit/data_msg: Push checking whether .burst is None from Msg.g...
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40079?usp=email ) Change subject: trx_toolkit/data_msg: Push checking whether .burst is None from Msg.gen_msg to TxMsg/RxMsg .append_burst_to ...................................................................... trx_toolkit/data_msg: Push checking whether .burst is None from Msg.gen_msg to TxMsg/RxMsg .append_burst_to TxMsg and RxMsg have different types for their bursts, so inside Msg functions accessing .burst goes via py-level, while inside TxMsg/RxMsg functions accessing .burst goes via C-level. Change-Id: Ie3d38131db8964c7f134e03a9676b1e0e84be6ae --- M src/target/trx_toolkit/data_msg.pyx 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/40079/1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index ac3dc49..34f6a12 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -260,8 +260,7 @@ self.append_hdr_to(buf) # Generate burst - if self.burst is not None: - self.append_burst_to(buf) + self.append_burst_to(buf) # This is a rudiment from (legacy) OpenBTS transceiver, # some L1 implementations still expect two dummy bytes. @@ -403,6 +402,8 @@ ''' Generate message specific burst by appending it to buf. ''' # Copy burst 'as is' + if self.burst is None: + return return buf.extend(self.burst) cdef parse_burst(self, bytearray burst): @@ -727,6 +728,8 @@ # Convert soft-bits to unsigned soft-bits l = PyByteArray_GET_SIZE(buf) + if self.burst is None: + return PyByteArray_Resize(buf, l+len(self.burst)) Msg.__sbit2usbit(<int8_t*>self.burst.data.as_chars, len(self.burst), <uint8_t*>&PyByteArray_AS_STRING(buf)[l]) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie3d38131db8964c7f134e03a9676b1e0e84be6ae Gerrit-Change-Number: 40079 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/data_msg: Optimize RxMsg/TxMsg parsing
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40078?usp=email ) Change subject: trx_toolkit/data_msg: Optimize RxMsg/TxMsg parsing ...................................................................... trx_toolkit/data_msg: Optimize RxMsg/TxMsg parsing Thread all calls related in parsing to be done via C-level and with explicit types. Leverage bytearray ability to cut prefix and suffix efficiently. Replace struct.unpack with custom C-level functions to deserialize big-endian integers. Use raw C pointers to access bytearray data to avoid related py-index overhead. Change-Id: I661a414bf5091fa6b872831ba911465a8d073397 --- M src/target/trx_toolkit/data_if.pyx M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx 3 files changed, 69 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/40078/1 diff --git a/src/target/trx_toolkit/data_if.pyx b/src/target/trx_toolkit/data_if.pyx index c355666..71a1878 100644 --- a/src/target/trx_toolkit/data_if.pyx +++ b/src/target/trx_toolkit/data_if.pyx @@ -65,7 +65,7 @@ # Attempt to parse a TRXD Tx message try: msg = TxMsg() - msg.parse_msg(data) + msg._parse_msg(data) except: log.error("Failed to parse a TRXD Tx message " "from R:%s" % self.desc_remote()) @@ -85,7 +85,7 @@ # Attempt to parse a TRXD Rx message try: msg = RxMsg() - msg.parse_msg(data) + msg._parse_msg(data) except: log.error("Failed to parse a TRXD Rx message " "from R:%s" % self.desc_remote()) diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index 2823b82..6823397 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -32,8 +32,9 @@ cdef append_hdr_to(self, bytearray buf) cdef append_burst_to(self, bytearray buf) - cdef parse_hdr(self, msg) - cdef parse_burst(self, burst) + cdef parse_hdr(self, bytearray msg) + cdef parse_burst(self, bytearray burst) + cdef int _parse_msg(self, bytearray msg) except -1 cdef _validate(self) @staticmethod @@ -84,5 +85,5 @@ cpdef validate(self) cdef int gen_mts(self) except -1 - cdef _parse_burst_v0(self, burst) + cdef _parse_burst_v0(self, bytearray burst) cdef int parse_mts(self, uint8_t mts) except -1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 5929b47..ac3dc49 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -20,6 +20,7 @@ # GNU General Public License for more details. from cython cimport final +from libc.stdint cimport int16_t, uint16_t, uint32_t from cpython cimport array cdef array.array _Bempty = array.array('B', []) @@ -101,7 +102,7 @@ ''' Generate message specific header by appending it to buf. ''' raise NotImplementedError - cdef parse_hdr(self, msg): + cdef parse_hdr(self, bytearray msg): ''' Parse message specific header. ''' raise NotImplementedError @@ -109,8 +110,11 @@ ''' Generate message specific burst by appending it to buf. ''' raise NotImplementedError - cdef parse_burst(self, burst): - ''' Parse message specific burst to burst. ''' + cdef parse_burst(self, bytearray burst): + ''' Parse message specific burst to burst. + + burst bytearray can be trimmed in-place to leave only burst data. + ''' raise NotImplementedError @abc.abstractmethod @@ -267,35 +271,43 @@ return buf def parse_msg(self, msg): + if type(msg) is not bytearray: + msg = bytearray(msg) + self._parse_msg(msg) + cdef int _parse_msg(self, bytearray msg) except -1: ''' Parse a TRX DATA message. ''' + cdef uint8_t *msgb = <uint8_t*>PyByteArray_AS_STRING(msg) + cdef Py_ssize_t msgl = len(msg) # Make sure we have at least common header - if len(msg) < Msg.CHDR_LEN(): + if msgl < Msg.CHDR_LEN(): raise ValueError("Message is to short: missing common header") # Parse the header version first - self.ver = (msg[0] >> 4) + self.ver = (msgb[0] >> 4) if not (0 <= self.ver <= KNOWN_VERSION_MAX): raise ValueError("Unknown TRXD header version %d" % self.ver) # Parse TDMA TN and FN - self.tn = (msg[0] & 0x07) - self.fn = struct.unpack(">L", msg[1:5])[0] + self.tn = (msgb[0] & 0x07) + self.fn = _unpack_u32(&msgb[1]) # Make sure we have the whole header, # including the version specific fields - if len(msg) < self.HDR_LEN(): + hlen = self.HDR_LEN() + if msgl < hlen: raise ValueError("Message is to short: missing version specific header") # Specific message part self.parse_hdr(msg) - # Copy burst, skipping header - if len(msg) == self.HDR_LEN(): + # Extract burst, skipping header + # reuse original msg bytearray for burst data + if msgl == hlen: self.burst = None - return - msg_burst = memoryview(msg)[self.HDR_LEN():] - self.parse_burst(msg_burst) + return 0 + del msg[:hlen] # NOTE bytearray handles prefix delete efficiently + self.parse_burst(msg) # Constants @@ -379,8 +391,10 @@ # Put power buf.append(self.pwr) - cdef parse_hdr(self, hdr): + cdef parse_hdr(self, bytearray msg): ''' Parse message specific header part. ''' + cdef uint8_t *hdr = <uint8_t*>PyByteArray_AS_STRING(msg) + # NOTE header lenght is already pre-checked by _parse_msg # Parse power level self.pwr = hdr[5] @@ -391,20 +405,22 @@ # Copy burst 'as is' return buf.extend(self.burst) - cdef parse_burst(self, burst): + cdef parse_burst(self, bytearray burst): ''' Parse message specific burst. ''' + # trim msg down with removing everything besides burst data + # bytearray handles prefix and suffix removal efficiently length = len(burst) # Distinguish between GSM and EDGE if length >= EDGE_BURST_LEN: if length > EDGE_BURST_LEN: - burst = memoryview(burst)[:EDGE_BURST_LEN] + del burst[EDGE_BURST_LEN:] else: if length > GMSK_BURST_LEN: - burst = memoryview(burst)[:GMSK_BURST_LEN] + del burst[GMSK_BURST_LEN:] - self.burst = bytearray(burst) + self.burst = burst def rand_burst(self, length = GMSK_BURST_LEN): ''' Generate a random message specific burst. ''' @@ -688,21 +704,23 @@ # C/I: Carrier-to-Interference ratio (in centiBels) buf += struct.pack(">h", self.ci) - cdef parse_hdr(self, hdr): + cdef parse_hdr(self, bytearray msg): ''' Parse message specific header part. ''' + cdef uint8_t *hdr = <uint8_t*>PyByteArray_AS_STRING(msg) + # NOTE header lenght is already pre-checked by _parse_msg # Parse RSSI self.rssi = -(hdr[5]) # Parse ToA (Time of Arrival) - self.toa256 = struct.unpack(">h", hdr[6:8])[0] + self.toa256 = _unpack_s16(&hdr[6]) if self.ver >= 0x01: # Modulation and Training Sequence info self.parse_mts(hdr[8]) # C/I: Carrier-to-Interference ratio (in centiBels) - self.ci = struct.unpack(">h", hdr[9:11])[0] + self.ci = _unpack_s16(&hdr[9]) cdef append_burst_to(self, bytearray buf): ''' Generate message specific burst appending it to buf. ''' @@ -713,7 +731,8 @@ Msg.__sbit2usbit(<int8_t*>self.burst.data.as_chars, len(self.burst), <uint8_t*>&PyByteArray_AS_STRING(buf)[l]) - cdef _parse_burst_v0(self, burst): + + cdef _parse_burst_v0(self, bytearray burst): ''' Parse message specific burst for header version 0. ''' bl = len(burst) @@ -727,15 +746,13 @@ if self.mod_type is None: raise ValueError("Odd burst length %u" % bl) - return burst[:self.mod_type.bl] + del burst[self.mod_type.bl:] - cdef parse_burst(self, burst): + cdef parse_burst(self, bytearray burst): ''' Parse message specific burst. ''' - burst = array.array('B', burst) - if self.ver == 0x00: - burst = self._parse_burst_v0(burst) + self._parse_burst_v0(burst) # Convert unsigned soft-bits to soft-bits self.burst = Msg._usbit2sbit(burst) @@ -762,3 +779,22 @@ <uint8_t*>PyByteArray_AS_STRING(msg.burst)) return msg + + +# ---- misc ---- + +# _unpack_(u|s)(16|32) deserialize big-endian representation of corresponding integer type from memory pointed by b. + +cdef int16_t _unpack_s16(const uint8_t *b): + cdef uint16_t r = 0 + r |= (<uint16_t>b[0]) << 8 + r |= (<uint16_t>b[1]) << 0 + return <int16_t>r + +cdef uint32_t _unpack_u32(const uint8_t *b): + cdef uint32_t r = 0 + r |= (<uint32_t>b[0]) << 24 + r |= (<uint32_t>b[1]) << 16 + r |= (<uint32_t>b[2]) << 8 + r |= (<uint32_t>b[3]) << 0 + return r -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I661a414bf5091fa6b872831ba911465a8d073397 Gerrit-Change-Number: 40078 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit/_fake_trx: No need to initialize .rf_muted in FakeTRX
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40068?usp=email ) Change subject: trx_toolkit/_fake_trx: No need to initialize .rf_muted in FakeTRX ...................................................................... trx_toolkit/_fake_trx: No need to initialize .rf_muted in FakeTRX Because .rf_muted is attribute of Transceiver and is initialized to that value in Transceiver.__cinit__ . Change-Id: Ibd6b5dd7fa65e42cc864be0153fa9906dd3ddf7e --- M src/target/trx_toolkit/_fake_trx.pyx 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/40068/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index e49d056..7c0fd35 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -113,8 +113,6 @@ # When disabled, RSSI is calculated based on Tx power and Rx path loss self.fake_rssi_enabled = False - self.rf_muted = False - # Actual ToA, RSSI, C/I, TA values self.tx_power_base = self.NOMINAL_TX_POWER_DEFAULT self.tx_att_base = self.TX_ATT_DEFAULT -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibd6b5dd7fa65e42cc864be0153fa9906dd3ddf7e Gerrit-Change-Number: 40068 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/_fake_trx: Move constants out of FakeTRX class
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40069?usp=email ) Change subject: trx_toolkit/_fake_trx: Move constants out of FakeTRX class ...................................................................... trx_toolkit/_fake_trx: Move constants out of FakeTRX class Accessing those constants via either self.CONSTANT, or FakeTRX.CONSTANT always do dict lookup on FakeTRX.__dict__ and there is no way to change that even with switching to cdef class. Dict lookups are slow. -> Fix that with moving constants to be module-level cdef globals which are now accessed statically and quickly. Change-Id: I0f1fa68f69438a75a69aa3cbe1e316375b58b8cc --- M src/target/trx_toolkit/_fake_trx.pyx 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/69/40069/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index 7c0fd35..c14895b 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -29,6 +29,18 @@ from gsm_shared import * +cdef int NOMINAL_TX_POWER_DEFAULT = 50 # dBm +cdef int TX_ATT_DEFAULT = 0 # dB +cdef int PATH_LOSS_DEFAULT = 110 # dB + +cdef int TOA256_BASE_DEFAULT = 0 +cdef int CI_BASE_DEFAULT = 90 + +# Default values for NOPE / IDLE indications +cdef int TOA256_NOISE_DEFAULT = 0 +cdef int RSSI_NOISE_DEFAULT = -110 +cdef int CI_NOISE_DEFAULT = -30 + class FakeTRX(Transceiver): """ Fake transceiver with RF path (burst loss, RSSI, TA, ToA) simulation. @@ -94,18 +106,6 @@ """ - NOMINAL_TX_POWER_DEFAULT = 50 # dBm - TX_ATT_DEFAULT = 0 # dB - PATH_LOSS_DEFAULT = 110 # dB - - TOA256_BASE_DEFAULT = 0 - CI_BASE_DEFAULT = 90 - - # Default values for NOPE / IDLE indications - TOA256_NOISE_DEFAULT = 0 - RSSI_NOISE_DEFAULT = -110 - CI_NOISE_DEFAULT = -30 - def __init__(self, *trx_args, **trx_kwargs): Transceiver.__init__(self, *trx_args, **trx_kwargs) @@ -114,11 +114,11 @@ self.fake_rssi_enabled = False # Actual ToA, RSSI, C/I, TA values - self.tx_power_base = self.NOMINAL_TX_POWER_DEFAULT - self.tx_att_base = self.TX_ATT_DEFAULT - self.toa256_base = self.TOA256_BASE_DEFAULT - self.rssi_base = self.NOMINAL_TX_POWER_DEFAULT - self.TX_ATT_DEFAULT - self.PATH_LOSS_DEFAULT - self.ci_base = self.CI_BASE_DEFAULT + self.tx_power_base = NOMINAL_TX_POWER_DEFAULT + self.tx_att_base = TX_ATT_DEFAULT + self.toa256_base = TOA256_BASE_DEFAULT + self.rssi_base = NOMINAL_TX_POWER_DEFAULT - TX_ATT_DEFAULT - PATH_LOSS_DEFAULT + self.ci_base = CI_BASE_DEFAULT self.ta = 0 # ToA, RSSI, C/I randomization thresholds @@ -218,9 +218,9 @@ msg.burst = None # burst bits are omited # TODO: shoud we make these values configurable? - msg.toa256 = self.TOA256_NOISE_DEFAULT - msg.rssi = self.RSSI_NOISE_DEFAULT - msg.ci = self.CI_NOISE_DEFAULT + msg.toa256 = TOA256_NOISE_DEFAULT + msg.rssi = RSSI_NOISE_DEFAULT + msg.ci = CI_NOISE_DEFAULT self.data_if.send_msg(msg) return @@ -230,7 +230,7 @@ # Apply RSSI based on transmitter: if not self.fake_rssi_enabled: - msg.rssi = src_trx.tx_power - src_msg.pwr - self.PATH_LOSS_DEFAULT + msg.rssi = src_trx.tx_power - src_msg.pwr - PATH_LOSS_DEFAULT else: # Apply fake RSSI msg.rssi = self.rssi -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0f1fa68f69438a75a69aa3cbe1e316375b58b8cc Gerrit-Change-Number: 40069 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/_fake_trx: Switch FakeTRX to cdef class
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40070?usp=email ) Change subject: trx_toolkit/_fake_trx: Switch FakeTRX to cdef class ...................................................................... trx_toolkit/_fake_trx: Switch FakeTRX to cdef class - Put fields into the object struct; fields are now accessed directly via that C-level struct instead of via __dict__ lookup - switch to invoke several internal FakeTRX functions via C-level where appropriate. - switch Transceiver.handle_data_msg from cpdef to cdef as now the only was-py implementation of that function (FakeTRX) was switched to C. - leave generating random data via C as TODO Change-Id: I12a7cff29dd86d199d77827f448eaaad537ce594 --- M src/target/trx_toolkit/_fake_trx.pyx M src/target/trx_toolkit/transceiver.pxd M src/target/trx_toolkit/transceiver.pyx 3 files changed, 46 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/40070/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index c14895b..5881cd1 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -26,7 +26,10 @@ from transceiver cimport Transceiver from data_msg import Modulation from udp_link cimport _raise_oserr -from gsm_shared import * +import gsm_shared +cdef object TrainingSeqGMSK = gsm_shared.TrainingSeqGMSK + +from cython cimport final cdef int NOMINAL_TX_POWER_DEFAULT = 50 # dBm @@ -41,7 +44,8 @@ cdef int RSSI_NOISE_DEFAULT = -110 cdef int CI_NOISE_DEFAULT = -30 -class FakeTRX(Transceiver): +@final +cdef class FakeTRX(Transceiver): """ Fake transceiver with RF path (burst loss, RSSI, TA, ToA) simulation. == ToA / RSSI measurement simulation @@ -106,6 +110,22 @@ """ + cdef public: + bint fake_rssi_enabled + int tx_power_base + int tx_att_base + int toa256_base + int rssi_base + int ci_base + int ta + + int toa256_rand_threshold + int rssi_rand_threshold + int ci_rand_threshold + + int burst_drop_amount + int burst_drop_period + def __init__(self, *trx_args, **trx_kwargs): Transceiver.__init__(self, *trx_args, **trx_kwargs) @@ -130,8 +150,7 @@ self.burst_drop_amount = 0 self.burst_drop_period = 1 - @property - def toa256(self): + cdef int toa256(self) except -1: # Check if randomization is required if self.toa256_rand_threshold == 0: return self.toa256_base @@ -139,10 +158,9 @@ # Generate a random ToA value in required range toa256_min = self.toa256_base - self.toa256_rand_threshold toa256_max = self.toa256_base + self.toa256_rand_threshold - return random.randint(toa256_min, toa256_max) + return random.randint(toa256_min, toa256_max) # TODO -> C - @property - def rssi(self): + cdef int rssi(self) except *: # Check if randomization is required if self.rssi_rand_threshold == 0: return self.rssi_base @@ -150,14 +168,12 @@ # Generate a random RSSI value in required range rssi_min = self.rssi_base - self.rssi_rand_threshold rssi_max = self.rssi_base + self.rssi_rand_threshold - return random.randint(rssi_min, rssi_max) + return random.randint(rssi_min, rssi_max) # TODO -> C - @property - def tx_power(self): + cdef int tx_power(self) noexcept: return self.tx_power_base - self.tx_att_base - @property - def ci(self): + cdef int ci(self) except *: # Check if randomization is required if self.ci_rand_threshold == 0: return self.ci_base @@ -165,11 +181,11 @@ # Generate a random C/I value in required range ci_min = self.ci_base - self.ci_rand_threshold ci_max = self.ci_base + self.ci_rand_threshold - return random.randint(ci_min, ci_max) + return random.randint(ci_min, ci_max) # TODO -> C # Path loss simulation: burst dropping # Returns: True - drop, False - keep - def sim_burst_drop(self, msg): + cdef bint sim_burst_drop(self, msg) except *: # Check if dropping is required if self.burst_drop_amount == 0: return False @@ -182,9 +198,9 @@ return False - def _handle_data_msg_v1(self, src_msg, msg): + cdef _handle_data_msg_v1(self, src_msg, msg): # C/I (Carrier-to-Interference ratio) - msg.ci = self.ci + msg.ci = self.ci() # Pick modulation type by burst length bl = len(src_msg.burst) @@ -192,7 +208,7 @@ # Pick TSC (Training Sequence Code) and TSC set if msg.mod_type is Modulation.ModGMSK: - ss = TrainingSeqGMSK.pick(src_msg.burst) + ss = TrainingSeqGMSK.pick(src_msg.burst) # TODO -> pyx msg.tsc = ss.tsc if ss is not None else 0 msg.tsc_set = ss.tsc_set if ss is not None else 0 else: # TODO: other modulation types (at least 8-PSK) @@ -202,7 +218,7 @@ # Takes (partially initialized) TRXD Rx message, # simulates RF path parameters (such as RSSI), # and sends towards the L1 - def handle_data_msg(self, Transceiver src_trx, src_msg, msg): + cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): if self.rf_muted: msg.nope_ind = True elif not msg.nope_ind: @@ -226,21 +242,25 @@ return # Complete message header - msg.toa256 = self.toa256 + msg.toa256 = self.toa256() + + cdef FakeTRX src_faketrx = None + if isinstance(src_trx, FakeTRX): + src_faketrx = src_trx # Apply RSSI based on transmitter: - if not self.fake_rssi_enabled: - msg.rssi = src_trx.tx_power - src_msg.pwr - PATH_LOSS_DEFAULT + if not self.fake_rssi_enabled and src_faketrx is not None: + msg.rssi = src_faketrx.tx_power() - src_msg.pwr - PATH_LOSS_DEFAULT else: # Apply fake RSSI - msg.rssi = self.rssi + msg.rssi = self.rssi() # Version specific fields if msg.ver >= 0x01: self._handle_data_msg_v1(src_msg, msg) # Apply optional Timing Advance - if src_trx.ta != 0: - msg.toa256 -= src_trx.ta * 256 + if src_faketrx is not None and src_faketrx.ta != 0: + msg.toa256 -= src_faketrx.ta * 256 Transceiver.send_data_msg(self, msg) diff --git a/src/target/trx_toolkit/transceiver.pxd b/src/target/trx_toolkit/transceiver.pxd index b76fa24..74ee982 100644 --- a/src/target/trx_toolkit/transceiver.pxd +++ b/src/target/trx_toolkit/transceiver.pxd @@ -49,5 +49,5 @@ cdef recv_data_msg(self) cdef send_data_msg(self, msg) - cpdef handle_data_msg(self, Transceiver src_trx, src_msg, msg) + cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg) cdef clck_tick(self, BurstForwarder fwd, fn) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index 8f8c9c6..19bdd09 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -294,7 +294,7 @@ # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) - cpdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): + cdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): self.send_data_msg(msg) cdef clck_tick(self, BurstForwarder fwd, fn): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12a7cff29dd86d199d77827f448eaaad537ce594 Gerrit-Change-Number: 40070 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit/data_msg: Replace `from gsm_shared import *` with explici...
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40071?usp=email ) Change subject: trx_toolkit/data_msg: Replace `from gsm_shared import *` with explicit import and at C level ...................................................................... trx_toolkit/data_msg: Replace `from gsm_shared import *` with explicit import and at C level gsm_shared is currently pure-py module, but still we can import needed constants and set them to C-level typed variables. It is both goods: all imports are explicit, and access to the constant now go faster instead of going through py-level module dict lookup. Change-Id: Ica8c73d6136053845415bdece48b24a7df6520be --- M src/target/trx_toolkit/data_msg.pyx 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/40071/1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index af0aac6..0da4f7c 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -25,7 +25,11 @@ from typing import List from enum import Enum from array import array -from gsm_shared import * + +import gsm_shared +cdef int GMSK_BURST_LEN = gsm_shared.GMSK_BURST_LEN +cdef int EDGE_BURST_LEN = gsm_shared.EDGE_BURST_LEN +cdef int GSM_HYPERFRAME = gsm_shared.GSM_HYPERFRAME # _bu2s converts unsigned byte to signed. def _bu2s(x): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40071?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica8c73d6136053845415bdece48b24a7df6520be Gerrit-Change-Number: 40071 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log