From: Daniel Anselmi <redacted>
Date: Fri, 18 Jan 2019 02:03:02 +0000 (+0100)
Subject: ipdbg-la: improve speed
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8e249032d385a3f2e17dc52a48b9427fc79315c9;p=libsigrok.git

ipdbg-la: improve speed
---

diff --git a/src/hardware/ipdbg-la/api.c b/src/hardware/ipdbg-la/api.c
index f3de8e63..407344d2 100644
--- a/src/hardware/ipdbg-la/api.c
+++ b/src/hardware/ipdbg-la/api.c
@@ -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;
 		}
 	}
 
diff --git a/src/hardware/ipdbg-la/protocol.c b/src/hardware/ipdbg-la/protocol.c
index ac36b060..d5cc7a47 100644
--- a/src/hardware/ipdbg-la/protocol.c
+++ b/src/hardware/ipdbg-la/protocol.c
@@ -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) {
-				sr_err("Receive error: %s", g_strerror(errno));
-				return SR_ERR;
-			} else
-				received += len;
-		}
-
-		return received;
-	} else
+	if (data_available(tcp))
+		received = recv(tcp->socket, (char *)buf, bufsize, 0);
+	if (received < 0) {
+		sr_err("Receive error: %s", g_strerror(errno));
 		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;
-
-		if (ipdbg_la_tcp_receive(tcp, &byte) == 1) {
-			if (devc->num_transfers <
-				(devc->limit_samples * devc->data_width_bytes))
-				devc->raw_sample_buf[devc->num_transfers] = byte;
-
-			devc->num_transfers++;
+		const size_t bufsize = 1024;
+		uint8_t buffer[bufsize];
+
+		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))
+			?
+				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) {
diff --git a/src/hardware/ipdbg-la/protocol.h b/src/hardware/ipdbg-la/protocol.h
index 875a8cff..19a56c31 100644
--- a/src/hardware/ipdbg-la/protocol.h
+++ b/src/hardware/ipdbg-la/protocol.h
@@ -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);