BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipdbg-la: improve speed

This commit is contained in:
Daniel Anselmi 2019-01-18 03:03:02 +01:00 committed by Uwe Hermann
parent c54ca32340
commit 8e249032d3
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hardware/ipdbg-la/api.c
View File

@ -262,13 +262,15 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
struct ipdbg_la_tcp *tcp = sdi->conn;
struct dev_context *devc = sdi->priv;
uint8_t byte;
const size_t bufsize = 1024;
uint8_t buffer[bufsize];
if (devc->num_transfers > 0) {
while (devc->num_transfers <
(devc->limit_samples_max * devc->data_width_bytes)) {
ipdbg_la_tcp_receive(tcp, &byte);
devc->num_transfers++;
int recd = ipdbg_la_tcp_receive(tcp, buffer, bufsize);
if (recd > 0)
devc->num_transfers += recd;
}
}

50
src/hardware/ipdbg-la/protocol.c
View File

@ -182,10 +182,12 @@ static int tcp_receive_blocking(struct ipdbg_la_tcp *tcp,
int error_count = 0;
/* Timeout after 500ms of not receiving data */
while ((received < bufsize) && (error_count < 500)) {
if (ipdbg_la_tcp_receive(tcp, buf) > 0) {
buf++;
received++;
/* increase timeout in case lab is not just beside the office */
while ((received < bufsize) && (error_count < 2000)) {
int recd = ipdbg_la_tcp_receive(tcp, buf, bufsize-received);
if ( recd > 0 ) {
buf += recd;
received += recd;
} else {
error_count++;
g_usleep(1000); /* Sleep for 1ms */
@ -196,24 +198,16 @@ static int tcp_receive_blocking(struct ipdbg_la_tcp *tcp,
}
SR_PRIV int ipdbg_la_tcp_receive(struct ipdbg_la_tcp *tcp,
uint8_t *buf)
uint8_t *buf, size_t bufsize)
{
int received = 0;
if (data_available(tcp)) {
while (received < 1) {
int len = recv(tcp->socket, (char *)buf, 1, 0);
if (len < 0) {
if (data_available(tcp))
received = recv(tcp->socket, (char *)buf, bufsize, 0);
if (received < 0) {
sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
} else
received += len;
}
return received;
} else
return -1;
} else
return received;
}
SR_PRIV int ipdbg_la_convert_trigger(const struct sr_dev_inst *sdi)
@ -316,14 +310,22 @@ SR_PRIV int ipdbg_la_receive_data(int fd, int revents, void *cb_data)
if (devc->num_transfers <
(devc->limit_samples_max * devc->data_width_bytes)) {
uint8_t byte;
const size_t bufsize = 1024;
uint8_t buffer[bufsize];
if (ipdbg_la_tcp_receive(tcp, &byte) == 1) {
if (devc->num_transfers <
const int recd = ipdbg_la_tcp_receive(tcp, buffer, bufsize);
if ( recd > 0) {
int num_move = (((devc->num_transfers + recd) <=
(devc->limit_samples * devc->data_width_bytes))
devc->raw_sample_buf[devc->num_transfers] = byte;
devc->num_transfers++;
?
recd
:
(int)((devc->limit_samples * devc->data_width_bytes) -
devc->num_transfers));
if ( num_move > 0 )
memcpy(&(devc->raw_sample_buf[devc->num_transfers]),
buffer, num_move);
devc->num_transfers += recd;
}
} else {
if (devc->delay_value > 0) {

3
src/hardware/ipdbg-la/protocol.h
View File

@ -58,7 +58,8 @@ SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void);
SR_PRIV void ipdbg_la_tcp_free(struct ipdbg_la_tcp *tcp);
SR_PRIV int ipdbg_la_tcp_open(struct ipdbg_la_tcp *tcp);
SR_PRIV int ipdbg_la_tcp_close(struct ipdbg_la_tcp *tcp);
SR_PRIV int ipdbg_la_tcp_receive(struct ipdbg_la_tcp *tcp, uint8_t *buf);
SR_PRIV int ipdbg_la_tcp_receive(struct ipdbg_la_tcp *tcp,
uint8_t *buf, size_t bufsize);
SR_PRIV int ipdbg_la_convert_trigger(const struct sr_dev_inst *sdi);