From: Stefan Brüns <redacted>
Date: Thu, 12 Jan 2017 00:20:17 +0000 (+0100)
Subject: scpi: Query current time just once, use microseconds for timeout
X-Git-Tag: libsigrok-0.5.0~135
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=37ef582d088190ffcf5f8a649ca622cfc52f289a

scpi: Query current time just once, use microseconds for timeout

g_get_monotonic_time() returns current time in microseconds, use the same
granularity for storing the read timeout.
There is also no need to check the timeout if data has just been read.
---

diff --git a/src/scpi.h b/src/scpi.h
index e9e7084b..1c2c20d7 100644
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -94,7 +94,7 @@ struct sr_scpi_dev_inst {
 	int (*read_complete)(void *priv);
 	int (*close)(struct sr_scpi_dev_inst *scpi);
 	void (*free)(void *priv);
-	unsigned int read_timeout_ms;
+	unsigned int read_timeout_us;
 	void *priv;
 	/* Only used for quirk workarounds, notably the Rigol DS1000 series. */
 	uint64_t firmware_version;
diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index adb3e751..f6865c37 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -190,7 +190,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
 			scpi = g_malloc(sizeof(*scpi));
 			*scpi = *scpi_dev;
 			scpi->priv = g_malloc0(scpi->priv_size);
-			scpi->read_timeout_ms = 1000;
+			scpi->read_timeout_us = 1000 * 1000;
 			params = g_strsplit(resource, "/", 0);
 			if (scpi->dev_inst_new(scpi->priv, drvc, resource,
 			                       params, serialcomm) != SR_OK) {
@@ -417,8 +417,7 @@ SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
 {
 	int len;
 	GString *response;
-	gint64 laststart;
-	unsigned int elapsed_ms;
+	gint64 laststart, now;
 	unsigned int offset;
 	int space;
 
@@ -451,16 +450,18 @@ SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
 		if (len < 0) {
 			sr_err("Incompletely read SCPI response.");
 			return SR_ERR;
-		} else if (len > 0) {
-			laststart = g_get_monotonic_time();
+		}
+
+		now = g_get_monotonic_time();
+
+		if (len > 0) {
+			laststart = now;
 			offset += len;
 			g_string_set_size(response, offset);
-		}
-		/* Quit reading after a period of time without receive data. */
-		elapsed_ms = (g_get_monotonic_time() - laststart) / 1000;
-		if (elapsed_ms >= scpi->read_timeout_ms) {
+		} else if ((now - laststart) >= scpi->read_timeout_us) {
+			/* Quit reading after a period of time without receiving data. */
 			sr_err("Timed out waiting for SCPI response.");
-			return SR_ERR;
+			return SR_ERR_TIMEOUT;
 		}
 	}