April 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: ts_102_221: Add encode/write support of EF.ARR records

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27650 ) Change subject: ts_102_221: Add encode/write support of EF.ARR records ...................................................................... ts_102_221: Add encode/write support of EF.ARR records With this change, we can also encode/write EF.ARR records, not just decode/read. Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182 --- M pySim/ts_102_221.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/27650/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 713d169..bf63f55 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -672,6 +672,11 @@ # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0] + def _encode_record_bin(self, in_json): + # we can only guess if we should decode for EF or DF here :( + arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) + return arr_seq.encode_multi(in_json) + @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): def __init__(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182 Gerrit-Change-Number: 27650 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in pysim[master]: utils: Add DataObjectSequence.encode_multi()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27649 ) Change subject: utils: Add DataObjectSequence.encode_multi() ...................................................................... utils: Add DataObjectSequence.encode_multi() This is the analogous to the decode_multi() method. Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa --- M pySim/utils.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/27649/1 diff --git a/pySim/utils.py b/pySim/utils.py index 8a7fcdb..ef770f9 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1561,6 +1561,18 @@ i += 1 return encoded + def encode_multi(self, decoded) -> bytes: + """Encode multiple occurrences of the sequence from the decoded input data. + Args: + decoded : list of json-serializable input data; one sequence per list item + Returns: + binary encoded output data + """ + encoded = bytearray() + for d in decoded: + encoded += self.encode(d) + return encoded + class CardCommand: """A single card command / instruction.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa Gerrit-Change-Number: 27649 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-gbproxy[master]: docs: usermanual: add new chapter gb-ns2-maintenance

by daniel

