X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fruntc.c;h=b75e4142c67d079b19035be1b806d2d7501d4041;hb=73fc79e094855b616fb6d6e392a87338ffe37a6b;hp=f0649f9d727b5d6a209c620f78d3d61a3bc463e5;hpb=6b85745afe65ebd2722921bf23e91fa4573f4302;p=libsigrokdecode.git

diff --git a/tests/runtc.c b/tests/runtc.c
index f0649f9..b75e414 100644
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -36,7 +36,6 @@
 #endif
 #include "../config.h"
 
-
 int debug = FALSE;
 int statistics = FALSE;
 
@@ -66,7 +65,7 @@ struct output {
 };
 
 
-void logmsg(char *prefix, FILE *out, const char *format, va_list args)
+static void logmsg(char *prefix, FILE *out, const char *format, va_list args)
 {
 	if (prefix)
 		fprintf(out, "%s", prefix);
@@ -74,7 +73,7 @@ void logmsg(char *prefix, FILE *out, const char *format, va_list args)
 	fprintf(out, "\n");
 }
 
-void DBG(const char *format, ...)
+static void DBG(const char *format, ...)
 {
 	va_list args;
 
@@ -85,7 +84,7 @@ void DBG(const char *format, ...)
 	va_end(args);
 }
 
-void ERR(const char *format, ...)
+static void ERR(const char *format, ...)
 {
 	va_list args;
 
@@ -94,7 +93,7 @@ void ERR(const char *format, ...)
 	va_end(args);
 }
 
-int sr_log(void *cb_data, int loglevel, const char *format, va_list args)
+static int sr_log(void *cb_data, int loglevel, const char *format, va_list args)
 {
 	(void)cb_data;
 
@@ -106,7 +105,7 @@ int sr_log(void *cb_data, int loglevel, const char *format, va_list args)
 	return SRD_OK;
 }
 
-int srd_log(void *cb_data, int loglevel, const char *format, va_list args)
+static int srd_log(void *cb_data, int loglevel, const char *format, va_list args)
 {
 	(void)cb_data;
 
@@ -118,12 +117,11 @@ int srd_log(void *cb_data, int loglevel, const char *format, va_list args)
 	return SRD_OK;
 }
 
-void usage(char *msg)
+static void usage(char *msg)
 {
 	if (msg)
 		fprintf(stderr, "%s\n", msg);
 
-	//while((c = getopt(argc, argv, "dP:p:o:i:O:f:S")) != -1) {
 	printf("Usage: runtc [-dPpoiOf]\n");
 	printf("  -d  Debug\n");
 	printf("  -P  <protocol decoder>\n");
@@ -136,6 +134,93 @@ void usage(char *msg)
 
 }
 
