input: Add sr_input_end().

[libsigrok.git] / src / input / csv.c

diff --git a/src/input/csv.c b/src/input/csv.c
index ab0830db55ebe86bc79ddad1e684410df5da277f..9af17be0700ab66cec76c91a676218a890263225 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -138,9 +138,9 @@ static int format_match(GHashTable *metadata)
 
        buf = g_hash_table_lookup(metadata, GINT_TO_POINTER(SR_INPUT_META_MIMETYPE));
        if (!strcmp(buf, "text/csv"))
-               return TRUE;
+               return SR_OK;
 
-       return FALSE;
+       return SR_ERR;
 }
 
 static void strip_comment(char *buf, const GString *prefix)
@@ -393,7 +393,7 @@ static int init(struct sr_input *in, GHashTable *options)
        struct context *inc;
        const char *s;
 
-       in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+       in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
        in->priv = inc = g_malloc0(sizeof(struct context));
 
        inc->single_column = g_variant_get_int32(g_hash_table_lookup(options, "single-column"));
@@ -429,11 +429,7 @@ static int init(struct sr_input *in, GHashTable *options)
                g_string_truncate(inc->comment, 0);
        }
 
-       s = g_variant_get_string(g_hash_table_lookup(options, "samplerate"), NULL);
-       if (sr_parse_sizestring(s, &inc->samplerate) != SR_OK) {
-               sr_err("Invalid samplerate '%s'.", s);
-               return SR_ERR_ARG;
-       }
+       inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
 
        inc->first_channel = g_variant_get_int32(g_hash_table_lookup(options, "first-channel"));
 
@@ -593,11 +589,11 @@ static int initial_receive(const struct sr_input *in)
 
        if (!(termination = get_line_termination(in->buf)))
                /* Don't have a full line yet. */
-               return SR_OK_CONTINUE;
+               return SR_ERR_NA;
 
        if (!(p = g_strrstr_len(in->buf->str, in->buf->len, termination)))
                /* Don't have a full line yet. */
-               return SR_OK_CONTINUE;
+               return SR_ERR_NA;
        len = p - in->buf->str - 1;
        new_buf = g_string_new_len(in->buf->str, len);
        g_string_append_c(new_buf, '\0');
@@ -614,7 +610,7 @@ static int initial_receive(const struct sr_input *in)
        return ret;
 }
 
-static int receive(const struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_meta meta;
@@ -625,18 +621,8 @@ static int receive(const struct sr_input *in, GString *buf)
        int max_columns, ret, l;
        char *p, **lines, **columns;
 
-       g_string_append_len(in->buf, buf->str, buf->len);
-
        inc = in->priv;
-       if (!inc->termination) {
-               ret = initial_receive(in);
-               if (ret == SR_OK_CONTINUE)
-                       /* Not enough data yet. */
-                       return SR_OK_CONTINUE;
-               else if (ret != SR_OK)
-                       return SR_ERR;
-
-               inc->started = TRUE;
+       if (!inc->started) {
                std_session_send_df_header(in->sdi, LOG_PREFIX);
 
                if (inc->samplerate) {
@@ -648,6 +634,8 @@ static int receive(const struct sr_input *in, GString *buf)
                        sr_session_send(in->sdi, &packet);
                        sr_config_free(src);
                }
+
+               inc->started = TRUE;
        }
 
        if (!(p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination)))
@@ -721,24 +709,61 @@ static int receive(const struct sr_input *in, GString *buf)
        g_strfreev(lines);
        g_string_erase(in->buf, 0, p - in->buf->str + 1);
 
-       return SR_OK;
+       return ret;
 }
 
-static int cleanup(struct sr_input *in)
+static int receive(struct sr_input *in, GString *buf)
 {
        struct context *inc;
-       struct sr_datafeed_packet packet;
+       int ret;
+
+       g_string_append_len(in->buf, buf->str, buf->len);
 
        inc = in->priv;
-       if (!inc)
+       if (!inc->termination) {
+               if ((ret = initial_receive(in)) == SR_ERR_NA)
+                       /* Not enough data yet. */
+                       return SR_OK;
+               else if (ret != SR_OK)
+                       return SR_ERR;
+
+               /* sdi is ready, notify frontend. */
+               in->sdi_ready = TRUE;
                return SR_OK;
+       }
+
+       ret = process_buffer(in);
+
+       return ret;
+}
+
+static int end(struct sr_input *in)
+{
+       struct context *inc;
+       struct sr_datafeed_packet packet;
+       int ret;
+
+       if (in->sdi_ready)
+               ret = process_buffer(in);
+       else
+               ret = SR_OK;
 
+       inc = in->priv;
        if (inc->started) {
                /* End of stream. */
                packet.type = SR_DF_END;
                sr_session_send(in->sdi, &packet);
        }
 
+       return ret;
+}
+
+static int cleanup(struct sr_input *in)
+{
+       struct context *inc;
+
+       inc = in->priv;
+
        if (inc->delimiter)
                g_string_free(inc->delimiter, TRUE);
 
@@ -751,9 +776,6 @@ static int cleanup(struct sr_input *in)
        if (inc->sample_buffer)
                g_free(inc->sample_buffer);
 
-       g_free(inc);
-       in->priv = NULL;
-
        return SR_OK;
 }
 
@@ -778,7 +800,7 @@ static struct sr_option *get_options(void)
                options[2].def = g_variant_ref_sink(g_variant_new_string(","));
                options[3].def = g_variant_ref_sink(g_variant_new_string("bin"));
                options[4].def = g_variant_ref_sink(g_variant_new_string(";"));
-               options[5].def = g_variant_ref_sink(g_variant_new_string("0"));
+               options[5].def = g_variant_ref_sink(g_variant_new_uint64(0));
                options[6].def = g_variant_ref_sink(g_variant_new_int32(0));
                options[7].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
                options[8].def = g_variant_ref_sink(g_variant_new_int32(1));
@@ -796,5 +818,6 @@ SR_PRIV struct sr_input_module input_csv = {
        .format_match = format_match,
        .init = init,
        .receive = receive,
+       .end = end,
        .cleanup = cleanup,
 };