PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ringbuffer: fix timeout calculation for timed read 

with ZMQ RF, we've seen the radio returning -1 and traced
the issue down to the ringbuffer.
in fact, pthread_cond_timedwait() returned 22 (EINVAL) indicating
a wrong timeout value. The issue was likely an overflow
in the timespec parameter. This patch checks for the return
value of pthread_cond_timedwait() and also calculates the
nanosecond wrap around for the timespec
This commit is contained in:
Andre Puschmann 2020-07-07 14:57:15 +02:00 committed by Xavier Arteaga
parent aed38a6028
commit f6d3467884
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/src/phy/utils/ringbuffer.c
View File

@ -177,15 +177,20 @@ int srslte_ringbuffer_read_timed_block(srslte_ringbuffer_t* q, void* p, int nof_
{
int ret = SRSLTE_SUCCESS;
uint8_t* ptr = (uint8_t*)p;
struct timespec towait;
struct timeval now;
struct timespec towait = {};
// Get current time and update timeout
if (timeout_ms > 0) {
gettimeofday(&now, NULL);
towait.tv_sec = now.tv_sec + timeout_ms / 1000U;
towait.tv_nsec = (now.tv_usec + 1000UL * (timeout_ms % 1000U)) * 1000UL;
struct timespec now = {};
timespec_get(&now, TIME_UTC);
// check nsec wrap-around
towait.tv_sec = now.tv_sec + timeout_ms / 1000L;
long nsec = now.tv_nsec + ((timeout_ms % 1000U) * 1000UL);
towait.tv_sec += nsec / 1000000000L;
towait.tv_nsec = nsec % 1000000000L;
}
// Lock mutex
pthread_mutex_lock(&q->mutex);
@ -216,7 +221,11 @@ int srslte_ringbuffer_read_timed_block(srslte_ringbuffer_t* q, void* p, int nof_
}
q->count -= nof_bytes;
ret = nof_bytes;
} else if (ret == EINVAL) {
fprintf(stderr, "Error: pthread_cond_timedwait() returned EINVAL, timeout value corrupted.\n");
ret = SRSLTE_ERROR;
} else {
printf("ret=%d %s\n", ret, strerror(ret));
ret = SRSLTE_ERROR;
}