+/* This is a neutered version of libsigrokdecode's py_str_as_str(). It
+ * does no error checking, but then the only strings it processes are
+ * generated by Python's repr(), so are known good. */
+static char *py_str_as_str(const PyObject *py_str)
+{
+	PyObject *py_encstr;
+	char *str, *outstr;
+
+	py_encstr = PyUnicode_AsEncodedString((PyObject *)py_str, "utf-8", NULL);
+	str = PyBytes_AS_STRING(py_encstr);
+	outstr = g_strdup(str);
+	Py_DecRef(py_encstr);
+
+	return outstr;
+}
+
+static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data)
+{
+	struct output *op;
+	PyObject *pydata, *pyrepr;
+	GString *out;
+	char *s;
+
+	DBG("Python output from %s", pdata->pdo->di->inst_id);
+	op = cb_data;
+	pydata = pdata->data;
+	DBG("ptr %p", pydata);
+
+	if (strcmp(pdata->pdo->di->inst_id, op->pd))
+		/* This is not the PD selected for output. */
+		return;
+
+	if (!(pyrepr = PyObject_Repr(pydata))) {
+		ERR("Invalid Python object.");
+		return;
+	}
+	s = py_str_as_str(pyrepr);
+	Py_DecRef(pyrepr);
+
+	/* Output format for testing is '<ss>-<es> <inst-id>: <repr>\n' */
+	out = g_string_sized_new(128);
+	g_string_printf(out, "%"PRIu64"-%"PRIu64" %s: %s\n",
+			pdata->start_sample, pdata->end_sample,
+			pdata->pdo->di->inst_id, s);
+	g_free(s);
+	if (write(op->outfd, out->str, out->len) == -1)
+		ERR("SRD_OUTPUT_PYTHON callback write failure!");
+	DBG("wrote '%s'", out->str);
+	g_string_free(out, TRUE);
+
+}
+
+static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data)
+{
+	struct srd_proto_data_binary *pdb;
+	struct output *op;
+	GString *out;
+	unsigned int i;
+
+	DBG("Binary output from %s", pdata->pdo->di->inst_id);
+	op = cb_data;
+	pdb = pdata->data;
+
+	if (strcmp(pdata->pdo->di->inst_id, op->pd))
+		/* This is not the PD selected for output. */
+		return;
+
+	if (op->class_idx != -1 && op->class_idx != pdb->bin_class)
+		/*
+		 * This output takes a specific binary class,
+		 * but not the one that just came in.
+		 */
+		return;
+
+	out = g_string_sized_new(128);
+	g_string_printf(out, "%"PRIu64"-%"PRIu64" %s:",
+			pdata->start_sample, pdata->end_sample,
+			pdata->pdo->di->inst_id);
+	for (i = 0; i < pdb->size; i++) {
+		g_string_append_printf(out, " %.2x", pdb->data[i]);
+	}
+	g_string_append(out, "\n");
+	if (write(op->outfd, out->str, out->len) == -1)
+		ERR("SRD_OUTPUT_BINARY callback write failure!");
+
+}
+
 static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 {
 	struct srd_decoder *dec;
@@ -145,18 +230,19 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 	int i;
 	char **dec_ann;
 
-	DBG("Annotation from %s", pdata->pdo->di->inst_id);
+	DBG("Annotation output from %s", pdata->pdo->di->inst_id);
 	op = cb_data;
 	pda = pdata->data;
 	dec = pdata->pdo->di->decoder;
-
 	if (strcmp(pdata->pdo->di->inst_id, op->pd))
 		/* This is not the PD selected for output. */
 		return;
 
 	if (op->class_idx != -1 && op->class_idx != pda->ann_format)
-		/* This output takes a specific annotation class,
-		 * but not the one that just came in. */
+		/*
+		 * This output takes a specific annotation class,
+		 * but not the one that just came in.
+		 */
 		return;
 
 	dec_ann = g_slist_nth_data(dec->annotations, pda->ann_format);
@@ -168,7 +254,7 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 		g_string_append_printf(line, " \"%s\"", pda->ann_text[i]);
 	g_string_append(line, "\n");
 	if (write(op->outfd, line->str, line->len) == -1)
-		ERR("Oops!");
+		ERR("SRD_OUTPUT_ANN callback write failure!");
 	g_string_free(line, TRUE);
 
 }
@@ -220,44 +306,12 @@ static void sr_cb(const struct sr_dev_inst *sdi,
 
 }
 
