FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry read operations on failure

Browse Source 
[Jef Driesen: Modified to retry only for non-fatal errors.]
This commit is contained in:
John Van Ostrand 2017-05-31 19:24:47 -04:00 committed by Jef Driesen
parent 346391ae2c
commit b3d2c603dd
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/cochran_commander.c
View File

@ -32,6 +32,8 @@
#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array)) #define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
#define MAXRETRIES 2
#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 0 #define COCHRAN_MODEL_COMMANDER_AIR_NITROX 0
#define COCHRAN_MODEL_EMC_14 1 #define COCHRAN_MODEL_EMC_14 1
#define COCHRAN_MODEL_EMC_16 2 #define COCHRAN_MODEL_EMC_16 2
@ -435,6 +437,31 @@ cochran_commander_read (cochran_commander_device_t *device, dc_event_progress_t
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
} }
static unsigned int
cochran_commander_read_retry (cochran_commander_device_t *device, dc_event_progress_t *progress, unsigned int address, unsigned char data[], unsigned int size)
{
// Save the state of the progress events.
unsigned int saved = progress->current;
unsigned int nretries = 0;
dc_status_t rc = DC_STATUS_SUCCESS;
while ((rc = cochran_commander_read (device, progress, address, data, size)) != DC_STATUS_SUCCESS) {
// Automatically discard a corrupted packet,
// and request a new one.
if (rc != DC_STATUS_PROTOCOL && rc != DC_STATUS_TIMEOUT)
return rc;
// Abort if the maximum number of retries is reached.
if (nretries++ >= MAXRETRIES)
return rc;
// Restore the state of the progress events.
progress->current = saved;
}
return rc;
}
/* /*
* For corrupt dives the end-of-samples pointer is 0xFFFFFFFF * For corrupt dives the end-of-samples pointer is 0xFFFFFFFF
@ -890,7 +917,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
sample_end_address = cochran_commander_guess_sample_end_address(device, &data, i); sample_end_address = cochran_commander_guess_sample_end_address(device, &data, i);
if (sample_start_address <= sample_end_address) { if (sample_start_address <= sample_end_address) {
rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size); rc = cochran_commander_read_retry (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the sample data."); ERROR (abstract->context, "Failed to read the sample data.");
status = rc; status = rc;
@ -901,14 +928,15 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
// It wrapped the buffer, copy two sections // It wrapped the buffer, copy two sections
unsigned int size = device->layout->rb_profile_end - sample_start_address; unsigned int size = device->layout->rb_profile_end - sample_start_address;
rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, size); rc = cochran_commander_read_retry (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, size);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the sample data."); ERROR (abstract->context, "Failed to read the sample data.");
status = rc; status = rc;
free(dive); free(dive);
goto error; goto error;
} }
rc = cochran_commander_read (device, &progress, device->layout->rb_profile_begin, dive + device->layout->rb_logbook_entry_size + size, sample_end_address - device->layout->rb_profile_begin);
rc = cochran_commander_read_retry (device, &progress, device->layout->rb_profile_begin, dive + device->layout->rb_logbook_entry_size + size, sample_end_address - device->layout->rb_profile_begin);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the sample data."); ERROR (abstract->context, "Failed to read the sample data.");
status = rc; status = rc;