Attention is currently required from: lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 ) Change subject: docs: usermanual: add new chapter gb-ns2-maintenance ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I951cc10d86de4f16d2226b34eda55202373c2524 Gerrit-Change-Number: 27306 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 05 Apr 2022 12:36:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in pysim[master]: utils: Fix bugs in DataObject encoders

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27648 ) Change subject: utils: Fix bugs in DataObject encoders ...................................................................... utils: Fix bugs in DataObject encoders The DataObject is some weird / rarely used different code than the normal TLV encoder/decoder. It has apparently so far only been used for decoding, without testing the encoding side, resulting in related bugs. Let's fix those that I encountered today, and add a test case. Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4 --- M pySim/utils.py M tests/test_utils.py 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/27648/1 diff --git a/pySim/utils.py b/pySim/utils.py index 555aa82..8a7fcdb 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1333,7 +1333,7 @@ bytes encoded in TLV format. """ val = self.to_bytes() - return bytes(self._compute_tag()) + bytes(len(val)) + val + return bertlv_encode_tag(self._compute_tag()) + bertlv_encode_len(len(val)) + val # 'codec' interface def decode(self, binary: bytes) -> Tuple[dict, bytes]: @@ -1481,7 +1481,8 @@ # 'codec' interface def encode(self, decoded) -> bytes: - obj = self.members_by_name(decoded[0]) + obj = self.members_by_name[list(decoded)[0]] + obj.decoded = list(decoded.values())[0] return obj.to_tlv() diff --git a/tests/test_utils.py b/tests/test_utils.py index ae23461..b7f790d 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -4,6 +4,22 @@ from pySim import utils from pySim.ts_31_102 import EF_SUCI_Calc_Info +# we don't really want to thest TS 102 221, but the underlying DataObject codebase +from pySim.ts_102_221 import AM_DO_EF, AM_DO_DF, SC_DO + +class DoTestCase(unittest.TestCase): + + def testSeqOfChoices(self): + """A sequence of two choices with each a variety of DO/TLVs""" + arr_seq = utils.DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) + # input data + dec_in = [{'access_mode': ['update_erase', 'read_search_compare']}, {'control_reference_template':'PIN1'}] + # encode it once + encoded = arr_seq.encode(dec_in) + # decode again + re_decoded = arr_seq.decode(encoded) + self.assertEqual(dec_in, re_decoded[0]) + class DecTestCase(unittest.TestCase): # TS33.501 Annex C.4 test keys hnet_pubkey_profile_b = "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1" # ID 27 in test file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4 Gerrit-Change-Number: 27648 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... Patch Set 3: (1 comment) File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/c/libosmocore/+/27646/comment/c7165e06_d3648808 PS3, Line 356: RSL_IE_LLP_APDU, There's lots of lines above that don't have " = ". These are not covered by the check. Adjust them in the patch as well (or rather in a separate patch)? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 12:28:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... Patch Set 3: (2 comments) File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/c/libosmocore/+/27646/comment/ff5609dc_d41744b3 PS3, Line 388: RSL_IE_IPAC_RTP_PAYLOAD2 = 0xfc, > It is needed to have same syntax in all enums, with a separation between name and equal. […] Ok, fine then. File src/gsm/rsl.c: https://gerrit.osmocom.org/c/libosmocore/+/27646/comment/1ddafb2d_eeb5b33a PS3, Line 128: [RSL_IE_IPAC_SRTP_CONFIG] = { TLV_TYPE_TLV }, > It's not unrelated, precisely having this line makes the new contrib/jenkins. […] Ok, but I still think fixing things and adding build verification checks are separate things. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 12:14:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message ...................................................................... Patch Set 1: (3 comments) File tests/abis/abis_test.c: https://gerrit.osmocom.org/c/libosmocore/+/27644/comment/2b2de44c_60f2dde4 PS1, Line 196: SYS#5915 > Same here. I think it's fine as used here, the comment makes sense even without (being able to) reading the issue, but it can be useful if somebody wants the additional context. https://gerrit.osmocom.org/c/libosmocore/+/27644/comment/c225a99e_363a7e7e PS1, Line 235: 5891 * different issue number? * I'd also not mention it here, having it once in the comment makes more sense IMHO https://gerrit.osmocom.org/c/libosmocore/+/27644/comment/a9c14de7_52bc27f9 PS1, Line 251: sys5915 > It is still fine to add a suffix to it in case we want to test decoding same message type using diff […] Using tickets in the function names seems weird to me. Even if one has access to it, it's not meaningful until looking up the ticket. I'd suggest using test_dec_ipac_dlc_indx() instead, and if we want to do additional tests like you said, then find another (hopefully more descriptive) suffix for those. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 12:11:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: tests/llc: Add test_llc_meta_pdu_life_expire

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27642 ) Change subject: tests/llc: Add test_llc_meta_pdu_life_expire ...................................................................... tests/llc: Add test_llc_meta_pdu_life_expire Related: OS#5508 Change-Id: I7ba6be32778e2c2b22723db10fa66655812c8452 --- M tests/llc/LlcTest.cpp M tests/llc/LlcTest.err M tests/llc/LlcTest.ok 3 files changed, 44 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index dd4c80c..3dabeed 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -184,6 +184,46 @@ TALLOC_FREE(the_pcu); } +/* Test PDU lifetime is taken into account and packet is dropped if dequeued too + * late */ +static void test_llc_meta_pdu_life_expire() +{ + gprs_llc_queue *queue = prepare_queue(); + MetaInfo info1 = {0}; + MetaInfo info2 = {0}; + + printf("=== start %s ===\n", __func__); + + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); + + info1.recv_time.tv_sec = 123456777; + info1.recv_time.tv_nsec = 123456000; + info1.expire_time.tv_sec = 123456789; + info1.expire_time.tv_nsec = 987654000; + *clk_mono_override_time = info1.recv_time; + enqueue_data(queue, "LLC message 1", &info1.expire_time); + + info2.recv_time.tv_sec = 123458000; + info2.recv_time.tv_nsec = 547352000; + info2.expire_time.tv_sec = 123458006; + info2.expire_time.tv_nsec = 867252000; + *clk_mono_override_time = info2.recv_time; + enqueue_data(queue, "LLC message 2", &info2.expire_time); + + clk_mono_override_time->tv_sec = info1.expire_time.tv_sec + 1; + clk_mono_override_time->tv_nsec = info1.expire_time.tv_nsec; + + dequeue_and_check(queue, "LLC message 2", &info2); + + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); + llc_queue_clear(queue, NULL); + + printf("=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); +} + static void test_llc_merge() { gprs_llc_queue *queue1 = prepare_queue(); @@ -258,6 +298,7 @@ test_llc_queue(); test_llc_meta(); + test_llc_meta_pdu_life_expire(); test_llc_merge(); if (getenv("TALLOC_REPORT_FULL")) diff --git a/tests/llc/LlcTest.err b/tests/llc/LlcTest.err index f2c5cab..32ca391 100644 --- a/tests/llc/LlcTest.err +++ b/tests/llc/LlcTest.err @@ -2,6 +2,7 @@ dequeued msg, length 17 (expected 17), data 6f 74 68 65 72 20 4c 4c 43 20 6d 65 73 73 61 67 65 dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 31 dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32 dequeued msg, length 3 (expected 3), data 2a 41 2a dequeued msg, length 3 (expected 3), data 2a 42 2a dequeued msg, length 3 (expected 3), data 2a 43 2a diff --git a/tests/llc/LlcTest.ok b/tests/llc/LlcTest.ok index 311f37c..3db88d0 100644 --- a/tests/llc/LlcTest.ok +++ b/tests/llc/LlcTest.ok @@ -2,5 +2,7 @@ === end test_llc_queue === === start test_llc_meta === === end test_llc_meta === +=== start test_llc_meta_pdu_life_expire === +=== end test_llc_meta_pdu_life_expire === === start test_llc_merge === === end test_llc_merge === -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7ba6be32778e2c2b22723db10fa66655812c8452 Gerrit-Change-Number: 27642 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: tests/llc: Add test_llc_codel

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27643 ) Change subject: tests/llc: Add test_llc_codel ...................................................................... tests/llc: Add test_llc_codel Related: OS#5508 Change-Id: I9c87b65496a6fe0187a1bc9f3419e2d7269e66f0 --- M tests/llc/LlcTest.cpp M tests/llc/LlcTest.err M tests/llc/LlcTest.ok 3 files changed, 82 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 3dabeed..bdc5863 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -224,6 +224,76 @@ TALLOC_FREE(the_pcu); } +/* Test codel entering in action */ +static void test_llc_codel() +{ + clk_mono_override_time->tv_sec = 1000; + clk_mono_override_time->tv_nsec = 0; + + the_pcu = gprs_pcu_alloc(tall_pcu_ctx); + the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_USE_DEFAULT; + /* DEFAULT should be resolved to GPRS_CODEL_SLOW_INTERVAL_MS 4000 */ + #define GPRS_CODEL_SLOW_INTERVAL_MS 4000 + struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); + struct GprsMs *ms = bts_alloc_ms(bts, 0, 0); + gprs_llc_queue *queue = ms_llc_queue(ms); + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(queue->pq); i++) { + gprs_codel_set_maxpacket(&queue->pq[i].codel_state, 8); + } + + MetaInfo info1 = {0}; + + printf("=== start %s ===\n", __func__); + + for (i = 0; i < 10; i++) { + char buf[256]; + + snprintf(buf, sizeof(buf), "LLC message %u", i); + info1.recv_time.tv_sec = clk_mono_override_time->tv_sec; + info1.recv_time.tv_nsec = clk_mono_override_time->tv_nsec; + info1.expire_time.tv_sec = clk_mono_override_time->tv_sec + 500; + info1.expire_time.tv_nsec = clk_mono_override_time->tv_nsec; + clk_mono_override_time->tv_sec += 1; + enqueue_data(queue, buf, &info1.expire_time); + } + + OSMO_ASSERT(llc_queue_size(queue) == 10); + OSMO_ASSERT(llc_queue_octets(queue) != 0); + + dequeue_and_check(queue, "LLC message 0", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.first_above_time.tv_sec == + clk_mono_override_time->tv_sec + GPRS_CODEL_SLOW_INTERVAL_MS/1000); + dequeue_and_check(queue, "LLC message 1", NULL); + clk_mono_override_time->tv_sec += 7; + dequeue_and_check(queue, "LLC message 2", NULL); /*recently == 0*/ + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 0); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 0); + clk_mono_override_time->tv_sec += GPRS_CODEL_SLOW_INTERVAL_MS/1000 + 1; + dequeue_and_check(queue, "LLC message 4", NULL); /* recently = 1, message 3 is dropped here */ + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 1); + dequeue_and_check(queue, "LLC message 5", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 1); + dequeue_and_check(queue, "LLC message 6", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1); + dequeue_and_check(queue, "LLC message 7", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1); + dequeue_and_check(queue, "LLC message 8", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1); + dequeue_and_check(queue, "LLC message 9", NULL); + OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 0); + + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); + llc_queue_clear(queue, NULL); + + printf("=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); +} + static void test_llc_merge() { gprs_llc_queue *queue1 = prepare_queue(); @@ -299,6 +369,7 @@ test_llc_queue(); test_llc_meta(); test_llc_meta_pdu_life_expire(); + test_llc_codel(); test_llc_merge(); if (getenv("TALLOC_REPORT_FULL")) diff --git a/tests/llc/LlcTest.err b/tests/llc/LlcTest.err index 32ca391..90ddd1a 100644 --- a/tests/llc/LlcTest.err +++ b/tests/llc/LlcTest.err @@ -3,6 +3,15 @@ dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 31 dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32 dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 30 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 31 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 34 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 35 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 36 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 37 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 38 +dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 39 dequeued msg, length 3 (expected 3), data 2a 41 2a dequeued msg, length 3 (expected 3), data 2a 42 2a dequeued msg, length 3 (expected 3), data 2a 43 2a diff --git a/tests/llc/LlcTest.ok b/tests/llc/LlcTest.ok index 3db88d0..307c7b7 100644 --- a/tests/llc/LlcTest.ok +++ b/tests/llc/LlcTest.ok @@ -4,5 +4,7 @@ === end test_llc_meta === === start test_llc_meta_pdu_life_expire === === end test_llc_meta_pdu_life_expire === +=== start test_llc_codel === +=== end test_llc_codel === === start test_llc_merge === === end test_llc_merge === -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9c87b65496a6fe0187a1bc9f3419e2d7269e66f0 Gerrit-Change-Number: 27643 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: llc_queue: Refactor to handle codel_state per prio queue internally

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27641 ) Change subject: llc_queue: Refactor to handle codel_state per prio queue internally ...................................................................... llc_queue: Refactor to handle codel_state per prio queue internally A CoDel state per prio queue is needed, otherwise the sojourn time state is not properly reset when a high prio packet is dequeued. If we have a global codel state shared for all prio queues of an MS, then basically high prio (GMM) packets will "never" be dropped because they are handled/dequeued way quicker, so it's sojourn time will be below the threshold most probably, stopping the "dropping" state for the rest of lower prio packets. The handling of different codel states is moved from MS object to the llc_queue, also offloading already loaded dl_tbf.cpp in the process. This will also allow in the future setting different CoDel parameters for different priority queues if needed. Tests need to be adapted since now the CoDel and PDU lifetime are incorporated into the llc_queue_dequeue(). Also because dequeue now also accesses related MS fields. Related: OS#5508 Change-Id: I2bce2e82ab6389d8a70130a5c26a966a316b0fa4 --- M src/gprs_ms.c M src/gprs_ms.h M src/llc.c M src/llc.h M src/tbf_dl.cpp M src/tbf_dl.h M tests/llc/LlcTest.cpp 7 files changed, 207 insertions(+), 178 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 63f454f..6dc11a6 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -113,19 +113,15 @@ ms->imsi[0] = '\0'; memset(&ms->timer, 0, sizeof(ms->timer)); ms->timer.cb = ms_release_timer_cb; - llc_queue_init(&ms->llc_queue); + llc_queue_init(&ms->llc_queue, ms); ms_set_mode(ms, GPRS); codel_interval = the_pcu->vty.llc_codel_interval_msec; + if (codel_interval == LLC_CODEL_USE_DEFAULT) + codel_interval = GPRS_CODEL_SLOW_INTERVAL_MS; + llc_queue_set_codel_interval(&ms->llc_queue, codel_interval); - if (codel_interval != LLC_CODEL_DISABLE) { - if (codel_interval == LLC_CODEL_USE_DEFAULT) - codel_interval = GPRS_CODEL_SLOW_INTERVAL_MS; - ms->codel_state = talloc(ms, struct gprs_codel); - gprs_codel_init(ms->codel_state); - gprs_codel_set_interval(ms->codel_state, codel_interval); - } ms->last_cs_not_low = now_msec(); ms->app_info_pending = false; diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 3ebf7a5..c5ee01c 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -92,8 +92,6 @@ uint8_t reserved_dl_slots; uint8_t reserved_ul_slots; struct gprs_rlcmac_trx *current_trx; - - struct gprs_codel *codel_state; enum mcs_kind mode; struct rate_ctr_group *ctrs; @@ -218,11 +216,6 @@ ms->delay = secs; } -static inline struct gprs_codel *ms_codel_state(const struct GprsMs *ms) -{ - return ms->codel_state; -} - static inline unsigned ms_nack_rate_dl(const struct GprsMs *ms) { return ms->nack_rate_dl; diff --git a/src/llc.c b/src/llc.c index c8d74d8..ddc1e03 100644 --- a/src/llc.c +++ b/src/llc.c @@ -21,6 +21,7 @@ #include <osmocom/core/msgb.h> #include "bts.h" +#include "gprs_ms.h" #include "pcu_utils.h" #include "llc.h" @@ -94,17 +95,32 @@ return true; } -void llc_queue_init(struct gprs_llc_queue *q) +void llc_queue_init(struct gprs_llc_queue *q, struct GprsMs *ms) { unsigned int i; + q->ms = ms; q->queue_size = 0; q->queue_octets = 0; q->avg_queue_delay = 0; - for (i = 0; i < ARRAY_SIZE(q->queue); i++) - INIT_LLIST_HEAD(&q->queue[i]); + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + INIT_LLIST_HEAD(&q->pq[i].queue); + gprs_codel_init(&q->pq[i].codel_state); + } } +/* interval=0 -> don't use codel in the LLC queue */ +void llc_queue_set_codel_interval(struct gprs_llc_queue *q, unsigned int interval) +{ + unsigned int i; + if (interval == LLC_CODEL_DISABLE) { + q->use_codel = false; + return; + } + q->use_codel = true; + for (i = 0; i < ARRAY_SIZE(q->pq); i++) + gprs_codel_set_interval(&q->pq[i].codel_state, interval); +} static enum gprs_llc_queue_prio llc_sapi2prio(uint8_t sapi) { @@ -137,7 +153,7 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&q->queue[prio], llc_msg); + msgb_enqueue(&q->pq[prio].queue, llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) @@ -145,8 +161,8 @@ struct msgb *msg; unsigned int i; - for (i = 0; i < ARRAY_SIZE(q->queue); i++) { - while ((msg = msgb_dequeue(&q->queue[i]))) { + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + while ((msg = msgb_dequeue(&q->pq[i].queue))) { if (bts) bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); msgb_free(msg); @@ -166,13 +182,13 @@ size_t queue_octets = 0; INIT_LLIST_HEAD(&new_queue); - for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { while (1) { if (msg1 == NULL) - msg1 = msgb_dequeue(&q->queue[i]); + msg1 = msgb_dequeue(&q->pq[i].queue); if (msg2 == NULL) - msg2 = msgb_dequeue(&o->queue[i]); + msg2 = msgb_dequeue(&o->pq[i].queue); if (msg1 == NULL && msg2 == NULL) break; @@ -201,9 +217,9 @@ queue_octets += msgb_length(msg); } - OSMO_ASSERT(llist_empty(&q->queue[i])); - OSMO_ASSERT(llist_empty(&o->queue[i])); - llist_splice_init(&new_queue, &q->queue[i]); + OSMO_ASSERT(llist_empty(&q->pq[i].queue)); + OSMO_ASSERT(llist_empty(&o->pq[i].queue)); + llist_splice_init(&new_queue, &q->pq[i].queue); } o->queue_size = 0; @@ -214,7 +230,7 @@ #define ALPHA 0.5f -struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info) +static struct msgb *llc_queue_pick_msg(struct gprs_llc_queue *q, enum gprs_llc_queue_prio *prio) { struct msgb *msg; struct timespec *tv, tv_now, tv_result; @@ -222,18 +238,17 @@ unsigned int i; const struct MetaInfo *meta_storage; - for (i = 0; i < ARRAY_SIZE(q->queue); i++) { - if ((msg = msgb_dequeue(&q->queue[i]))) + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + if ((msg = msgb_dequeue(&q->pq[i].queue))) { + *prio = (enum gprs_llc_queue_prio)i; break; + } } if (!msg) return NULL; meta_storage = (struct MetaInfo *)&msg->cb[0]; - if (info) - *info = meta_storage; - q->queue_size -= 1; q->queue_octets -= msgb_length(msg); @@ -248,6 +263,85 @@ return msg; } +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q) +{ + struct msgb *msg; + struct timespec tv_now, tv_now2; + uint32_t octets = 0, frames = 0; + struct gprs_rlcmac_bts *bts = q->ms->bts; + struct gprs_pcu *pcu = bts->pcu; + struct timespec hyst_delta = {0, 0}; + const unsigned keep_small_thresh = 60; + enum gprs_llc_queue_prio prio; + + if (pcu->vty.llc_discard_csec) + csecs_to_timespec(pcu->vty.llc_discard_csec, &hyst_delta); + + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); + timespecadd(&tv_now, &hyst_delta, &tv_now2); + + while ((msg = llc_queue_pick_msg(q, &prio))) { + const struct MetaInfo *info = (const struct MetaInfo *)&msg->cb[0]; + const struct timespec *tv_disc = &info->expire_time; + const struct timespec *tv_recv = &info->recv_time; + + gprs_bssgp_update_queue_delay(tv_recv, &tv_now); + + if (q->use_codel) { + int bytes = llc_queue_octets(q); + if (gprs_codel_control(&q->pq[prio].codel_state, tv_recv, &tv_now, bytes)) + goto drop_frame; + } + + /* Is the age below the low water mark? */ + if (!llc_queue_is_frame_expired(&tv_now2, tv_disc)) + break; + + /* Is the age below the high water mark */ + if (!llc_queue_is_frame_expired(&tv_now, tv_disc)) { + /* Has the previous message not been dropped? */ + if (frames == 0) + break; + + /* Hysteresis mode, try to discard LLC messages until + * the low water mark has been reached */ + + /* Check whether to abort the hysteresis mode */ + + /* Is the frame small, perhaps only a TCP ACK? */ + if (msg->len <= keep_small_thresh) + break; + + /* Is it a GMM message? */ + if (!llc_is_user_data_frame(msg->data, msg->len)) + break; + } + + bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_TIMEDOUT); +drop_frame: + frames++; + octets += msg->len; + msgb_free(msg); + bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); + continue; + } + + if (frames) { + LOGPMS(q->ms, DTBFDL, LOGL_NOTICE, "Discarding LLC PDU " + "because lifetime limit reached, " + "count=%u new_queue_size=%zu\n", + frames, llc_queue_size(q)); + if (frames > 0xff) + frames = 0xff; + if (octets > 0xffffff) + octets = 0xffffff; + if (pcu->bssgp.bctx) + bssgp_tx_llc_discarded(pcu->bssgp.bctx, ms_tlli(q->ms), frames, octets); + } + + return msg; +} + void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv) { uint16_t delay_csec; diff --git a/src/llc.h b/src/llc.h index adfab65..fe14c6a 100644 --- a/src/llc.h +++ b/src/llc.h @@ -28,9 +28,12 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/endian.h> +#include "gprs_codel.h" + #define LLC_MAX_LEN 1543 struct gprs_rlcmac_bts; +struct GprsMs; struct gprs_llc_hdr { #if OSMO_IS_LITTLE_ENDIAN @@ -110,22 +113,29 @@ LLC_QUEUE_PRIO_OTHER, /* Other SAPIs */ _LLC_QUEUE_PRIO_SIZE /* used to calculate size of enum */ }; +struct gprs_llc_prio_queue { + struct gprs_codel codel_state; + struct llist_head queue; /* queued LLC DL data. See enum gprs_llc_queue_prio. */ +}; struct gprs_llc_queue { + struct GprsMs *ms; /* backpointer */ uint32_t avg_queue_delay; /* Average delay of data going through the queue */ size_t queue_size; size_t queue_octets; - struct llist_head queue[_LLC_QUEUE_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_llc_queue_prio. */ + bool use_codel; + struct gprs_llc_prio_queue pq[_LLC_QUEUE_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_llc_queue_prio. */ }; void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv); bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv); -void llc_queue_init(struct gprs_llc_queue *q); +void llc_queue_init(struct gprs_llc_queue *q, struct GprsMs *ms); void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts); +void llc_queue_set_codel_interval(struct gprs_llc_queue *q, unsigned int interval); void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o); void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time); -struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info); +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q); static inline size_t llc_queue_size(const struct gprs_llc_queue *q) { diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 01b8f68..9c99cf6 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -343,83 +343,6 @@ return rc; } -struct msgb *gprs_rlcmac_dl_tbf::llc_dequeue(bssgp_bvc_ctx *bctx) -{ - struct msgb *msg; - struct timespec tv_now, tv_now2; - uint32_t octets = 0, frames = 0; - struct timespec hyst_delta = {0, 0}; - const unsigned keep_small_thresh = 60; - const MetaInfo *info; - - if (the_pcu->vty.llc_discard_csec) - csecs_to_timespec(the_pcu->vty.llc_discard_csec, &hyst_delta); - - osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); - timespecadd(&tv_now, &hyst_delta, &tv_now2); - - while ((msg = llc_queue_dequeue(llc_queue(), &info))) { - const struct timespec *tv_disc = &info->expire_time; - const struct timespec *tv_recv = &info->recv_time; - - gprs_bssgp_update_queue_delay(tv_recv, &tv_now); - - if (ms() && ms_codel_state(ms())) { - int bytes = llc_queue_octets(llc_queue()); - if (gprs_codel_control(ms_codel_state(ms()), - tv_recv, &tv_now, bytes)) - goto drop_frame; - } - - /* Is the age below the low water mark? */ - if (!llc_queue_is_frame_expired(&tv_now2, tv_disc)) - break; - - /* Is the age below the high water mark */ - if (!llc_queue_is_frame_expired(&tv_now, tv_disc)) { - /* Has the previous message not been dropped? */ - if (frames == 0) - break; - - /* Hysteresis mode, try to discard LLC messages until - * the low water mark has been reached */ - - /* Check whether to abort the hysteresis mode */ - - /* Is the frame small, perhaps only a TCP ACK? */ - if (msg->len <= keep_small_thresh) - break; - - /* Is it a GMM message? */ - if (!llc_is_user_data_frame(msg->data, msg->len)) - break; - } - - bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_TIMEDOUT); -drop_frame: - frames++; - octets += msg->len; - msgb_free(msg); - bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); - continue; - } - - if (frames) { - LOGPTBFDL(this, LOGL_NOTICE, "Discarding LLC PDU " - "because lifetime limit reached, " - "count=%u new_queue_size=%zu\n", - frames, llc_queue_size(llc_queue())); - if (frames > 0xff) - frames = 0xff; - if (octets > 0xffffff) - octets = 0xffffff; - if (bctx) - bssgp_tx_llc_discarded(bctx, tlli(), frames, octets); - } - - return msg; -} - bool gprs_rlcmac_dl_tbf::restart_bsn_cycle() { /* If V(S) == V(A) and finished state, we would have received @@ -628,7 +551,7 @@ return; /* dequeue next LLC frame, if any */ - msg = llc_dequeue(bts->pcu->bssgp.bctx); + msg = llc_queue_dequeue(llc_queue()); if (!msg) return; diff --git a/src/tbf_dl.h b/src/tbf_dl.h index c0c0284..0f531ec 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -57,8 +57,6 @@ void set_window_size(); void update_coding_scheme_counter_dl(enum CodingScheme cs); - struct msgb *llc_dequeue(bssgp_bvc_ctx *bctx); - /* Please note that all variables here will be reset when changing * from WAIT RELEASE back to FLOW state (re-use of TBF). * All states that need reset must be in this struct, so this is why diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index b18f6de..dd4c80c 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -24,11 +24,14 @@ #include <osmocom/core/linuxlist.h> } -#include "llc.h" #include "gprs_debug.h" +#include "bts.h" extern "C" { #include "pcu_vty.h" +#include "gprs_pcu.h" +#include "llc.h" +#include "gprs_ms.h" #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> @@ -44,6 +47,15 @@ bool spoof_mnc_3_digits = false; static struct timespec *clk_mono_override_time; +static struct gprs_llc_queue *prepare_queue(void) +{ + the_pcu = gprs_pcu_alloc(tall_pcu_ctx); + the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_DISABLE; + struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); + struct GprsMs *ms = bts_alloc_ms(bts, 0, 0); + return ms_llc_queue(ms); +} + static void enqueue_data(gprs_llc_queue *queue, const uint8_t *data, size_t len, const struct timespec *expire_time) { @@ -65,8 +77,9 @@ struct msgb *llc_msg; const MetaInfo *info_res; - llc_msg = llc_queue_dequeue(queue, &info_res); + llc_msg = llc_queue_dequeue(queue); OSMO_ASSERT(llc_msg != NULL); + info_res = (struct MetaInfo *)&llc_msg->cb[0]; fprintf(stderr, "dequeued msg, length %u (expected %zu), data %s\n", msgb_length(llc_msg), len, msgb_hexdump(llc_msg)); @@ -96,126 +109,128 @@ static void test_llc_queue() { - gprs_llc_queue queue; + gprs_llc_queue *queue = prepare_queue(); struct timespec expire_time = {0}; printf("=== start %s ===\n", __func__); - llc_queue_init(&queue); - OSMO_ASSERT(llc_queue_size(&queue) == 0); - OSMO_ASSERT(llc_queue_octets(&queue) == 0); + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); - enqueue_data(&queue, "LLC message", &expire_time); - OSMO_ASSERT(llc_queue_size(&queue) == 1); - OSMO_ASSERT(llc_queue_octets(&queue) == 11); + enqueue_data(queue, "LLC message", &expire_time); + OSMO_ASSERT(llc_queue_size(queue) == 1); + OSMO_ASSERT(llc_queue_octets(queue) == 11); - enqueue_data(&queue, "other LLC message", &expire_time); - OSMO_ASSERT(llc_queue_size(&queue) == 2); - OSMO_ASSERT(llc_queue_octets(&queue) == 28); + enqueue_data(queue, "other LLC message", &expire_time); + OSMO_ASSERT(llc_queue_size(queue) == 2); + OSMO_ASSERT(llc_queue_octets(queue) == 28); - dequeue_and_check(&queue, "LLC message"); - OSMO_ASSERT(llc_queue_size(&queue) == 1); - OSMO_ASSERT(llc_queue_octets(&queue) == 17); + dequeue_and_check(queue, "LLC message"); + OSMO_ASSERT(llc_queue_size(queue) == 1); + OSMO_ASSERT(llc_queue_octets(queue) == 17); - dequeue_and_check(&queue, "other LLC message"); - OSMO_ASSERT(llc_queue_size(&queue) == 0); - OSMO_ASSERT(llc_queue_octets(&queue) == 0); + dequeue_and_check(queue, "other LLC message"); + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); - enqueue_data(&queue, "LLC", &expire_time); - OSMO_ASSERT(llc_queue_size(&queue) == 1); - OSMO_ASSERT(llc_queue_octets(&queue) == 3); + enqueue_data(queue, "LLC", &expire_time); + OSMO_ASSERT(llc_queue_size(queue) == 1); + OSMO_ASSERT(llc_queue_octets(queue) == 3); - llc_queue_clear(&queue, NULL); - OSMO_ASSERT(llc_queue_size(&queue) == 0); - OSMO_ASSERT(llc_queue_octets(&queue) == 0); + llc_queue_clear(queue, NULL); + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); printf("=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); } static void test_llc_meta() { - gprs_llc_queue queue; + gprs_llc_queue *queue = prepare_queue(); MetaInfo info1 = {0}; MetaInfo info2 = {0}; printf("=== start %s ===\n", __func__); - llc_queue_init(&queue); - OSMO_ASSERT(llc_queue_size(&queue) == 0); - OSMO_ASSERT(llc_queue_octets(&queue) == 0); + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); info1.recv_time.tv_sec = 123456777; info1.recv_time.tv_nsec = 123456000; info1.expire_time.tv_sec = 123456789; info1.expire_time.tv_nsec = 987654000; *clk_mono_override_time = info1.recv_time; - enqueue_data(&queue, "LLC message 1", &info1.expire_time); + enqueue_data(queue, "LLC message 1", &info1.expire_time); info2.recv_time.tv_sec = 123458000; info2.recv_time.tv_nsec = 547352000; info2.expire_time.tv_sec = 123458006; info2.expire_time.tv_nsec = 867252000; *clk_mono_override_time = info2.recv_time; - enqueue_data(&queue, "LLC message 2", &info2.expire_time); + enqueue_data(queue, "LLC message 2", &info2.expire_time); - dequeue_and_check(&queue, "LLC message 1", &info1); - dequeue_and_check(&queue, "LLC message 2", &info2); + clk_mono_override_time->tv_sec = info1.expire_time.tv_sec - 1; + clk_mono_override_time->tv_nsec = info1.expire_time.tv_nsec; - llc_queue_clear(&queue, NULL); - OSMO_ASSERT(llc_queue_size(&queue) == 0); - OSMO_ASSERT(llc_queue_octets(&queue) == 0); + dequeue_and_check(queue, "LLC message 1", &info1); + dequeue_and_check(queue, "LLC message 2", &info2); + + llc_queue_clear(queue, NULL); + OSMO_ASSERT(llc_queue_size(queue) == 0); + OSMO_ASSERT(llc_queue_octets(queue) == 0); printf("=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); } static void test_llc_merge() { - gprs_llc_queue queue1; - gprs_llc_queue queue2; + gprs_llc_queue *queue1 = prepare_queue(); + struct GprsMs *ms = bts_alloc_ms(queue1->ms->bts, 0, 0); + gprs_llc_queue *queue2 = ms_llc_queue(ms); struct timespec expire_time = {0}; printf("=== start %s ===\n", __func__); - llc_queue_init(&queue1); - llc_queue_init(&queue2); + clk_mono_override_time->tv_sec += 1; + enqueue_data(queue1, "*A*", &expire_time); clk_mono_override_time->tv_sec += 1; - enqueue_data(&queue1, "*A*", &expire_time); + enqueue_data(queue1, "*B*", &expire_time); clk_mono_override_time->tv_sec += 1; - enqueue_data(&queue1, "*B*", &expire_time); + enqueue_data(queue2, "*C*", &expire_time); clk_mono_override_time->tv_sec += 1; - enqueue_data(&queue2, "*C*", &expire_time); + enqueue_data(queue1, "*D*", &expire_time); clk_mono_override_time->tv_sec += 1; - enqueue_data(&queue1, "*D*", &expire_time); + enqueue_data(queue2, "*E*", &expire_time); - clk_mono_override_time->tv_sec += 1; - enqueue_data(&queue2, "*E*", &expire_time); + OSMO_ASSERT(llc_queue_size(queue1) == 3); + OSMO_ASSERT(llc_queue_octets(queue1) == 9); + OSMO_ASSERT(llc_queue_size(queue2) == 2); + OSMO_ASSERT(llc_queue_octets(queue2) == 6); - OSMO_ASSERT(llc_queue_size(&queue1) == 3); - OSMO_ASSERT(llc_queue_octets(&queue1) == 9); - OSMO_ASSERT(llc_queue_size(&queue2) == 2); - OSMO_ASSERT(llc_queue_octets(&queue2) == 6); + llc_queue_move_and_merge(queue2, queue1); - llc_queue_move_and_merge(&queue2, &queue1); + OSMO_ASSERT(llc_queue_size(queue1) == 0); + OSMO_ASSERT(llc_queue_octets(queue1) == 0); + OSMO_ASSERT(llc_queue_size(queue2) == 5); + OSMO_ASSERT(llc_queue_octets(queue2) == 15); - OSMO_ASSERT(llc_queue_size(&queue1) == 0); - OSMO_ASSERT(llc_queue_octets(&queue1) == 0); - OSMO_ASSERT(llc_queue_size(&queue2) == 5); - OSMO_ASSERT(llc_queue_octets(&queue2) == 15); + dequeue_and_check(queue2, "*A*"); + dequeue_and_check(queue2, "*B*"); + dequeue_and_check(queue2, "*C*"); + dequeue_and_check(queue2, "*D*"); + dequeue_and_check(queue2, "*E*"); - dequeue_and_check(&queue2, "*A*"); - dequeue_and_check(&queue2, "*B*"); - dequeue_and_check(&queue2, "*C*"); - dequeue_and_check(&queue2, "*D*"); - dequeue_and_check(&queue2, "*E*"); - - OSMO_ASSERT(llc_queue_size(&queue2) == 0); - OSMO_ASSERT(llc_queue_octets(&queue2) == 0); + OSMO_ASSERT(llc_queue_size(queue2) == 0); + OSMO_ASSERT(llc_queue_octets(queue2) == 0); printf("=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); } int main(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2bce2e82ab6389d8a70130a5c26a966a316b0fa4 Gerrit-Change-Number: 27641 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022