VCD: Optimizations and fixes.

[libsigrok.git] / output / output_gnuplot.c

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index a0d5a8fcb6835d55d345797208d716427edf5f80..69a45256c432b4eb3b0bd2891e24a8134e843bd4 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -36,7 +36,11 @@ const char *gnuplot_header = "\
 #\n\
 # Generated by: %s on %s%s\
 # Timescale: %d %s\n\
-# Column assignment:\n%s\n";
+#\n\
+# Column\tProbe\n\
+# -------------------------------------\
+----------------------------------------\n\
+# 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
 
 const char *gnuplot_header_comment = "\
 # Comment: Acquisition with %d/%d probes at %s\n";
@@ -98,7 +102,7 @@ static int init(struct output *o)
        wbuf[0] = '\0';
        for (i = 0; i < ctx->num_enabled_probes; i++) {
                c = (char *)&wbuf + strlen((char *)&wbuf);
-               sprintf(c, "# Column %d: channel %s\n", i, ctx->probelist[i]);
+               sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
        }
 
        /* TODO: date: File or signals? Make y/n configurable. */
@@ -117,8 +121,6 @@ static int event(struct output *o, int event_type, char **data_out,
                 uint64_t *length_out)
 {
        struct context *ctx;
-       char *outbuf;
-       int outlen = 1; /* FIXME */
 
        ctx = o->internal;
        switch (event_type) {
@@ -126,11 +128,8 @@ static int event(struct output *o, int event_type, char **data_out,
                /* TODO */
                break;
        case DF_END:
-               outbuf = calloc(1, 1); /* FIXME */
-               if (outbuf == NULL)
-                       return SIGROK_ERR_MALLOC;
-               *data_out = outbuf;
-               *length_out = outlen;
+               *data_out = NULL;
+               *length_out = 0;
                free(o->internal);
                o->internal = NULL;
                break;
@@ -144,7 +143,8 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 {
        struct context *ctx;
        unsigned int i, outsize, p, curbit;
-       uint64_t sample, count = 0;
+       uint64_t sample;
+       static uint64_t samplecount = 0;
        char *outbuf, *c;
 
        ctx = o->internal;
@@ -153,7 +153,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
                outsize = strlen(ctx->header);
 
        /* FIXME: Use realloc(). */
-       if (!(outbuf = calloc(1, outsize + 1 + 10000)))
+       if (!(outbuf = calloc(1, outsize + 1 + 1000000)))
                return SIGROK_ERR_MALLOC; /* TODO: free()? What to free? */
 
        outbuf[0] = '\0';
@@ -171,11 +171,11 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 
                /* The first column is a counter (needed for gnuplot). */
                c = outbuf + strlen(outbuf);
-               sprintf(c, "%" PRIu64 "\t\t", count++);
+               sprintf(c, "%" PRIu64 "\t\t", samplecount++);
 
                /* The next columns are the values of all channels. */
                for (p = 0; p < ctx->num_enabled_probes; p++) {
-                       curbit = (sample & ((uint64_t) (1 << p))) != 0;
+                       curbit = (sample & ((uint64_t) (1 << p))) >> p;
                        c = outbuf + strlen(outbuf);
                        sprintf(c, "%d ", curbit);
                }