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

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

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27646 to look at the new patch set (#2). Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... jenkins: Validate gsm 08.58 IEs are added to tlv_definition It was recently found that several IEs which were added in the header file were not actually added to the tlv_definition, and hence the tlv parser failed to decode them. Let's make sure we don't foget to add new IEs in the future. Related: SYS#5915 Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 --- M contrib/jenkins_common.sh M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 3 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27646/2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... jenkins: Validate gsm 08.58 IEs are added to tlv_definition It was recently found that several IEs which were added in the header file were not actually added to the tlv_definition, and hence the tlv parser failed to decode them. Let's make sure we don't foget to add new IEs in the future. Related: SYS#5915 Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 --- M contrib/jenkins_common.sh M include/osmocom/gsm/protocol/gsm_08_58.h 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27646/1 diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index c39b356..fc85a90 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -28,6 +28,20 @@ } verify_gsm0808_tlv_definition +verify_gsm_08_05_tlv_definition() { + set +x; + enums=$(grep "RSL_IE_" include/osmocom/gsm/protocol/gsm_08_58.h | grep "=" | awk '{ print $1 }') + counted_enums=$(for f in $enums; do printf "%-60s %s\n" "$f" "$(grep -c "\[$f\]" src/gsm/rsl.c)"; done) + missing_enums=$(echo "$counted_enums" | grep "0$" || true) + if [ "x$missing_enums" != "x" ]; then + echo "Missing IEs in src/gsm/rsl.c!" + echo "$missing_enums" + exit 1 + fi + set -x; +} +verify_gsm_08_05_tlv_definition + prep_build() { _src_dir="$1" _build_dir="$2" diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index 7a527ff..d1720fa 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -385,9 +385,9 @@ RSL_IE_IPAC_RTP_CSD_FMT = 0xf9, RSL_IE_IPAC_RTP_JIT_BUF = 0xfa, RSL_IE_IPAC_RTP_COMPR = 0xfb, - RSL_IE_IPAC_RTP_PAYLOAD2= 0xfc, + RSL_IE_IPAC_RTP_PAYLOAD2 = 0xfc, RSL_IE_IPAC_RTP_MPLEX = 0xfd, - RSL_IE_IPAC_RTP_MPLEX_ID= 0xfe, + RSL_IE_IPAC_RTP_MPLEX_ID = 0xfe, }; /* Ericsson specific IEs, clash with above partially, so they're not -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: doc: rsl: Fix description of 'IP Connection Statistics' IE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27645 ) Change subject: doc: rsl: Fix description of 'IP Connection Statistics' IE ...................................................................... doc: rsl: Fix description of 'IP Connection Statistics' IE Related: SYS#5915 Change-Id: Ic524d73a0c47fde528b78f9dfe7b72b7286550e1 --- M doc/manuals/abis/rsl.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/27645/1 diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc index 8e2ead9..ab1d5e7 100644 --- a/doc/manuals/abis/rsl.adoc +++ b/doc/manuals/abis/rsl.adoc @@ -953,8 +953,8 @@ This information element contains statistics about the RTP connection. -It is encoded as 29 bytes, with the first byte as IEI and 28 bytes -fixed-length payload encoded as follows: +It is encoded as 30 bytes, with the first byte as IEI, the second byte as length +(=28), and 28 bytes fixed-length payload encoded as follows: .A-bis/IP Connection Statistics [options="header",width="60%",cols="15%,15%,70%"] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic524d73a0c47fde528b78f9dfe7b72b7286550e1 Gerrit-Change-Number: 27645 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message ...................................................................... rsl: Fix tlv_parse of IPAC_DLCX_IND message The IE was missing in rsl_att_tlvdef. Related: SYS#5915 Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 --- M src/gsm/rsl.c M tests/abis/abis_test.c M tests/abis/abis_test.ok 3 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/27644/1 diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index f535b7f..dd5a116 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -133,6 +133,7 @@ [RSL_IE_IPAC_LOCAL_PORT] = { TLV_TYPE_FIXED, 2 }, [RSL_IE_IPAC_SPEECH_MODE] = { TLV_TYPE_TV }, [RSL_IE_IPAC_LOCAL_IP] = { TLV_TYPE_FIXED, 4 }, + [RSL_IE_IPAC_CONN_STAT] = { TLV_TYPE_TLV, 28 }, [RSL_IE_IPAC_CONN_ID] = { TLV_TYPE_FIXED, 2 }, [RSL_IE_IPAC_RTP_CSD_FMT] = { TLV_TYPE_TV }, [RSL_IE_IPAC_RTP_JIT_BUF] = { TLV_TYPE_FIXED, 2 }, diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 2151e92..d44d0ae 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -193,6 +193,52 @@ msgb_free(msg); } +/* Test decode IPAC_DLCX_IND SYS#5915 */ +static void test_dec_ipac_dlc_indx_sys5915() +{ +/* Radio Signalling Link (RSL) + 0111 111. = Message discriminator: ip.access Vendor Specific messages (63) + .... ...0 = T bit: Not considered transparent by BTS + .111 0110 = Message type: ip.access DLCX INDication (0x76) + Channel number IE + Element identifier: Channel Number (0x01) + 0000 1... = C-bits: Bm + ACCH (1) + .... .110 = Time slot number (TN): 6 + Element identifier: Connection Identifier (0xf8) + ip.access Connection ID: 0 + Element identifier: Connection Statistics (0xf6) + [1 byte length here, val = 28 (0x1c)] + Packets Sent: 1202 + Octets Sent: 45052 + Packets Received: 556 + Octets Received: 24580 + Packets Lost: 0 + Inter-arrival Jitter: 0 + Average Tx Delay: 0 + Cause IE + Element identifier: Cause (0x1a) + Length: 1 + 0... .... = Extension: No Extension + .000 .... = Class: Normal event (0) + .000 1111 = Cause Value: normal event, unspecified (15) +*/ + const uint8_t hex[] = { + 0x7e, 0x76, 0x01, 0x0e, 0xf8, 0x00, 0x00, 0xf6, 0x1c, 0x00, 0x00, 0x04, 0xb2, 0x00, 0x00, 0xaf, + 0xfc, 0x00, 0x00, 0x02, 0x2c, 0x00, 0x00, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x01, 0x0f + }; + struct abis_rsl_dchan_hdr *dh = (struct abis_rsl_dchan_hdr *)&hex[0]; + + struct tlv_parsed tp; + int rc; + + printf("Testing decoding IPAC_DLCX_IND SYS#5891\n"); + + rc = rsl_tlv_parse(&tp, dh->data, sizeof(hex) - sizeof(*dh)); + + OSMO_ASSERT(rc == 3); +} + int main(int argc, char **argv) { void *ctx = talloc_named_const(NULL, 0, "abis_test"); @@ -202,6 +248,7 @@ test_simple_sw_config(); test_simple_sw_short(); test_dual_sw_config(); + test_dec_ipac_dlc_indx_sys5915(); printf("OK.\n"); diff --git a/tests/abis/abis_test.ok b/tests/abis/abis_test.ok index e6b626b..a8a75f9 100644 --- a/tests/abis/abis_test.ok +++ b/tests/abis/abis_test.ok @@ -38,4 +38,5 @@ file_id: 09 07 05 file_ver: 06 07 08 test_dual_sw_config(): OK +Testing decoding IPAC_DLCX_IND SYS#5891 OK. -- 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-MessageType: newchange

3 years, 2 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/27643/1 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/27642/1 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: llc: schedule frames to MS based on SAPI priority

by pespin

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/27627 to look at the new patch set (#3). Change subject: llc: schedule frames to MS based on SAPI priority ...................................................................... llc: schedule frames to MS based on SAPI priority The CoDel state is still applied globally, which could cause higher prio messages (GMM) to clear dropping state (since those are left for a smaller period of time inside the queue). CoDel state will be moved per prio-queue in a follow-up patch. Related: OS#5508 Related: SYS#5908 Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e --- M src/llc.c M src/llc.h 2 files changed, 90 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/27627/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e Gerrit-Change-Number: 27627 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

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

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/27641 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/27641/2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/27641/1 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..ca61137 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 == 0) { + 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-trx[master]: Initial XTRX support

by laforge

Attention is currently required from: rauf.gyulaliev(a)fairwaves.co, ipse. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15685 ) Change subject: Initial XTRX support ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: related PR on the read-only github mirror at https://github.com/osmocom/osmo-trx/pull/4 - I pointed the developer to gerrit. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1067dfef53aa2669cc7c189cccae10074c674390 Gerrit-Change-Number: 15685 Gerrit-PatchSet: 3 Gerrit-Owner: rauf.gyulaliev(a)fairwaves.co Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: ipse <Alexander.Chemeris(a)gmail.com> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: rauf.gyulaliev(a)fairwaves.co Gerrit-Attention: ipse <Alexander.Chemeris(a)gmail.com> Gerrit-Comment-Date: Mon, 04 Apr 2022 10:34:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022