Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: work around a race condition in f_rx_rlcmac_dl_b...

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20461 )


Change subject: pcu/GPRS_Components: work around a race condition in f_rx_rlcmac_dl_block()
......................................................................

pcu/GPRS_Components: work around a race condition in f_rx_rlcmac_dl_block()

Change-Id: I8d01e153913a5441113af1866ff2897ee4a987db
Related: OS#4779
---
M pcu/GPRS_Components.ttcn
1 file changed, 13 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/20461/1

diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 2807b92..3603470 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -677,8 +677,19 @@
 			      template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum)
 runs on MS_BTS_IFACE_CT {
 	var PCUIF_Message pcu_msg;
-	f_pcuif_rx_data_req(pcu_msg, nr := nr);
-	dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data);
+
+	/* There can be a race condition between BSSGP and the PCUIF, e.g.
+	 * RTS.req can be handled by the IUT faster than BSSGP DL DATA-REQ.
+	 * This means that we may get unexpected PACKET_DL_DUMMY_CTRL.
+	 * Let's re-try receiving DATA.req up to 3 times. */
+	for (var integer i := 0; i < 4; i := i + 1) {
+		f_pcuif_rx_data_req(pcu_msg, nr := nr);
+		dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data);
+		if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL)) {
+			break;
+		}
+	}
+
 	dl_fn := pcu_msg.u.data_req.fn;
 
 	var integer len := lengthof(pcu_msg.u.data_req.data);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20461
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8d01e153913a5441113af1866ff2897ee4a987db
Gerrit-Change-Number: 20461
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201006/f090a544/attachment.htm>