<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18637">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb,ms: refactor base_rate selection for ZMQ<br><br>Use tailored sample rate only use for 6, 50 and 75 PRB. For all other bandwidths,<br>we use the full LTE rate and downsample.<br>With 5.76e6 as base sample rate, for example, we had some issue during the tests like:<br><br>[zmq] Error: tx time is 0.178 ms in the past (7833600 < 7835648)<br>[zmq] Error: tx time is 0.011 ms in the past (7835520 < 7835648)<br><br>Using a higher sample rate seems to work better.<br><br>Change-Id: I53678587b2c5e0e5dccb1b55a328ad2f1a97fc4c<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>3 files changed, 9 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index 699b66f..b221cb9 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -142,18 +142,14 @@</span><br><span> </span><br><span> #reference: srsLTE.git srslte_symbol_sz()</span><br><span> def num_prb2symbol_sz(self, num_prb):</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 6:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 6:</span><br><span> return 128</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 15:</span><br><span style="color: hsl(0, 100%, 40%);">- return 256</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 25:</span><br><span style="color: hsl(0, 100%, 40%);">- return 384</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 50:</span><br><span> return 768</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 75:</span><br><span> return 1024</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 110:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1536</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1536</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> raise log.Error('invalid num_prb %r', num_prb)</span><br><span> </span><br><span> def num_prb2base_srate(self, num_prb):</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index 432f759..b2dc9c7 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -45,8 +45,6 @@</span><br><span> return 128</span><br><span> if num_prb <= 15:</span><br><span> return 256</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 25:</span><br><span style="color: hsl(0, 100%, 40%);">- return 384</span><br><span> if num_prb <= 50:</span><br><span> return 768</span><br><span> if num_prb <= 75:</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 604d5c7..0aad954 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -52,19 +52,13 @@</span><br><span> </span><br><span> #reference: srsLTE.git srslte_symbol_sz()</span><br><span> def num_prb2symbol_sz(num_prb):</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 6:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 6:</span><br><span> return 128</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 15:</span><br><span style="color: hsl(0, 100%, 40%);">- return 256</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 25:</span><br><span style="color: hsl(0, 100%, 40%);">- return 384</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 50:</span><br><span> return 768</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb == 75:</span><br><span> return 1024</span><br><span style="color: hsl(0, 100%, 40%);">- if num_prb <= 110:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1536</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('invalid num_prb %r', num_prb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1536</span><br><span> </span><br><span> def num_prb2base_srate(num_prb):</span><br><span> return num_prb2symbol_sz(num_prb) * 15 * 1000</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18637">change 18637</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18637"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I53678587b2c5e0e5dccb1b55a328ad2f1a97fc4c </div>
<div style="display:none"> Gerrit-Change-Number: 18637 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>