Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overhaul handling of transfer errors and use of streaming flag. #1069

Merged
merged 10 commits into from
Jun 14, 2022
Merged

Overhaul handling of transfer errors and use of streaming flag. #1069

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9e1cb5c
Don't exit transfer thread if an error occurs.
martinling Mar 18, 2022
6720e56
Clear streaming flag if we didn't resubmit a transfer.
martinling Mar 18, 2022
125bf9f
Don't call callback or submit new transfers once streaming stops.
martinling Mar 18, 2022
6bd9cb0
Clear streaming flag if a transfer was cancelled.
martinling Mar 18, 2022
54e00de
Clear streaming flag in transfer_finished().
martinling Mar 18, 2022
c74c742
Simplify hackrf_libusb_transfer_callback.
martinling Mar 18, 2022
960d801
Clear streaming flag in cancel_transfers().
martinling Mar 18, 2022
5afd31e
Set streaming flag in prepare_setup_transfers().
martinling Mar 18, 2022
c4789df
Set streaming flag in prepare_transfers().
martinling Mar 18, 2022
503cd33
Remove request_exit() function.
martinling Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 19 additions & 46 deletions host/libhackrf/src/hackrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,6 @@ static int create_transfer_thread(hackrf_device* device);
static libusb_context* g_libusb_context = NULL;
int last_libusb_error = LIBUSB_SUCCESS;

static void request_exit(hackrf_device* device)
{
device->do_exit = true;
}

/*
* Check if the transfers are setup and owned by libusb.
*
Expand Down Expand Up @@ -218,6 +213,9 @@ static int cancel_transfers(hackrf_device* device)
uint32_t transfer_index;
int i;

// If we're cancelling transfers for any reason, we're shutting down.
device->streaming = false;

if(transfers_check_setup(device) == true)
{
// Take lock while cancelling transfers. This blocks the
Expand Down Expand Up @@ -348,6 +346,7 @@ static int prepare_transfers(
}
}
device->transfers_setup = true;
device->streaming = true;
return HACKRF_SUCCESS;
} else {
// This shouldn't happen.
Expand Down Expand Up @@ -1704,6 +1703,9 @@ static void transfer_finished(struct hackrf_device* device, struct libusb_transf
int i;
bool all_finished = true;

// If a transfer finished for any reason, we're shutting down.
device->streaming = false;

for (i = 0; i < TRANSFER_COUNT; i++) {
if (device->transfers[i] == finished_transfer) {
device->transfer_finished[i] = true;
Expand Down Expand Up @@ -1737,7 +1739,7 @@ static void LIBUSB_CALL hackrf_libusb_transfer_callback(struct libusb_transfer*
.tx_ctx = device->tx_ctx
};

if( device->callback(&transfer) == 0 )
if (device->streaming && device->callback(&transfer) == 0)
{
// Take lock to make sure that we don't restart a
// transfer whilst cancel_transfers() is in the middle
Expand All @@ -1752,23 +1754,14 @@ static void LIBUSB_CALL hackrf_libusb_transfer_callback(struct libusb_transfer*
// cancelled or restarted, not both.
pthread_mutex_unlock(&device->transfer_lock);

if (!resubmit || result < 0) {
transfer_finished(device, usb_transfer);
}
} else {
transfer_finished(device, usb_transfer);
device->streaming = false;
if (resubmit && result == LIBUSB_SUCCESS)
return;
}
} else if(usb_transfer->status == LIBUSB_TRANSFER_CANCELLED) {
transfer_finished(device, usb_transfer);
} else {
/* Other cases LIBUSB_TRANSFER_NO_DEVICE
LIBUSB_TRANSFER_ERROR, LIBUSB_TRANSFER_TIMED_OUT
LIBUSB_TRANSFER_STALL, LIBUSB_TRANSFER_OVERFLOW ....
*/
request_exit(device); /* Fatal error stop transfer */
device->streaming = false;
}

// Unless we resubmitted this transfer and returned above,
// it's now finished.
transfer_finished(device, usb_transfer);
}

static int kill_transfer_thread(hackrf_device* device)
Expand All @@ -1783,10 +1776,10 @@ static int kill_transfer_thread(hackrf_device* device)
* thread has handled all completion callbacks.
*/
cancel_transfers(device);
/*
* Now call request_exit() to halt the main loop.
*/
request_exit(device);

// Set flag to tell the thread to exit.
device->do_exit = true;

/*
* Interrupt the event handling thread instead of
* waiting for timeout.
Expand Down Expand Up @@ -1816,25 +1809,16 @@ static int prepare_setup_transfers(hackrf_device* device,
const uint8_t endpoint_address,
hackrf_sample_block_cb_fn callback)
{
int result;

if( device->transfers_setup == true )
{
return HACKRF_ERROR_BUSY;
}

device->callback = callback;
result = prepare_transfers(
return prepare_transfers(
device, endpoint_address,
hackrf_libusb_transfer_callback
);

if( result != HACKRF_SUCCESS )
{
return result;
}

return HACKRF_SUCCESS;
}

static int create_transfer_thread(hackrf_device* device)
Expand Down Expand Up @@ -1897,9 +1881,6 @@ int ADDCALL hackrf_start_rx(hackrf_device* device, hackrf_sample_block_cb_fn cal
{
result = prepare_setup_transfers(device, endpoint_address, callback);
}
if (result == HACKRF_SUCCESS) {
device->streaming = true;
}
return result;
}

Expand Down Expand Up @@ -1928,7 +1909,6 @@ int ADDCALL hackrf_stop_rx(hackrf_device* device)
{
int result;

device->streaming = false;
result = cancel_transfers(device);
if (result != HACKRF_SUCCESS)
{
Expand All @@ -1948,9 +1928,6 @@ int ADDCALL hackrf_start_tx(hackrf_device* device, hackrf_sample_block_cb_fn cal
device->tx_ctx = tx_ctx;
result = prepare_setup_transfers(device, endpoint_address, callback);
}
if (result == HACKRF_SUCCESS) {
device->streaming = true;
}
return result;
}

Expand All @@ -1977,7 +1954,6 @@ static int hackrf_stop_tx_cmd(hackrf_device* device)
int ADDCALL hackrf_stop_tx(hackrf_device* device)
{
int result;
device->streaming = false;
result = cancel_transfers(device);
if (result != HACKRF_SUCCESS)
{
Expand Down Expand Up @@ -2683,9 +2659,6 @@ int ADDCALL hackrf_start_rx_sweep(hackrf_device* device, hackrf_sample_block_cb_
device->rx_ctx = rx_ctx;
result = prepare_setup_transfers(device, endpoint_address, callback);
}
if (result == HACKRF_SUCCESS) {
device->streaming = true;
}
return result;
}

Expand Down