Skip to content

fix: add a timeout mechanism that stops acquisition if no data is received for several consecutive transfers #2

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

Merged
taorye merged 1 commit into from
Dec 17, 2025
Merged

fix: add a timeout mechanism that stops acquisition if no data is received for several consecutive transfers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 34 additions & 22 deletions src/hardware/sipeed-slogic-analyzer/protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
int64_t transfers_all_duration =
transfers_reached_time_now - devc->transfers_reached_time_start;

double expected_rate = devc->expected_rate_MBps;

devc->num_transfers_used -= 1;
devc->num_transfers_completed += 1;
sr_spew("[%d] Transfer #%d status: %d(%s).",
Expand Down Expand Up @@ -77,7 +79,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
devc->samples_got_nbytes;
devc->samples_got_nbytes += transfer->actual_length;

sr_dbg("[%u] Got %u/%u(%.2f%%) => speed: %.2fMBps, %.2fMBps(avg) => "
sr_dbg("[%u] Got %u/%u(%.2f%%) => speed: %.2fMBps, %.2fMBps(avg), %.0fMBps(exp) => "
"+%.3f=%.3fms.",
devc->num_transfers_completed, devc->samples_got_nbytes,
devc->samples_need_nbytes,
Expand All @@ -87,6 +89,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
transfers_reached_duration,
(double)devc->transfers_reached_nbytes /
transfers_all_duration,
expected_rate,
(double)transfers_reached_duration / SR_KHZ(1),
(double)transfers_all_duration / SR_KHZ(1));

Expand Down Expand Up @@ -141,32 +144,39 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
break;
}

if (devc->num_transfers_completed &&
(double)transfers_reached_duration / SR_KHZ(1) >
(TRANSFERS_DURATION_TOLERANCE + 1) *
devc->per_transfer_duration) {
double actual_rate = (double)devc->transfers_reached_nbytes_latest / transfers_reached_duration;
double average_rate = (double)devc->transfers_reached_nbytes / transfers_all_duration;
if (devc->num_transfers_completed > 1 &&
((double)transfers_reached_duration / SR_KHZ(1) >
(TRANSFERS_DURATION_TOLERANCE + 1) * devc->per_transfer_duration ||
actual_rate < expected_rate * (1.0 - TRANSFERS_DURATION_TOLERANCE) ||
average_rate < expected_rate * 0.95
)
) {
devc->timeout_count += 1;
if (devc->timeout_count > devc->num_transfers_used) {
sr_err("Timeout %.3fms!!! Reach duration limit: %.3f(%u+%.1f%%), %.3f > "
"%.3f(%u+%.1f%%)(total) except first one.",
(double)transfers_reached_duration / SR_KHZ(1),
(TRANSFERS_DURATION_TOLERANCE + 1) *
devc->per_transfer_duration,
devc->per_transfer_duration,
TRANSFERS_DURATION_TOLERANCE * 100,
(double)transfers_all_duration / SR_KHZ(1),
(TRANSFERS_DURATION_TOLERANCE + 1) *
devc->per_transfer_duration *
devc->num_transfers_completed,
devc->per_transfer_duration *
(devc->num_transfers_completed + 1),
TRANSFERS_DURATION_TOLERANCE * 100);
devc->acq_aborted = 1;
}
} else {
devc->timeout_count = 0;
}

if (devc->timeout_count > devc->num_transfers_used) {
sr_err("Timeout %.3fms!!! Rate %.2fMBps(avg)<%.0fMBps(exp) or Reach duration limit: %.3f(%u+%.1f%%), %.3f > "
"%.3f(%u+%.1f%%)(total) except first one.",
(double)transfers_reached_duration / SR_KHZ(1),
average_rate, expected_rate,
(TRANSFERS_DURATION_TOLERANCE + 1) *
devc->per_transfer_duration,
devc->per_transfer_duration,
TRANSFERS_DURATION_TOLERANCE * 100,
(double)transfers_all_duration / SR_KHZ(1),
(TRANSFERS_DURATION_TOLERANCE + 1) *
devc->per_transfer_duration *
devc->num_transfers_completed,
devc->per_transfer_duration *
(devc->num_transfers_completed + 1),
TRANSFERS_DURATION_TOLERANCE * 100);
devc->acq_aborted = 1;
}

if (devc->num_transfers_used == 0) {
devc->acq_aborted = 1;
}
Expand Down Expand Up @@ -274,6 +284,8 @@ static int train_bulk_in_transfer(struct dev_context *devc,
uint64_t Bps = bps / 8;
uint64_t BpMs = Bps / SR_KHZ(1);

devc->expected_rate_MBps = BpMs/SR_KHZ(1);

uint64_t cur_transfer_duration = 250 /* ms */;
uint64_t try_transfer_nbytes = cur_transfer_duration * BpMs /* bytes */;

Expand Down
1 change: 1 addition & 0 deletions src/hardware/sipeed-slogic-analyzer/protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct dev_context {
uint64_t cur_samplerate;
int32_t cur_samplechannel;
int64_t cur_pattern_mode_idx;
uint32_t expected_rate_MBps;
}; // configuration

struct {
Expand Down