From: Martin Ling <redacted>
Date: Sun, 28 Sep 2014 13:30:20 +0000 (+0100)
Subject: Add a configurable read timeout to blocking SCPI reads, default 1s.
X-Git-Tag: libsigrok-0.4.0~891
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=9092e66888ffd9dad76f4c491f5ad080cfd3e5c9;p=libsigrok.git

Add a configurable read timeout to blocking SCPI reads, default 1s.
---

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index d5b6504a..ccf75598 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -734,6 +734,7 @@ struct sr_scpi_dev_inst {
 	int (*read_complete)(void *priv);
 	int (*close)(void *priv);
 	void (*free)(void *priv);
+	unsigned int read_timeout_ms;
 	void *priv;
 };
 
diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index fbb57472..64506215 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -183,6 +183,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;
 			params = g_strsplit(resource, "/", 0);
 			if (scpi->dev_inst_new(scpi->priv, drvc, resource,
 			                       params, serialcomm) != SR_OK) {
@@ -380,6 +381,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	char buf[256];
 	int len;
 	GString *response;
+	gint64 start;
+	unsigned int elapsed_ms;
 
 	if (command)
 		if (sr_scpi_send(scpi, command) != SR_OK)
@@ -388,6 +391,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	if (sr_scpi_read_begin(scpi) != SR_OK)
 		return SR_ERR;
 
+	start = g_get_monotonic_time();
+
 	response = g_string_new("");
 
 	*scpi_response = NULL;
@@ -399,6 +404,13 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 			return SR_ERR;
 		}
 		g_string_append_len(response, buf, len);
+		elapsed_ms = (g_get_monotonic_time() - start) / 1000;
+		if (elapsed_ms >= scpi->read_timeout_ms)
+		{
+			sr_err("Timed out waiting for SCPI response.");
+			g_string_free(response, TRUE);
+			return SR_ERR;
+		}
 	}
 
 	/* Get rid of trailing linefeed if present */