From 3dafac7add433d044b8f7bec27eba29c83620109 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Thu, 19 Nov 2015 19:23:19 -0500 Subject: [PATCH] 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. --- host/libraries/libbladeRF/src/async.c | 7 ++-- host/libraries/libbladeRF/src/async.h | 9 ++++- .../libbladeRF/src/backend/backend.h | 2 +- .../libbladeRF/src/backend/usb/cyapi.c | 38 ++++++++++++------- .../libbladeRF/src/backend/usb/libusb.c | 38 ++++++++++++------- .../libbladeRF/src/backend/usb/usb.c | 5 ++- .../libbladeRF/src/backend/usb/usb.h | 3 +- host/libraries/libbladeRF/src/bladerf.c | 2 +- host/libraries/libbladeRF/src/sync.c | 5 ++- 9 files changed, 69 insertions(+), 40 deletions(-) diff --git a/host/libraries/libbladeRF/src/async.c b/host/libraries/libbladeRF/src/async.c index 0b8af774..18280a85 100644 --- a/host/libraries/libbladeRF/src/async.c +++ b/host/libraries/libbladeRF/src/async.c @@ -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); diff --git a/host/libraries/libbladeRF/src/async.h b/host/libraries/libbladeRF/src/async.h index de8de817..8c3c7f05 100644 --- a/host/libraries/libbladeRF/src/async.h +++ b/host/libraries/libbladeRF/src/async.h @@ -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); diff --git a/host/libraries/libbladeRF/src/backend/backend.h b/host/libraries/libbladeRF/src/backend/backend.h index b607d725..959d5af2 100644 --- a/host/libraries/libbladeRF/src/backend/backend.h +++ b/host/libraries/libbladeRF/src/backend/backend.h @@ -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 */ diff --git a/host/libraries/libbladeRF/src/backend/usb/cyapi.c b/host/libraries/libbladeRF/src/backend/usb/cyapi.c index 05064d9e..52176bd3 100644 --- a/host/libraries/libbladeRF/src/backend/usb/cyapi.c +++ b/host/libraries/libbladeRF/src/backend/usb/cyapi.c @@ -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); + } } } diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c index 479860a4..b9551449 100644 --- a/host/libraries/libbladeRF/src/backend/usb/libusb.c +++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c @@ -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); + } } } diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.c b/host/libraries/libbladeRF/src/backend/usb/usb.c index f98ece9d..49a4056a 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.c +++ b/host/libraries/libbladeRF/src/backend/usb/usb.c @@ -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) diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.h b/host/libraries/libbladeRF/src/backend/usb/usb.h index 943588ca..86008a3c 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.h +++ b/host/libraries/libbladeRF/src/backend/usb/usb.h @@ -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); diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 793011df..8c87d490 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -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) diff --git a/host/libraries/libbladeRF/src/sync.c b/host/libraries/libbladeRF/src/sync.c index fd578869..540fe6d7 100644 --- a/host/libraries/libbladeRF/src/sync.c +++ b/host/libraries/libbladeRF/src/sync.c @@ -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) {