- gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: trx_toolkit/data_msg: TODO random -> C
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40088?usp=email ) Change subject: trx_toolkit/data_msg: TODO random -> C ...................................................................... trx_toolkit/data_msg: TODO random -> C With this patch I'm completing my optimization work on fake_trx. I have not had time to convert random routines to C yet. In my testing I was not activating any FakeTRX random modes at all and so lack of C random support was not showing in the profiles. But if those random modes will be activated py-level random will certainly slow things down. Add TODO entries to fix that. For the reference compared to the state where Cython was just introduced in I2159a07bece13bda4f6ccd957063d4644d8b5e4f (trx_toolkit: Move FakeTRX-related performance-sensitive modules to Cython) we now perform significantly better: for 1 BTS + 2 ccch_scan fake_trx now takes ~ 25% of CPU without clock overruns. While at that Pyx-base state it was taking ~ 70% of CPU with frequent clock overruns. Profiles at pyx-base and hereby state can be seen here: http://navytux.spb.ru/~kirr/osmo/fake_trx/pyx-base.html http://navytux.spb.ru/~kirr/osmo/fake_trx/pyx-optimized.html and if comparing the effect of whole optimization work starting from Ic9e16720daeb348b5f9c535c24a682db53a93529 parented on 54a0052a (fake_trx: Remove unneeded field assignment) the effect is as follows: Running 1 BTS + 2 Mobiles without Frequency Hopping + 1 ccch_scan Before optimization work: fake_trx is occupying 2 CPU cores loading every core close to 100% with hitting clock overrun non-stop. After optimization work: fake_Trx is occupying 1 CPU core with loading it ~ 35% by only one thread without hitting any clock overrun. Change-Id: If2c091c0a729a04dcac954ab0905b6f3be32a533 --- M src/target/trx_toolkit/data_msg.pyx 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/40088/1 diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index bdc3119..d62dd63 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -131,11 +131,11 @@ def rand_fn(self): ''' Generate a random frame number. ''' - return random.randint(0, GSM_HYPERFRAME) + return random.randint(0, GSM_HYPERFRAME) # TODO -> C def rand_tn(self): ''' Generate a random timeslot number. ''' - return random.randint(0, 7) + return random.randint(0, 7) # TODO -> C def rand_hdr(self): ''' Randomize the message header. ''' @@ -393,7 +393,7 @@ if max is None: max = PWR_MAX - return random.randint(min, max) + return random.randint(min, max) # TODO -> C def rand_hdr(self): ''' Randomize message specific header. ''' @@ -457,7 +457,7 @@ def rand_burst(self, length = GMSK_BURST_LEN): ''' Generate a random message specific burst. ''' - self.burst = bytearray([random.randint(0, 1) for _ in range(length)]) + self.burst = bytearray([random.randint(0, 1) for _ in range(length)]) # TODO -> C def trans(self, ver = None): ''' Transform this message into RxMsg. ''' @@ -625,7 +625,7 @@ if max is None: max = RSSI_MAX - return random.randint(min, max) + return random.randint(min, max) # TODO -> C def rand_toa256(self, min = None, max = None): ''' Generate a random ToA (Time of Arrival) value. ''' @@ -636,7 +636,7 @@ if max is None: max = TOA256_MAX - return random.randint(min, max) + return random.randint(min, max) # TODO -> C def rand_hdr(self): ''' Randomize message specific header. ''' @@ -646,15 +646,15 @@ self.toa256 = self.rand_toa256() if self.ver >= 0x01: - self.mod_type = random.choice(_mod_registry) + self.mod_type = random.choice(_mod_registry) # TODO -> C if self.mod_type is ModGMSK: - self.tsc_set = random.randint(0, 3) + self.tsc_set = random.randint(0, 3) # TODO -> C else: - self.tsc_set = random.randint(0, 1) - self.tsc = random.randint(0, TSC_MAX) + self.tsc_set = random.randint(0, 1) # TODO -> C + self.tsc = random.randint(0, TSC_MAX) # TODO -> C # C/I: Carrier-to-Interference ratio - self.ci = random.randint(CI_MIN, CI_MAX) + self.ci = random.randint(CI_MIN, CI_MAX) # TODO -> C def desc_hdr(self): ''' Generate human-readable header description. ''' @@ -815,7 +815,7 @@ if length is None: length = self.mod_type.bl - self.burst = array.array('b', [random.randint(-127, 127) for _ in range(length)]) + self.burst = array.array('b', [random.randint(-127, 127) for _ in range(length)]) # TODO -> C def trans(self, ver = None): ''' Transform this message to TxMsg. ''' -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40088?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: If2c091c0a729a04dcac954ab0905b6f3be32a533 Gerrit-Change-Number: 40088 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/*.pyx: Remove unused imports
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40089?usp=email ) Change subject: trx_toolkit/*.pyx: Remove unused imports ...................................................................... trx_toolkit/*.pyx: Remove unused imports Change-Id: Id16fe7cd83699c6e51f87c65e9a1969db92d13e5 --- M src/target/trx_toolkit/burst_fwd.pyx M src/target/trx_toolkit/data_msg.pyx 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/40089/1 diff --git a/src/target/trx_toolkit/burst_fwd.pyx b/src/target/trx_toolkit/burst_fwd.pyx index 10b1b58..7ebfb07 100644 --- a/src/target/trx_toolkit/burst_fwd.pyx +++ b/src/target/trx_toolkit/burst_fwd.pyx @@ -19,8 +19,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -import logging as log - cdef class BurstForwarder: """ Performs burst forwarding between transceivers. diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index d62dd63..dd8e05e 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -36,8 +36,6 @@ import random import abc -from typing import List - import gsm_shared cdef int GMSK_BURST_LEN = gsm_shared.GMSK_BURST_LEN cdef int EDGE_BURST_LEN = gsm_shared.EDGE_BURST_LEN -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40089?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: Id16fe7cd83699c6e51f87c65e9a1969db92d13e5 Gerrit-Change-Number: 40089 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/transceiver: Use `msg is None` instead of `not msg`
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40090?usp=email ) Change subject: trx_toolkit/transceiver: Use `msg is None` instead of `not msg` ...................................................................... trx_toolkit/transceiver: Use `msg is None` instead of `not msg` `msg is None` are two pointers comparision. `not msg` goes to py-level and can generally invoke arbitrary python code. Change-Id: I1278bed0a83dfac13734467f5333fae30e19bd5a --- M src/target/trx_toolkit/transceiver.pyx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/40090/1 diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index 901a637..2b408a5 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -277,7 +277,7 @@ cdef TxMsg recv_data_msg(self): # -> TxMsg | None # Read and parse data from socket msg = self.data_if.recv_tx_msg() - if not msg: + if msg is None: return None # Make sure that transceiver is configured and running -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40090?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: I1278bed0a83dfac13734467f5333fae30e19bd5a Gerrit-Change-Number: 40090 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 serialization
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40080?usp=email ) Change subject: trx_toolkit/data_msg: Optimize RxMsg/TxMsg serialization ...................................................................... trx_toolkit/data_msg: Optimize RxMsg/TxMsg serialization Thread all calls related to serialization to be done at C-level and with explicit types. Replace struct.pack and bytearray .append and .extend with C-level custom routines to do so. Change-Id: Ia203d39c8906ca8bb2fac078a818219dcdcf2565 --- 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, 54 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/40080/1 diff --git a/src/target/trx_toolkit/data_if.pyx b/src/target/trx_toolkit/data_if.pyx index 71a1878..a23a52b 100644 --- a/src/target/trx_toolkit/data_if.pyx +++ b/src/target/trx_toolkit/data_if.pyx @@ -103,7 +103,7 @@ cdef _send_msg(self, Msg msg, bint legacy = False): try: # Validate and encode a TRXD message - payload = msg.gen_msg(legacy) + payload = msg._gen_msg(legacy) except ValueError as e: log.error("Failed to encode a TRXD message ('%s') " "due to error: %s" % (msg.desc_hdr(), e)) diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index 6823397..29d1702 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -36,6 +36,7 @@ cdef parse_burst(self, bytearray burst) cdef int _parse_msg(self, bytearray msg) except -1 cdef _validate(self) + cdef bytearray _gen_msg(self, bint legacy) @staticmethod cdef void __usbit2sbit(const uint8_t *usbits, Py_ssize_t l, int8_t *sbits) noexcept diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 34f6a12..98dbece 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -30,8 +30,10 @@ from cpython.bytearray cimport PyByteArray_AS_STRING, PyByteArray_GET_SIZE from xpy cimport PyByteArray_Resize +from libc.string cimport memcpy + + import random -import struct import abc from typing import List @@ -241,20 +243,22 @@ if self.tn < 0 or self.tn > 7: raise ValueError("TDMA time-slot %d is out of range" % self.tn) - def gen_msg(self, legacy = False): + def gen_msg(self, bint legacy = False): + return self._gen_msg(legacy) + cdef bytearray _gen_msg(self, bint legacy): ''' Generate a TRX DATA message. ''' # Validate all the fields self._validate() # Allocate an empty byte-array - buf = bytearray() + cdef bytearray buf = PyByteArray_FromStringAndSize(NULL, 0) # Put version (4 bits) and TDMA TN (3 bits) - buf.append((self.ver << 4) | (self.tn & 0x07)) + _append_u8(buf, (self.ver << 4) | (self.tn & 0x07)) # Put TDMA FN (4 octets, BE) - buf += struct.pack(">L", self.fn) + _append_u32(buf, self.fn) # Generate message specific header part self.append_hdr_to(buf) @@ -265,7 +269,7 @@ # This is a rudiment from (legacy) OpenBTS transceiver, # some L1 implementations still expect two dummy bytes. if legacy and self.ver == 0x00: - buf += bytearray(2) + _append_u16(buf, 0) return buf @@ -388,7 +392,7 @@ ''' Generate message specific header by appending it to buf. ''' # Put power - buf.append(self.pwr) + _append_u8(buf, self.pwr) cdef parse_hdr(self, bytearray msg): ''' Parse message specific header part. ''' @@ -404,7 +408,10 @@ # Copy burst 'as is' if self.burst is None: return - return buf.extend(self.burst) + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+len(self.burst)) + memcpy(&PyByteArray_AS_STRING(buf)[l], + PyByteArray_AS_STRING(self.burst), len(self.burst)) cdef parse_burst(self, bytearray burst): ''' Parse message specific burst. ''' @@ -691,19 +698,20 @@ ''' Generate message specific header by appending it to buf. ''' # Put RSSI - buf.append(-self.rssi) + _append_u8(buf, -self.rssi) # Encode ToA (Time of Arrival) # Big endian, 2 bytes (int32_t) - buf += struct.pack(">h", self.toa256) + _append_s16(buf, self.toa256) if self.ver >= 0x01: # Modulation and Training Sequence info mts = self.gen_mts() - buf.append(mts) + _append_u8(buf, mts) + # C/I: Carrier-to-Interference ratio (in centiBels) - buf += struct.pack(">h", self.ci) + _append_s16(buf, self.ci) cdef parse_hdr(self, bytearray msg): ''' Parse message specific header part. ''' @@ -786,6 +794,38 @@ # ---- misc ---- +# _append_(u|s)(8|16|32) append to bytearray buf big-endian representation of specified integer v. + +cdef int _append_u8(bytearray buf, uint8_t v) except -1: + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+1) + PyByteArray_AS_STRING(buf)[l] = v + + +cdef int _append_u16(bytearray buf, uint16_t v) except -1: + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+2) + x = &PyByteArray_AS_STRING(buf)[l] + x[0] = (v >> 8) & 0xff + x[1] = (v >> 0) & 0xff + +cdef int _append_s16(bytearray buf, int16_t v) except -1: + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+2) + x = &PyByteArray_AS_STRING(buf)[l] + x[0] = <uint8_t>((v >> 8) & 0xff) + x[1] = <uint8_t>((v >> 0) & 0xff) + +cdef int _append_u32(bytearray buf, uint32_t v) except -1: + l = PyByteArray_GET_SIZE(buf) + PyByteArray_Resize(buf, l+4) + x = &PyByteArray_AS_STRING(buf)[l] + x[0] = (v >> 24) & 0xff + x[1] = (v >> 16) & 0xff + x[2] = (v >> 8) & 0xff + x[3] = (v >> 0) & 0xff + + # _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): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40080?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: Ia203d39c8906ca8bb2fac078a818219dcdcf2565 Gerrit-Change-Number: 40080 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_msg: Switch Msg .fn/.tn from object to int64_t
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40081?usp=email ) Change subject: trx_toolkit/data_msg: Switch Msg .fn/.tn from object to int64_t ...................................................................... trx_toolkit/data_msg: Switch Msg .fn/.tn from object to int64_t This are integer fields, assigning them C-level type avoid py-level overhead when accessing and doing arithmetics with them. Change-Id: Iea31825f974734e727fe05da9e78ee67afb59d5b --- M src/target/trx_toolkit/_fake_trx.pyx M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx M src/target/trx_toolkit/fake_pm.py M src/target/trx_toolkit/test_data_msg.py M src/target/trx_toolkit/transceiver.pxd M src/target/trx_toolkit/transceiver.pyx 7 files changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/40081/1 diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index aa56afa..bf24cda 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -432,7 +432,7 @@ self.burst_fwd = BurstForwarder(trx_list.trx_list) # This method will be called by the clock generator - def clck_handler(self, fn): + def clck_handler(self, int64_t fn): cdef Transceiver trx # We assume that this list is immutable at run-time for trx in self.trx_list: diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index 29d1702..823ec8d 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 int8_t, uint8_t +from libc.stdint cimport int8_t, int64_t, uint8_t cdef class Modulation: cdef int coding # Coding in TRXD header @@ -21,8 +21,8 @@ cdef class Msg: cdef readonly int ver - cdef readonly object fn # int | None - cdef readonly object tn # int | None + cdef readonly int64_t fn # -1 if not valid + cdef readonly int8_t tn # -1 if not valid cdef public bint nope_ind diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 98dbece..64139a4 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -20,7 +20,7 @@ # GNU General Public License for more details. from cython cimport final -from libc.stdint cimport int16_t, uint16_t, uint32_t +from libc.stdint cimport int16_t, int64_t, uint16_t, uint32_t from cpython cimport array cdef array.array _Bempty = array.array('B', []) @@ -86,7 +86,7 @@ CHDR_VERSION_MAX = 0b1111 KNOWN_VERSIONS = tuple(range(KNOWN_VERSION_MAX+1)) - def __cinit__(self, fn = -1, tn = -1, int ver = 0): + def __cinit__(self, int64_t fn = -1, int64_t tn = -1, int ver = 0): self.ver = ver self.fn = fn self.tn = tn @@ -231,13 +231,13 @@ if not (0 <= self.ver <= KNOWN_VERSION_MAX): raise ValueError("Unknown TRXD header version %d" % self.ver) - if self.fn is None: + if self.fn == -1: raise ValueError("TDMA frame-number is not set") if self.fn < 0 or self.fn > GSM_HYPERFRAME: raise ValueError("TDMA frame-number %d is out of range" % self.fn) - if self.tn is None: + if self.tn == -1: raise ValueError("TDMA time-slot is not set") if self.tn < 0 or self.tn > 7: diff --git a/src/target/trx_toolkit/fake_pm.py b/src/target/trx_toolkit/fake_pm.py index 205596a..191b203 100644 --- a/src/target/trx_toolkit/fake_pm.py +++ b/src/target/trx_toolkit/fake_pm.py @@ -59,7 +59,7 @@ def rssi_trx(self): return randint(self.trx_min, self.trx_max) - def measure(self, freq, fn = None): + def measure(self, freq, fn = -1): # Iterate over all known transceivers for trx in self.trx_list: if not trx.running: @@ -67,7 +67,7 @@ # FIXME: we need to know current TDMA frame number here, # because some transceivers may use frequency hopping - if trx.fh is not None and fn is None: + if trx.fh is not None and fn == -1: continue # Match by given frequency diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py index e6cb906..db9a998 100644 --- a/src/target/trx_toolkit/test_data_msg.py +++ b/src/target/trx_toolkit/test_data_msg.py @@ -67,12 +67,12 @@ msg = RxMsg() msg.validate() with self.assertRaises(ValueError): - msg = RxMsg(fn = None, tn = 0) + msg = RxMsg(fn = -1, tn = 0) msg.validate() # Out-of-range value(s) with self.assertRaises(ValueError): - msg = RxMsg(fn = -1, tn = 0) + msg = RxMsg(fn = -2, tn = 0) msg.validate() with self.assertRaises(ValueError): msg = RxMsg(fn = 0, tn = 10) diff --git a/src/target/trx_toolkit/transceiver.pxd b/src/target/trx_toolkit/transceiver.pxd index 2fb2fb7..562cb34 100644 --- a/src/target/trx_toolkit/transceiver.pxd +++ b/src/target/trx_toolkit/transceiver.pxd @@ -5,6 +5,8 @@ from burst_fwd cimport BurstForwarder from _clck_gen cimport CLCKGen +from libc.stdint cimport int64_t + cdef class Transceiver: cdef public: @@ -45,10 +47,10 @@ list[TxMsg] _tx_queue - cdef get_rx_freq(self, fn) - cpdef get_tx_freq(self, fn) + cdef get_rx_freq(self, int64_t fn) + cpdef get_tx_freq(self, int64_t fn) 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) + cdef clck_tick(self, BurstForwarder fwd, int64_t fn) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index 2e8a064..b28dee8 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -213,7 +213,7 @@ return True - cdef get_rx_freq(self, fn): + cdef get_rx_freq(self, int64_t fn): if self.fh is None: return self._rx_freq @@ -221,7 +221,7 @@ (rx_freq, _) = self.fh.resolve(fn) return rx_freq - cpdef get_tx_freq(self, fn): + cpdef get_tx_freq(self, int64_t fn): if self.fh is None: return self._tx_freq @@ -297,7 +297,7 @@ 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): + cdef clck_tick(self, BurstForwarder fwd, int64_t fn): if not self.running: return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40081?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: Iea31825f974734e727fe05da9e78ee67afb59d5b Gerrit-Change-Number: 40081 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: Switch TxMsg .pwr from object to int
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40082?usp=email ) Change subject: trx_toolkit/data_msg: Switch TxMsg .pwr from object to int ...................................................................... trx_toolkit/data_msg: Switch TxMsg .pwr from object to int This is integer field, assigning C-level type avoid py-related overhead on access and arithmetics. Change-Id: Ibf07cd99d758e516317a16b4df3cd0dc90fc5c07 --- M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/40082/1 diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index 823ec8d..e5c605e 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -60,7 +60,8 @@ @final cdef class TxMsg(Msg): cdef public bytearray burst # | None - cdef readonly object pwr # int | None + cdef readonly int pwr # -1 if unset + cpdef validate(self) diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 64139a4..1d40726 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -323,7 +323,7 @@ def __cinit__(self): self.burst = None - self.pwr = None + self.pwr = -1 cdef int HDR_LEN(self) except -1: ''' Calculate header length depending on its version. ''' @@ -345,7 +345,7 @@ # Validate common fields Msg._validate(self) - if self.pwr is None: + if self.pwr == -1: raise ValueError("Tx Attenuation level is not set") if self.pwr < PWR_MIN or self.pwr > PWR_MAX: @@ -382,7 +382,7 @@ # Describe the common part result = Msg.desc_hdr(self) - if self.pwr is not None: + if self.pwr != -1: result += ("pwr=%u " % self.pwr) # Strip useless whitespace and return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40082?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: Ibf07cd99d758e516317a16b4df3cd0dc90fc5c07 Gerrit-Change-Number: 40082 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/transceiver: Switch Transceiver ._rx_freq ._tx_freq from ...
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40084?usp=email ) Change subject: trx_toolkit/transceiver: Switch Transceiver ._rx_freq ._tx_freq from object to int ...................................................................... trx_toolkit/transceiver: Switch Transceiver ._rx_freq ._tx_freq from object to int This are integer fields, assigning C-level type avoids py-related overhead on access and arithmetics. This fields are frequently used by BurstForwarder when checking if src and dst trx frequencies match each other. Change-Id: Ie9fb076837afe8921b7c5f5022bfad41f7a30e48 --- M src/target/trx_toolkit/transceiver.pxd M src/target/trx_toolkit/transceiver.pyx 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/40084/1 diff --git a/src/target/trx_toolkit/transceiver.pxd b/src/target/trx_toolkit/transceiver.pxd index 562cb34..fa025bb 100644 --- a/src/target/trx_toolkit/transceiver.pxd +++ b/src/target/trx_toolkit/transceiver.pxd @@ -26,8 +26,8 @@ object child_trx_list # TRXList # Actual RX / TX frequencies - object _rx_freq # None if unset - object _tx_freq # None if unset + int _rx_freq # -1 if unset + int _tx_freq # -1 if unset bint rf_muted @@ -47,8 +47,8 @@ list[TxMsg] _tx_queue - cdef get_rx_freq(self, int64_t fn) - cpdef get_tx_freq(self, int64_t fn) + cdef int get_rx_freq(self, int64_t fn) except -1 + cpdef int get_tx_freq(self, int64_t fn) except -1 cdef TxMsg recv_data_msg(self) cdef send_data_msg(self, RxMsg msg) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index b28dee8..901a637 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -143,8 +143,8 @@ """ def __cinit__(self): - self._rx_freq = None - self._tx_freq = None + self._rx_freq = -1 + self._tx_freq = -1 self.rf_muted = False self.running = False @@ -206,14 +206,14 @@ @property def ready(self): # Make sure that either both Rx/Tx frequencies are set - if self._rx_freq is None or self._tx_freq is None: + if self._rx_freq < 0 or self._tx_freq < 0: # ... or frequency hopping is in use if self.fh is None: return False return True - cdef get_rx_freq(self, int64_t fn): + cdef int get_rx_freq(self, int64_t fn) except -1: if self.fh is None: return self._rx_freq @@ -221,7 +221,7 @@ (rx_freq, _) = self.fh.resolve(fn) return rx_freq - cpdef get_tx_freq(self, int64_t fn): + cpdef int get_tx_freq(self, int64_t fn) except -1: if self.fh is None: return self._tx_freq -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40084?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: Ie9fb076837afe8921b7c5f5022bfad41f7a30e48 Gerrit-Change-Number: 40084 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 RxMsg .rssi .toa256 .tsc_set .tsc .ci fr...
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40083?usp=email ) Change subject: trx_toolkit/data_msg: Switch RxMsg .rssi .toa256 .tsc_set .tsc .ci from object to int ...................................................................... trx_toolkit/data_msg: Switch RxMsg .rssi .toa256 .tsc_set .tsc .ci from object to int This are integer fields, assigning C-level type avoids py-related overhead on access and arithmetics. Change-Id: I66abcf26896ab83f94f144941ea2dd64f7a4821f --- 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, 28 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/40083/1 diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index e5c605e..e0acbda 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -70,15 +70,15 @@ 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 + cdef public int rssi # RSSI_UNSET - unset + cdef public int toa256 # TOA256_UNSET - unset # 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 public int tsc_set # -1 if unset + cdef public int tsc # -1 if unset + cdef public int ci # CI_UNSET if unset cdef _validate_burst_v0(self) diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 1d40726..1e786c1 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -453,10 +453,12 @@ # rxlev2dbm(0..63) gives us [-110..-47], plus -10 dbm for noise cdef int RSSI_MIN = -120 cdef int RSSI_MAX = -47 +cdef int RSSI_UNSET = 0 # Min and max values of int16_t cdef int TOA256_MIN = -32768 -cdef int TOA256_MAX = 32767 +cdef int TOA256_MAX = 32767-1 +cdef int TOA256_UNSET = TOA256_MAX+1 # TSC (Training Sequence Code) range is [0, 7] cdef int TSC_MAX = 7 @@ -464,6 +466,7 @@ # C/I range (in centiBels) cdef int CI_MIN = -1280 cdef int CI_MAX = 1280 +cdef int CI_UNSET = 0x7fff # IDLE frame / nope detection indicator cdef int NOPE_IND = (1 << 7) @@ -474,16 +477,16 @@ ''' Rx (TRX -> L1) message coding API. ''' def __cinit__(self): - self.rssi = None - self.toa256 = None + self.rssi = RSSI_UNSET + self.toa256 = TOA256_UNSET # Version 0x01 specific (default values) self.mod_type = ModGMSK self.nope_ind = False - self.tsc_set = None - self.tsc = None - self.ci = None + self.tsc_set = -1 + self.tsc = -1 + self.ci = CI_UNSET cdef int HDR_LEN(self) except -1: ''' Calculate header length depending on its version. ''' @@ -541,13 +544,13 @@ # Validate common fields Msg._validate(self) - if self.rssi is None: + if self.rssi == RSSI_UNSET: raise ValueError("RSSI is not set") if self.rssi < RSSI_MIN or self.rssi > RSSI_MAX: raise ValueError("RSSI %d is out of range" % self.rssi) - if self.toa256 is None: + if self.toa256 == TOA256_UNSET: raise ValueError("ToA256 is not set") if self.toa256 < TOA256_MIN or self.toa256 > TOA256_MAX: @@ -558,7 +561,7 @@ if type(self.mod_type) is not Modulation: raise ValueError("Unknown Rx modulation type") - if self.tsc_set is None: + if self.tsc_set == -1: raise ValueError("TSC set is not set") if self.mod_type is ModGMSK: @@ -568,7 +571,7 @@ if not (0 <= self.tsc_set < 2): raise ValueError("TSC set %d is out of range" % self.tsc_set) - if self.tsc is None: + if self.tsc == -1: raise ValueError("TSC is not set") if not (0 <= self.tsc <= TSC_MAX): @@ -576,7 +579,7 @@ # Version specific parameters (also present in NOPE.ind) if self.ver >= 0x01: - if self.ci is None: + if self.ci == CI_UNSET: raise ValueError("C/I is not set") if self.ci < CI_MIN or self.ci > CI_MAX: @@ -630,21 +633,21 @@ # Describe the common part result = Msg.desc_hdr(self) - if self.rssi is not None: + if self.rssi != RSSI_UNSET: result += ("rssi=%d " % self.rssi) - if self.toa256 is not None: + if self.toa256 != TOA256_UNSET: result += ("toa256=%d " % self.toa256) if self.ver >= 0x01: if not self.nope_ind: if self.mod_type is not None: result += ("%s " % self.mod_type) - if self.tsc_set is not None: + if self.tsc_set != -1: result += ("set=%u " % self.tsc_set) - if self.tsc is not None: + if self.tsc != -1: result += ("tsc=%u " % self.tsc) - if self.ci is not None: + if self.ci != CI_UNSET: result += ("C/I=%d cB " % self.ci) else: result += "(IDLE / NOPE IND) " @@ -676,8 +679,8 @@ self.nope_ind = (mts & NOPE_IND) > 0 if self.nope_ind: self.mod_type = None - self.tsc_set = None - self.tsc = None + self.tsc_set = -1 + self.tsc = -1 return 0 # TSC: . . . . . X X X diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py index db9a998..8d1d014 100644 --- a/src/target/trx_toolkit/test_data_msg.py +++ b/src/target/trx_toolkit/test_data_msg.py @@ -102,8 +102,8 @@ else: msg.nope_ind = True msg.mod_type = None - msg.tsc_set = None - msg.tsc = None + msg.tsc_set = -1 + msg.tsc = -1 # Encode a given message to bytes msg_enc = msg.gen_msg(legacy) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40083?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: I66abcf26896ab83f94f144941ea2dd64f7a4821f Gerrit-Change-Number: 40083 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_msg: Disable cyclic GC support for RxMsg
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40085?usp=email ) Change subject: trx_toolkit/data_msg: Disable cyclic GC support for RxMsg ...................................................................... trx_toolkit/data_msg: Disable cyclic GC support for RxMsg Checking profiling turned out that there are frequent PyObject_GC_Track/PyObject_GC_UnTrack for RxMsg because BurstForwarder creates RxMsg often: to forward on received TxMsg burst to N destinations - N RxMsg instances are currently created. Investigating generated data_msg.c code shows that neither Msg, nor TxMsg have Py_TPFLAGS_HAVE_GC flag set, but RxMsg does have it set and does have generated .tp_traverse and .tp_clear routines. Investigating a bit more turns our that if we exclude `array.array burst` from RxMsg definition, all those cyclic-GC related things go away from generated code. So somehow Cython thinks that array.array can have a back pointer to RxMsg and emits GC supporting code due to that. But that is not possible to have a back-pointer from array.array to RxMsg: the only object that array.array references is arraydescr object: https://github.com/cython/cython/blob/e22e99e9/Cython/Includes/cpython/arra… which is plain C struct inside and does not reference other objects at all: https://github.com/cython/cython/blob/e22e99e9/Cython/Includes/cpython/arra… -> So disable cyclic-GC support for RxMsg to avoid associated overhead. Do so for TxMsg and Msg explicitly for symmetry as well. Change-Id: I2c592cec4931db04c29cadfeb97ce5325295d862 --- M src/target/trx_toolkit/data_msg.pxd M src/target/trx_toolkit/data_msg.pyx 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/40085/1 diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index e0acbda..2eb6ed3 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # cython: language_level=3 -from cython cimport final +from cython cimport final, no_gc # NOTE no_gc means "no cyclic gc", acyclic gc support is still there from cpython cimport array from libc.stdint cimport int8_t, int64_t, uint8_t @@ -19,6 +19,7 @@ cdef Modulation ModGMSK +@no_gc cdef class Msg: cdef readonly int ver cdef readonly int64_t fn # -1 if not valid @@ -58,6 +59,7 @@ @final +@no_gc cdef class TxMsg(Msg): cdef public bytearray burst # | None cdef readonly int pwr # -1 if unset @@ -67,6 +69,7 @@ @final +@no_gc # NOTE by default cython thinks that .burst might participate in cycle cdef class RxMsg(Msg): cdef public array.array burst # array.array[b] | None diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 1e786c1..304dbdb 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -19,7 +19,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -from cython cimport final +from cython cimport final, no_gc from libc.stdint cimport int16_t, int64_t, uint16_t, uint32_t from cpython cimport array @@ -79,6 +79,7 @@ cdef int KNOWN_VERSION_MAX = 1 # 0, 1 +@no_gc cdef class Msg: ''' TRXD (DATA) message coding API (common part). ''' @@ -318,6 +319,7 @@ cdef int PWR_MAX = 0xff @final +@no_gc cdef class TxMsg(Msg): ''' Tx (L1 -> TRX) message coding API. ''' @@ -473,6 +475,7 @@ @final +@no_gc cdef class RxMsg(Msg): ''' Rx (TRX -> L1) message coding API. ''' -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40085?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: I2c592cec4931db04c29cadfeb97ce5325295d862 Gerrit-Change-Number: 40085 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/burst_fwd: Reuse RxMsg object
by kirr 17 Apr '25

17 Apr '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40086?usp=email ) Change subject: trx_toolkit/burst_fwd: Reuse RxMsg object ...................................................................... trx_toolkit/burst_fwd: Reuse RxMsg object To forward each received TxMsg BurstForwarder currently creates RxMsg via TxMsg.trans(), then sends created RxMsg to destination trx. Creating RxMsg and convertion TxMsg .burst to RxMsg .burst all show in the profile. -> Optimize the first part of this story: create RxMsg only once and reuse it, by resetting, each time we need to forward a message. This is safe to do as that RxMsg is created by BurstForwarder internally and is not exposed to any upper layer at all. In other words it has strictly controlled lifetime limited by the forwarding activity. Change-Id: Ie0690da0f901f4f19a7e4cf048bdc244a24235b0 --- 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 4 files changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/40086/1 diff --git a/src/target/trx_toolkit/burst_fwd.pxd b/src/target/trx_toolkit/burst_fwd.pxd index 486faa1..87ae95d 100644 --- a/src/target/trx_toolkit/burst_fwd.pxd +++ b/src/target/trx_toolkit/burst_fwd.pxd @@ -1,9 +1,10 @@ # cython: language_level=3 -from data_msg cimport TxMsg +from data_msg cimport TxMsg, RxMsg from transceiver cimport Transceiver cdef class BurstForwarder: cdef list[Transceiver] trx_list + cdef RxMsg tx_msg # reused RxMsg to avoid object allocation at every forward_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 d13f784..db910ad 100644 --- a/src/target/trx_toolkit/burst_fwd.pyx +++ b/src/target/trx_toolkit/burst_fwd.pyx @@ -42,6 +42,7 @@ def __cinit__(self, list trx_list): self.trx_list = trx_list + self.tx_msg = RxMsg() cdef forward_msg(self, Transceiver src_trx, TxMsg rx_msg): # Originating Transceiver may use frequency hopping, @@ -66,5 +67,13 @@ continue # Transform from TxMsg to RxMsg and forward - tx_msg = rx_msg.trans(ver = trx.data_if._hdr_ver) + tx_msg = self.tx_msg # reuse tx_msg object instead of allocating it each time + tx_msg._reset() + tx_msg.fn = rx_msg.fn + tx_msg.tn = rx_msg.tn + tx_msg.ver = trx.data_if._hdr_ver + if rx_msg.burst is not None: + tx_msg.burst = RxMsg._ubit2sbit(rx_msg.burst) + tx_msg.nope_ind = (rx_msg.burst is None) + trx.handle_data_msg(src_trx, rx_msg, tx_msg) diff --git a/src/target/trx_toolkit/data_msg.pxd b/src/target/trx_toolkit/data_msg.pxd index 2eb6ed3..2ddd248 100644 --- a/src/target/trx_toolkit/data_msg.pxd +++ b/src/target/trx_toolkit/data_msg.pxd @@ -31,6 +31,7 @@ cdef int CHDR_LEN() noexcept cdef int HDR_LEN(self) except -1 + cdef _reset(self) cdef append_hdr_to(self, bytearray buf) cdef append_burst_to(self, bytearray buf) cdef parse_hdr(self, bytearray msg) diff --git a/src/target/trx_toolkit/data_msg.pyx b/src/target/trx_toolkit/data_msg.pyx index 304dbdb..07b3d38 100644 --- a/src/target/trx_toolkit/data_msg.pyx +++ b/src/target/trx_toolkit/data_msg.pyx @@ -87,10 +87,15 @@ CHDR_VERSION_MAX = 0b1111 KNOWN_VERSIONS = tuple(range(KNOWN_VERSION_MAX+1)) - def __cinit__(self, int64_t fn = -1, int64_t tn = -1, int ver = 0): + def __init__(self, int64_t fn = -1, int64_t tn = -1, int ver = 0): + self._reset() self.ver = ver self.fn = fn self.tn = tn + cdef _reset(self): + self.ver = 0 + self.fn = -1 + self.tn = -1 self.nope_ind = False @staticmethod @@ -323,7 +328,8 @@ cdef class TxMsg(Msg): ''' Tx (L1 -> TRX) message coding API. ''' - def __cinit__(self): + cdef _reset(self): + Msg._reset(self) self.burst = None self.pwr = -1 @@ -479,7 +485,9 @@ cdef class RxMsg(Msg): ''' Rx (TRX -> L1) message coding API. ''' - def __cinit__(self): + cdef _reset(self): + Msg._reset(self) + self.burst = None self.rssi = RSSI_UNSET self.toa256 = TOA256_UNSET -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40086?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: Ie0690da0f901f4f19a7e4cf048bdc244a24235b0 Gerrit-Change-Number: 40086 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