libbladeRF: Added "non-block" option to internal async buffer submission
This is one step towards addressing issue #438; we must first know that we are unable to submit a buffer so that we can defer its submission to a later callback.
This commit is contained in:
parent
f84df2601d
commit
3dafac7add
9 changed files with 69 additions and 40 deletions
|
|
@ -153,8 +153,8 @@ int async_run_stream(struct bladerf_stream *stream, bladerf_module module)
|
|||
}
|
||||
|
||||
int async_submit_stream_buffer(struct bladerf_stream *stream,
|
||||
void *buffer,
|
||||
unsigned int timeout_ms)
|
||||
void *buffer, unsigned int timeout_ms,
|
||||
bool nonblock)
|
||||
{
|
||||
int status = 0;
|
||||
struct timespec timeout_abs;
|
||||
|
|
@ -194,7 +194,8 @@ int async_submit_stream_buffer(struct bladerf_stream *stream,
|
|||
}
|
||||
}
|
||||
|
||||
status = stream->dev->fn->submit_stream_buffer(stream, buffer, timeout_ms);
|
||||
status = stream->dev->fn->submit_stream_buffer(stream, buffer,
|
||||
timeout_ms, nonblock);
|
||||
|
||||
error:
|
||||
MUTEX_UNLOCK(&stream->lock);
|
||||
|
|
|
|||
|
|
@ -77,10 +77,15 @@ int async_init_stream(struct bladerf_stream **stream,
|
|||
int async_run_stream(struct bladerf_stream *stream, bladerf_module module);
|
||||
|
||||
|
||||
/* This function WILL acquire stream->lock before calling backend code */
|
||||
/* This function WILL acquire stream->lock before calling backend code.
|
||||
*
|
||||
* If nonblock=true and no transfers are available, this function shall return
|
||||
* BLADERF_ERR_WOULD_BLOCK.
|
||||
*/
|
||||
int async_submit_stream_buffer(struct bladerf_stream *stream,
|
||||
void *buffer,
|
||||
unsigned int timeout_ms);
|
||||
unsigned int timeout_ms,
|
||||
bool nonblock);
|
||||
|
||||
|
||||
void async_deinit_stream(struct bladerf_stream *stream);
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ struct backend_fns {
|
|||
int (*init_stream)(struct bladerf_stream *stream, size_t num_transfers);
|
||||
int (*stream)(struct bladerf_stream *stream, bladerf_module module);
|
||||
int (*submit_stream_buffer)(struct bladerf_stream *stream, void *buffer,
|
||||
unsigned int timeout_ms);
|
||||
unsigned int timeout_ms, bool nonblock);
|
||||
void (*deinit_stream)(struct bladerf_stream *stream);
|
||||
|
||||
/* Schedule a frequency retune operation */
|
||||
|
|
|
|||
|
|
@ -722,7 +722,8 @@ out:
|
|||
}
|
||||
/* The top-level code will have aquired the stream->lock for us */
|
||||
int cyapi_submit_stream_buffer(void *driver, struct bladerf_stream *stream,
|
||||
void *buffer, unsigned int timeout_ms)
|
||||
void *buffer, unsigned int timeout_ms,
|
||||
bool nonblock)
|
||||
{
|
||||
int status = 0;
|
||||
struct timespec timeout_abs;
|
||||
|
|
@ -738,21 +739,30 @@ int cyapi_submit_stream_buffer(void *driver, struct bladerf_stream *stream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (timeout_ms != 0) {
|
||||
status = populate_abs_timeout(&timeout_abs, timeout_ms);
|
||||
if (status != 0) {
|
||||
return BLADERF_ERR_UNEXPECTED;
|
||||
if (data->num_avail == 0) {
|
||||
if (nonblock) {
|
||||
log_debug("Non-blocking buffer submission requested, but no "
|
||||
"transfers are currently available.");
|
||||
|
||||
return BLADERF_ERR_WOULD_BLOCK;
|
||||
}
|
||||
|
||||
while (data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_timedwait(&stream->can_submit_buffer,
|
||||
&stream->lock,
|
||||
&timeout_abs);
|
||||
}
|
||||
} else {
|
||||
while (data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_wait(&stream->can_submit_buffer,
|
||||
&stream->lock);
|
||||
if (timeout_ms != 0) {
|
||||
status = populate_abs_timeout(&timeout_abs, timeout_ms);
|
||||
if (status != 0) {
|
||||
return BLADERF_ERR_UNEXPECTED;
|
||||
}
|
||||
|
||||
while (data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_timedwait(&stream->can_submit_buffer,
|
||||
&stream->lock,
|
||||
&timeout_abs);
|
||||
}
|
||||
} else {
|
||||
while (data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_wait(&stream->can_submit_buffer,
|
||||
&stream->lock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1252,7 +1252,8 @@ static int lusb_stream(void *driver, struct bladerf_stream *stream,
|
|||
}
|
||||
/* The top-level code will have aquired the stream->lock for us */
|
||||
int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream,
|
||||
void *buffer, unsigned int timeout_ms)
|
||||
void *buffer, unsigned int timeout_ms,
|
||||
bool nonblock)
|
||||
{
|
||||
int status = 0;
|
||||
struct lusb_stream_data *stream_data = stream->backend_data;
|
||||
|
|
@ -1268,21 +1269,30 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (timeout_ms != 0) {
|
||||
status = populate_abs_timeout(&timeout_abs, timeout_ms);
|
||||
if (status != 0) {
|
||||
return BLADERF_ERR_UNEXPECTED;
|
||||
if (stream_data->num_avail == 0) {
|
||||
if (nonblock) {
|
||||
log_debug("Non-blocking buffer submission requested, but no "
|
||||
"transfers are currently available.");
|
||||
|
||||
return BLADERF_ERR_WOULD_BLOCK;
|
||||
}
|
||||
|
||||
while (stream_data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_timedwait(&stream->can_submit_buffer,
|
||||
&stream->lock,
|
||||
&timeout_abs);
|
||||
}
|
||||
} else {
|
||||
while (stream_data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_wait(&stream->can_submit_buffer,
|
||||
&stream->lock);
|
||||
if (timeout_ms != 0) {
|
||||
status = populate_abs_timeout(&timeout_abs, timeout_ms);
|
||||
if (status != 0) {
|
||||
return BLADERF_ERR_UNEXPECTED;
|
||||
}
|
||||
|
||||
while (stream_data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_timedwait(&stream->can_submit_buffer,
|
||||
&stream->lock,
|
||||
&timeout_abs);
|
||||
}
|
||||
} else {
|
||||
while (stream_data->num_avail == 0 && status == 0) {
|
||||
status = pthread_cond_wait(&stream->can_submit_buffer,
|
||||
&stream->lock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -880,11 +880,12 @@ static int usb_stream(struct bladerf_stream *stream, bladerf_module module)
|
|||
}
|
||||
|
||||
int usb_submit_stream_buffer(struct bladerf_stream *stream, void *buffer,
|
||||
unsigned int timeout_ms)
|
||||
unsigned int timeout_ms, bool nonblock)
|
||||
{
|
||||
void *driver;
|
||||
struct bladerf_usb *usb = usb_backend(stream->dev, &driver);
|
||||
return usb->fn->submit_stream_buffer(driver, stream, buffer, timeout_ms);
|
||||
return usb->fn->submit_stream_buffer(driver, stream, buffer,
|
||||
timeout_ms, nonblock);
|
||||
}
|
||||
|
||||
static void usb_deinit_stream(struct bladerf_stream *stream)
|
||||
|
|
|
|||
|
|
@ -128,7 +128,8 @@ struct usb_fns {
|
|||
bladerf_module module);
|
||||
|
||||
int (*submit_stream_buffer)(void *driver, struct bladerf_stream *stream,
|
||||
void *buffer, unsigned int timeout_ms);
|
||||
void *buffer, unsigned int timeout_ms,
|
||||
bool nonblock);
|
||||
|
||||
int (*deinit_stream)(void *driver, struct bladerf_stream *stream);
|
||||
|
||||
|
|
|
|||
|
|
@ -1022,7 +1022,7 @@ int bladerf_submit_stream_buffer(struct bladerf_stream *stream,
|
|||
void *buffer,
|
||||
unsigned int timeout_ms)
|
||||
{
|
||||
return async_submit_stream_buffer(stream, buffer, timeout_ms);
|
||||
return async_submit_stream_buffer(stream, buffer, timeout_ms, false);
|
||||
}
|
||||
|
||||
void bladerf_deinit_stream(struct bladerf_stream *stream)
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ void sync_deinit(struct bladerf_sync *sync)
|
|||
|
||||
if (sync->stream_config.module == BLADERF_MODULE_TX) {
|
||||
async_submit_stream_buffer(sync->worker->stream,
|
||||
BLADERF_STREAM_SHUTDOWN, 0);
|
||||
BLADERF_STREAM_SHUTDOWN, 0, false);
|
||||
}
|
||||
|
||||
sync_worker_deinit(sync->worker, &sync->buf_mgmt.lock,
|
||||
|
|
@ -625,7 +625,8 @@ static int advance_tx_buffer(struct bladerf_sync *s, struct buffer_mgmt *b)
|
|||
MUTEX_UNLOCK(&b->lock);
|
||||
status = async_submit_stream_buffer(s->worker->stream,
|
||||
b->buffers[b->prod_i],
|
||||
s->stream_config.timeout_ms);
|
||||
s->stream_config.timeout_ms,
|
||||
false);
|
||||
MUTEX_LOCK(&b->lock);
|
||||
|
||||
if (status == 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue