X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fgnuplot.c;h=a9feec67ba056f2f55daeed75990fca6eb1619e9;hb=8f8289dc1dc4532d33cda04141c8080f6dda00f5;hp=2800d55aeb92d2261736b535ea5b7808d2659df3;hpb=3f239f0803b9fbc073dd7abe9fc7b2a0c606fbb6;p=libsigrok.git

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 2800d55a..a9feec67 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -29,53 +29,32 @@
 
 struct context {
 	unsigned int num_enabled_channels;
-	unsigned int unitsize;
-	char *header;
-	uint8_t *old_sample;
+	uint64_t samplerate;
+	uint64_t samplecount;
+	gboolean header_done;
+	uint8_t *prevsample;
+	int *channel_index;
 };
 
 static const char *gnuplot_header = "\
-# Sample data in space-separated columns format usable by gnuplot\n\
-#\n\
-# Generated by: %s on %s%s\
-# Period: %s\n\
-#\n\
-# Column\tChannel\n\
-# -------------------------------------\
-----------------------------------------\n\
-# 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
-
-static const char *gnuplot_header_comment = "\
-# Comment: Acquisition with %d/%d channels at %s\n";
+# Sample data in space-separated columns format usable by gnuplot.\n";
+static const char *gnuplot_header2 = "\
+#\n# Column\tChannel\n\
+# -----------------------------------------------------------------------------\n\
+# 0\t\tSample counter (for internal gnuplot purposes)\n";
+
 
 static int init(struct sr_output *o)
 {
 	struct context *ctx;
 	struct sr_channel *ch;
 	GSList *l;
-	GVariant *gvar;
-	uint64_t samplerate;
 	unsigned int i;
-	int num_channels;
-	char *c, *frequency_s;
-	char wbuf[1000], comment[128];
-	time_t t;
 
-	if (!o) {
-		sr_err("%s: o was NULL", __func__);
+	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	}
-
-	if (!o->sdi) {
-		sr_err("%s: o->sdi was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
-		sr_err("%s: ctx malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
 
+	ctx = g_malloc0(sizeof(struct context));
 	o->internal = ctx;
 	ctx->num_enabled_channels = 0;
 	for (l = o->sdi->channels; l; l = l->next) {
@@ -87,184 +66,151 @@ static int init(struct sr_output *o)
 		ctx->num_enabled_channels++;
 	}
 	if (ctx->num_enabled_channels <= 0) {
-		sr_err("%s: no logic channel enabled", __func__);
+		sr_err("No logic channel enabled.");
 		return SR_ERR;
 	}
+	ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
 
-	ctx->unitsize = (ctx->num_enabled_channels + 7) / 8;
-
-	num_channels = g_slist_length(o->sdi->channels);
-	comment[0] = '\0';
-	samplerate = 0;
-	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
-			&gvar) == SR_OK) {
-		samplerate = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
-		if (!(frequency_s = sr_samplerate_string(samplerate))) {
-			sr_err("%s: sr_samplerate_string failed", __func__);
-			g_free(ctx);
-			return SR_ERR;
-		}
-		snprintf(comment, 127, gnuplot_header_comment,
-			ctx->num_enabled_channels, num_channels, frequency_s);
-		g_free(frequency_s);
-	}
-
-	/* Columns / channels */
-	wbuf[0] = '\0';
-	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+	/* Once more to map the enabled channels. */
+	for (i = 0, l = o->sdi->channels; l; l = l->next) {
 		ch = l->data;
 		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
 		if (!ch->enabled)
 			continue;
-		c = (char *)&wbuf + strlen((const char *)&wbuf);
-		sprintf(c, "# %d\t\t%s\n", i + 1, ch->name);
+		ctx->channel_index[i++] = ch->index;
 	}
 
-	if (!(frequency_s = sr_period_string(samplerate))) {
-		sr_err("%s: sr_period_string failed", __func__);
-		g_free(ctx);
-		return SR_ERR;
-	}
-
-	t = time(NULL);
-	ctx->header = g_strdup_printf(gnuplot_header, PACKAGE_STRING,
-			ctime(&t), comment, frequency_s, (char *)&wbuf);
-	g_free(frequency_s);
-
-	if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) {
-		sr_err("%s: ctx->old_sample malloc failed", __func__);
-		g_free(ctx->header);
-		g_free(ctx);
-		return SR_ERR_MALLOC;
-	}
-
-	return 0;
+	return SR_OK;
 }
 
-static int event(struct sr_output *o, int event_type, uint8_t **data_out,
-		 uint64_t *length_out)
+static GString *gen_header(struct sr_output *o)
 {
-	if (!o) {
-		sr_err("%s: o was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	struct context *ctx;
+	struct sr_channel *ch;
+	GVariant *gvar;
+	GString *header;
+	time_t t;
+	unsigned int num_channels, i;
+	char *samplerate_s;
 
-	if (!data_out) {
-		sr_err("%s: data_out was NULL", __func__);
-		return SR_ERR_ARG;
+	ctx = o->internal;
+	if (ctx->samplerate == 0) {
+		if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+				&gvar) == SR_OK) {
+			ctx->samplerate = g_variant_get_uint64(gvar);
+			g_variant_unref(gvar);
+		}
 	}
 
-	if (!length_out) {
-		sr_err("%s: length_out was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	t = time(NULL);
+	header = g_string_sized_new(512);
+	g_string_printf(header, "%s", gnuplot_header);
+	g_string_append_printf(header, "# Generated by %s on %s",
+			PACKAGE_STRING, ctime(&t));
 
-	switch (event_type) {
-	case SR_DF_TRIGGER:
-		/* TODO: Can a trigger mark be in a gnuplot data file? */
-		break;
-	case SR_DF_END:
-		g_free(o->internal);
-		o->internal = NULL;
-		break;
-	default:
-		sr_err("%s: unsupported event type: %d", __func__, event_type);
-		break;
+	num_channels = g_slist_length(o->sdi->channels);
+	g_string_append_printf(header, "# Acquisition with %d/%d channels",
+			ctx->num_enabled_channels, num_channels);
+	if (ctx->samplerate != 0) {
+		samplerate_s = sr_samplerate_string(ctx->samplerate);
+		g_string_append_printf(header, " at %s", samplerate_s);
+		g_free(samplerate_s);
 	}
+	g_string_append_printf(header, "\n");
 
-	*data_out = NULL;
-	*length_out = 0;
+	g_string_append_printf(header, "%s", gnuplot_header2);
 
-	return SR_OK;
+	/* Columns / channels */
+	for (i = 0; i < ctx->num_enabled_channels; i++) {
+		ch = g_slist_nth_data(o->sdi->channels, ctx->channel_index[i]);
+		g_string_append_printf(header, "# %d\t\t%s\n", i + 1, ch->name);
+	}
+
+	return header;
 }
 
-static int data(struct sr_output *o, const uint8_t *data_in,
-		uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+		GString **out)
 {
+	const struct sr_datafeed_meta *meta;
+	const struct sr_datafeed_logic *logic;
+	const struct sr_config *src;
+	GSList *l;
 	struct context *ctx;
-	unsigned int max_linelen, outsize, p, curbit, i;
 	const uint8_t *sample;
-	static uint64_t samplecount = 0;
-	uint8_t *outbuf, *c;
+	unsigned int curbit, p, idx, i;
 
-	if (!o) {
-		sr_err("%s: o was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!o->internal) {
-		sr_err("%s: o->internal was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!data_in) {
-		sr_err("%s: data_in was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	*out = NULL;
+	if (!o || !o->internal)
+		return SR_ERR_BUG;
+	ctx = o->internal;
 
-	if (!data_out) {
-		sr_err("%s: data_out was NULL", __func__);
-		return SR_ERR_ARG;
+	if (packet->type == SR_DF_META) {
+		meta = packet->payload;
+		for (l = meta->config; l; l = l->next) {
+			src = l->data;
+			if (src->key != SR_CONF_SAMPLERATE)
+				continue;
+			ctx->samplerate = g_variant_get_uint64(src->data);
+		}
 	}
 
-	if (!length_out) {
-		sr_err("%s: length_out was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	if (packet->type != SR_DF_LOGIC)
+		return SR_OK;
+	logic = packet->payload;
 
-	ctx = o->internal;
-	max_linelen = 16 + ctx->num_enabled_channels * 2;
-	outsize = length_in / ctx->unitsize * max_linelen;
-	if (ctx->header)
-		outsize += strlen(ctx->header);
-
-	if (!(outbuf = g_try_malloc0(outsize))) {
-		sr_err("%s: outbuf malloc failed", __func__);
-		return SR_ERR_MALLOC;
+	if (!ctx->prevsample) {
+		/* Can't allocate this until we know the stream's unitsize. */
+		ctx->prevsample = g_malloc0(logic->unitsize);
 	}
 
-	outbuf[0] = '\0';
-	if (ctx->header) {
-		/* The header is still here, this must be the first packet. */
-		strncpy((char *)outbuf, ctx->header, outsize);
-		g_free(ctx->header);
-		ctx->header = NULL;
+	if (!ctx->header_done) {
+		*out = gen_header(o);
+		ctx->header_done = TRUE;
+	} else {
+		*out = g_string_sized_new(512);
 	}
 
-	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
-
-		sample = data_in + i;
+	for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
+		sample = logic->data + i;
+		ctx->samplecount++;
 
 		/*
-		 * Don't output the same samples multiple times. However, make
+		 * Don't output the same sample multiple times, but make
 		 * sure to output at least the first and last sample.
 		 */
-		if (samplecount++ != 0 &&
-				!memcmp(sample, ctx->old_sample, ctx->unitsize)) {
-			if (i != (length_in - ctx->unitsize))
+		if (i > 0 && i < logic->length - logic->unitsize) {
+			if (!memcmp(sample, ctx->prevsample, logic->unitsize))
 				continue;
 		}
-		memcpy(ctx->old_sample, sample, ctx->unitsize);
+		memcpy(ctx->prevsample, sample, logic->unitsize);
 
 		/* The first column is a counter (needed for gnuplot). */
-		c = outbuf + strlen((const char *)outbuf);
-		sprintf((char *)c, "%" PRIu64 "\t", samplecount++);
+		g_string_append_printf(*out, "%" PRIu64 "\t", ctx->samplecount);
 
 		/* The next columns are the values of all channels. */
 		for (p = 0; p < ctx->num_enabled_channels; p++) {
-			curbit = (sample[p / 8] & ((uint8_t) (1 << (p % 8)))) >> (p % 8);
-			c = outbuf + strlen((const char *)outbuf);
-			sprintf((char *)c, "%d ", curbit);
+			idx = ctx->channel_index[p];
+			curbit = (sample[idx / 8] & ((uint8_t) (1 << (idx % 8)))) >> (idx % 8);
+			g_string_append_printf(*out, "%d ", curbit);
 		}
-
-		c = outbuf + strlen((const char *)outbuf);
-		sprintf((char *)c, "\n");
+		g_string_append_printf(*out, "\n");
 	}
 
-	*data_out = outbuf;
-	*length_out = strlen((const char *)outbuf);
+	return SR_OK;
+}
+
+static int cleanup(struct sr_output *o)
+{
+	struct context *ctx;
+
+	if (!o || !o->internal)
+		return SR_ERR_BUG;
+	ctx = o->internal;
+	g_free(ctx->channel_index);
+	g_free(ctx->prevsample);
+	g_free(ctx);
 
 	return SR_OK;
 }
@@ -272,8 +218,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 SR_PRIV struct sr_output_format output_gnuplot = {
 	.id = "gnuplot",
 	.description = "Gnuplot",
-	.df_type = SR_DF_LOGIC,
 	.init = init,
-	.data = data,
-	.event = event,
+	.receive = receive,
+	.cleanup = cleanup,
 };