output/ascii: style nits in name alignment and trigger flush

[libsigrok.git] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 3962fe9d80215fcde193e5556d78c3ab70f3ded1..7b3f878155594c58eb31cdf62a6e8da7abb4c2f6 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -39,12 +39,12 @@
 struct context {
        unsigned int num_enabled_channels;
        int spl;
-       int bit_cnt;
        int spl_cnt;
        int trigger;
        uint64_t samplerate;
        int *channel_index;
-       char **channel_names;
+       char **aligned_names;
+       int max_namelen;
        char **line_values;
        uint8_t *prev_sample;
        gboolean header_done;
@@ -59,7 +59,7 @@ static int init(struct sr_output *o, GHashTable *options)
        struct context *ctx;
        struct sr_channel *ch;
        GSList *l;
-       unsigned int i, j;
+       unsigned int j, max_namelen, alloc_line_len;
 
        if (!o || !o->sdi)
                return SR_ERR_ARG;
@@ -84,22 +84,38 @@ static int init(struct sr_output *o, GHashTable *options)
                        continue;
                ctx->num_enabled_channels++;
        }
-       ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
-       ctx->channel_names = g_malloc(sizeof(char *) * ctx->num_enabled_channels);
-       ctx->lines = g_malloc(sizeof(GString *) * ctx->num_enabled_channels);
-       ctx->prev_sample = g_malloc(g_slist_length(o->sdi->channels));
+       ctx->channel_index = g_malloc0(sizeof(ctx->channel_index[0]) * ctx->num_enabled_channels);
+       ctx->aligned_names = g_malloc0(sizeof(ctx->aligned_names[0]) * ctx->num_enabled_channels);
+       ctx->lines = g_malloc0(sizeof(ctx->lines[0]) * ctx->num_enabled_channels);
+       ctx->prev_sample = g_malloc0(g_slist_length(o->sdi->channels));
 
+       /* Get the maximum length across all active logic channels. */
+       max_namelen = 0;
+       for (l = o->sdi->channels; l; l = l->next) {
+               ch = l->data;
+               if (ch->type != SR_CHANNEL_LOGIC)
+                       continue;
+               if (!ch->enabled)
+                       continue;
+               max_namelen = MAX(max_namelen, strlen(ch->name));
+       }
+       ctx->max_namelen = max_namelen;
+
+       alloc_line_len = ctx->max_namelen + 8 + ctx->spl;
        j = 0;
-       for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+       for (l = o->sdi->channels; l; l = l->next) {
                ch = l->data;
                if (ch->type != SR_CHANNEL_LOGIC)
                        continue;
                if (!ch->enabled)
                        continue;
+
                ctx->channel_index[j] = ch->index;
-               ctx->channel_names[j] = ch->name;
-               ctx->lines[j] = g_string_sized_new(80);
-               g_string_printf(ctx->lines[j], "%s:", ch->name);
+               ctx->aligned_names[j] = g_strdup_printf("%*s", max_namelen, ch->name);
+
+               ctx->lines[j] = g_string_sized_new(alloc_line_len);
+               g_string_printf(ctx->lines[j], "%s:", ctx->aligned_names[j]);
+
                j++;
        }
 
@@ -124,7 +140,7 @@ static GString *gen_header(const struct sr_output *o)
        }
 
        header = g_string_sized_new(512);
-       g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+       g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
        num_channels = g_slist_length(o->sdi->channels);
        g_string_append_printf(header, "Acquisition with %d/%d channels",
                        ctx->num_enabled_channels, num_channels);
@@ -138,6 +154,26 @@ static GString *gen_header(const struct sr_output *o)
        return header;
 }
 
+static void maybe_add_trigger(struct context *ctx, GString *out)
+{
+       int offset;
+
+       if (ctx->trigger <= -1)
+               return;
+       offset = ctx->trigger;
+       ctx->trigger = -1;
+
+       /*
+        * Sample data lines have one character per bit and
+        * no separator between bytes. Align trigger marker
+        * to this layout.
+        */
+       g_string_append_printf(out, "%*s:%*s %d\n",
+               ctx->max_namelen, "T",
+               offset + 1, "^", offset);
+}
+
+
 static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
                GString **out)
 {
@@ -146,7 +182,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        const struct sr_config *src;
        GSList *l;
        struct context *ctx;
-       int idx, offset, curbit, prevbit;
+       int idx, curbit, prevbit;
        uint64_t i, j;
        gchar *p, c;
        size_t charidx;
@@ -174,8 +210,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                if (!ctx->header_done) {
                        *out = gen_header(o);
                        ctx->header_done = TRUE;
-               } else
+               } else {
                        *out = g_string_sized_new(512);
+               }
 
                logic = packet->payload;
                for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
@@ -198,18 +235,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                                        /* Flush line buffers. */
                                        g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
                                        g_string_append_c(*out, '\n');
-                                       if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
-                                               /*
-                                                * Each group of 8 bits occupies 8 bit positions
-                                                * and no separator. With this dense presentation
-                                                * the "calculation" of the trigger position is
-                                                * rather straight forward.
-                                                */
-                                               offset = ctx->trigger;
-                                               g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
-                                               ctx->trigger = -1;
-                                       }
-                                       g_string_printf(ctx->lines[j], "%s:", ctx->channel_names[j]);
+                                       if (j == ctx->num_enabled_channels - 1)
+                                               maybe_add_trigger(ctx, *out);
+                                       g_string_printf(ctx->lines[j], "%s:", ctx->aligned_names[j]);
                                }
                        }
                        if (ctx->spl_cnt == ctx->spl)
@@ -226,6 +254,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                                g_string_append_len(*out, ctx->lines[i]->str, ctx->lines[i]->len);
                                g_string_append_c(*out, '\n');
                        }
+                       maybe_add_trigger(ctx, *out);
                }
                break;
        }
@@ -246,9 +275,11 @@ static int cleanup(struct sr_output *o)
 
        g_free(ctx->channel_index);
        g_free(ctx->prev_sample);
-       g_free(ctx->channel_names);
-       for (i = 0; i < ctx->num_enabled_channels; i++)
+       for (i = 0; i < ctx->num_enabled_channels; i++) {
+               g_free(ctx->aligned_names[i]);
                g_string_free(ctx->lines[i], TRUE);
+       }
+       g_free(ctx->aligned_names);
        g_free(ctx->lines);
        g_free((gpointer)ctx->charset);
        g_free(ctx);