Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12195 )
Change subject: lms: Do {under,over}run checks even if LMS_RecvStream fails
......................................................................
lms: Do {under,over}run checks even if LMS_RecvStream fails
Under failure, it could still be that stream status is updated, so let's
father that in all cases.
Change-Id: I4e2b8be06d2993db1bab233948a8ee774b8ac4ee
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index fa9e395..5e21894 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -534,6 +534,7 @@
for (i = 0; i<chans; i++) {
thread_enable_cancel(false);
rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len,
&rx_metadata, 100);
+ update_stream_stats(i, underrun, overrun);
if (rc != len) {
LOGC(DDEV, ALERT) << "LMS: Device receive timed out ("
<< rc << " vs exp " << len << ").";
thread_enable_cancel(true);
@@ -541,7 +542,6 @@
}
if (timestamp != (TIMESTAMP)rx_metadata.timestamp)
LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of
len " << rc << " expect " << std::hex << timestamp << " got " << std::hex <<
(TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp
<<") diff=" << rx_metadata.timestamp - timestamp;
- update_stream_stats(i, underrun, overrun);
thread_enable_cancel(true);
}
--
To view, visit https://gerrit.osmocom.org/12195
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e2b8be06d2993db1bab233948a8ee774b8ac4ee
Gerrit-Change-Number: 12195
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
