[PATCH] osmo-pcu[master]: Fix EGPRS PUAN encoding: use correct urbb_len

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

arvind.sirsikar gerrit-no-reply at lists.osmocom.org
Tue Aug 23 12:42:12 UTC 2016


Hello Jenkins Builder, Holger Freyther,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/703

to look at the new patch set (#3).

Fix EGPRS PUAN encoding: use correct urbb_len

Earlier there was an incorrect encoding of PUAN when VQ is not equal
VR case for EGPRS UL RLC window. The PCU was encoding the same PUAN
message always irrespective of radio condition. This was a bottle neck
for performance testing. Which has been fixed in this patch.

Related: OS#1793

unit test assertion in the previous commit is fixed in this patch.

Change-Id: Iba7b1995028bd81749ffb080616b2ad5f2540d57
---
M src/encoding.cpp
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/03/703/3

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 63049ac..41e0d10 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -575,7 +575,8 @@
 		eow = false;
 		urbb_len = rest_bits - 9;
 		/* TODO: use compression (see above) */
-	}
+	} else
+		urbb_len = num_blocks;
 
 	if (urbb_len + crbb_len == rest_bits)
 		len = -1;
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 5a73a43..c423058 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -749,8 +749,7 @@
 
 	struct msgb *msg2 = ul_tbf->create_ul_ack(*fn, ts_no);
 
-	/* TODO: Need to modify the assert */
-	OSMO_ASSERT(!memcmp(msg2->data, msg1->data, msg1->data_len));
+	OSMO_ASSERT(memcmp(msg2->data, msg1->data, msg1->data_len));
 
 	return ul_tbf;
 }
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index aa8a087..fa0927c 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -5875,8 +5875,8 @@
 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS): data_length=37, data=00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
 - Raising V(R) to 5
 Encoding Ack/Nack for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) (final=0)
- - EGPRS URBB, len = 0, SSN = 3, ESN_CRBB = 2, SNS = 2048, WS = 64, V(Q) = 2, V(R) = 5, BOW, EOW
-Uplink Ack/Nack bit count 98, max 184, message = 40 24 01 3f 3e 24 46 68 90 87 b0 06 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+ - EGPRS URBB, len = 2, SSN = 3, ESN_CRBB = 2, SNS = 2048, WS = 64, V(Q) = 2, V(R) = 5, BOW, EOW
+Uplink Ack/Nack bit count 100, max 184, message = 40 24 01 3f 3e 24 46 68 90 88 b0 06 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)', TA=7
 Got MS: TLLI = 0xf1223344, TA = 7
 ********** TBF starts here **********

-- 
To view, visit https://gerrit.osmocom.org/703
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Iba7b1995028bd81749ffb080616b2ad5f2540d57
Gerrit-PatchSet: 3
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: arvind.sirsikar <arvind.sirsikar at radisys.com>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: arvind.sirsikar <arvind.sirsikar at radisys.com>



More information about the gerrit-log mailing list