-int get_stats(int stats[2])
-{
-	FILE *f;
-	size_t len;
-	int tmp;
-	char *buf;
-
-	stats[0] = stats[1] = -1;
-	if (!(f = fopen("/proc/self/status", "r")))
-		return FALSE;
-	len = 128;
-	buf = malloc(len);
-	while (getline(&buf, &len, f) != -1) {
-		if (strcasestr(buf, "vmpeak:")) {
-			stats[0] = strtoul(buf + 10, NULL, 10);
-		} else if (strcasestr(buf, "vmsize:")) {
-			tmp = strtoul(buf + 10, NULL, 10);
-			if (tmp > stats[0])
-				stats[0] = tmp;
-		} else if (strcasestr(buf, "vmhwm:")) {
-			stats[1] = strtoul(buf + 6, NULL, 10);
-		} else if (strcasestr(buf, "vmrss:")) {
-			tmp = strtoul(buf + 10, NULL, 10);
-			if (tmp > stats[0])
-				stats[0] = tmp;
-		}
-	}
-	free(buf);
-	fclose(f);
-
-	return TRUE;
-}
-
 static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 {
 	struct srd_session *sess;
 	struct srd_decoder *dec;
 	struct srd_decoder_inst *di, *prev_di;
+	srd_pd_output_callback_t cb;
 	struct pd *pd;
 	struct probe *probe;
 	struct option *option;
@@ -265,6 +319,7 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 	GHashTable *probes, *opts;
 	GSList *pdl, *l;
 	int idx;
+	int max_probe;
 	char **decoder_class;
 
 	if (op->outfile) {
@@ -281,7 +336,20 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 	if (srd_session_new(&sess) != SRD_OK)
 		return FALSE;
 	sr_session_datafeed_callback_add(sr_cb, sess);
-	srd_pd_output_callback_add(sess, SRD_OUTPUT_ANN, srd_cb_ann, op);
+	switch (op->type) {
+	case SRD_OUTPUT_ANN:
+		cb = srd_cb_ann;
+		break;
+	case SRD_OUTPUT_BINARY:
+		cb = srd_cb_bin;
+		break;
+	case SRD_OUTPUT_PYTHON:
+		cb = srd_cb_py;
+		break;
+	default:
+		return FALSE;
+	}
+	srd_pd_output_callback_add(sess, op->type, cb, op);
 
 	prev_di = NULL;
 	pd = NULL;
@@ -305,18 +373,21 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 		if (pd->probes) {
 			probes = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
 					(GDestroyNotify)g_variant_unref);
+			max_probe = 0;
 			for (l = pd->probes; l; l = l->next) {
 				probe = l->data;
+				if (probe->probe > max_probe)
+					max_probe = probe->probe;
 				gvar = g_variant_new_int32(probe->probe);
 				g_variant_ref_sink(gvar);
 				g_hash_table_insert(probes, probe->name, gvar);
 			}
-			if (srd_inst_probe_set_all(di, probes) != SRD_OK)
+			if (srd_inst_probe_set_all(di, probes,
+					(max_probe + 8) / 8) != SRD_OK)
 				return FALSE;
 			g_hash_table_destroy(probes);
 		}
 
-
 		/* If this is not the first decoder in the list, stack it
 		 * on top of the previous one. */
 		if (prev_di) {
@@ -336,10 +407,10 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 		else if (op->type == SRD_OUTPUT_BINARY)
 			l = dec->binary;
 		else
-			/* Only annotations and binary for now. */
+			/* Only annotations and binary can have a class. */
 			return FALSE;
 		idx = 0;
-		while(l) {
+		while (l) {
 			decoder_class = l->data;
 			if (!strcmp(decoder_class[0], op->class)) {
 				op->class_idx = idx;
@@ -352,7 +423,8 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 			ERR("Output class '%s' not found in decoder %s.",
 					op->class, pd->name);
 			return FALSE;
-		}
+		} else
+			DBG("Class %s index is %d", op->class, op->class_idx);
 	}
 
 	sr_session_start();
@@ -388,7 +460,7 @@ int main(int argc, char **argv)
 	pdlist = NULL;
 	opt_infile = NULL;
 	pd = NULL;
-	while((c = getopt(argc, argv, "dP:p:o:i:O:f:S")) != -1) {
+	while ((c = getopt(argc, argv, "dP:p:o:i:O:f:S")) != -1) {
 		switch(c) {
 		case 'd':
 			debug = TRUE;
@@ -491,5 +563,3 @@ int main(int argc, char **argv)
 
 	return ret;
 }
-
-