X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=27fa262135d757dec7235c89e546bc1d975ae3d0;hp=8b64f49630a608d5d89d93098d973410a26dfc36;hb=6b27bde46ccb02784a327b51b3e7beeb2f9c681a;hpb=029d73fe03db2656ceb2ca0f5a3fea57393fdfda diff --git a/session.c b/session.c index 8b64f49..27fa262 100644 --- a/session.c +++ b/session.c @@ -18,7 +18,6 @@ */ #include "sigrok-cli.h" -#include "config.h" #include #include #include @@ -26,7 +25,6 @@ static struct sr_output_format *output_format = NULL; static int default_output_format = FALSE; -static char *output_format_param = NULL; static uint64_t limit_samples = 0; static uint64_t limit_frames = 0; @@ -84,11 +82,10 @@ static int set_limit_time(const struct sr_dev_inst *sdi) return SR_OK; } -int setup_output_format(void) +struct sr_output *setup_output_format(const struct sr_dev_inst *sdi) { GHashTable *fmtargs; - GHashTableIter iter; - gpointer key, value; + struct sr_output *o; struct sr_output_format **outputs; int i; char *fmtspec; @@ -110,32 +107,22 @@ int setup_output_format(void) fmtargs = parse_generic_arg(opt_output_format, TRUE); fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key"); - if (!fmtspec) { + if (!fmtspec) g_critical("Invalid output format."); - return 1; - } outputs = sr_output_list(); for (i = 0; outputs[i]; i++) { if (strcmp(outputs[i]->id, fmtspec)) continue; g_hash_table_remove(fmtargs, "sigrok_key"); output_format = outputs[i]; - g_hash_table_iter_init(&iter, fmtargs); - while (g_hash_table_iter_next(&iter, &key, &value)) { - /* only supporting one parameter per output module - * for now, and only its value */ - output_format_param = g_strdup(value); - break; - } break; } - if (!output_format) { - g_critical("Invalid output format %s.", opt_output_format); - return 1; - } + if (!output_format) + g_critical("Invalid output format '%s'.", opt_output_format); + o = sr_output_new(output_format, fmtargs, sdi); g_hash_table_destroy(fmtargs); - return 0; + return o; } void datafeed_in(const struct sr_dev_inst *sdi, @@ -154,9 +141,9 @@ void datafeed_in(const struct sr_dev_inst *sdi, static FILE *outfile = NULL; GSList *l; GString *out; + GVariant *gvar; uint64_t end_sample; - uint64_t output_len, input_len; - uint8_t *output_buf; + uint64_t input_len; int i; char **channels; @@ -168,21 +155,8 @@ void datafeed_in(const struct sr_dev_inst *sdi, switch (packet->type) { case SR_DF_HEADER: - g_debug("cli: Received SR_DF_HEADER"); - /* Initialize the output module. */ - if (!(o = g_try_malloc(sizeof(struct sr_output)))) { - g_critical("Output module malloc failed."); - exit(1); - } - o->format = output_format; - o->sdi = (struct sr_dev_inst *)sdi; - o->param = output_format_param; - if (o->format->init) { - if (o->format->init(o) != SR_OK) { - g_critical("Output format initialization failed."); - exit(1); - } - } + g_debug("cli: Received SR_DF_HEADER."); + o = setup_output_format(sdi); /* Prepare non-stdout output. */ outfile = stdout; @@ -197,13 +171,15 @@ void datafeed_in(const struct sr_dev_inst *sdi, } rcvd_samples_logic = rcvd_samples_analog = 0; + if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, + &gvar) == SR_OK) { + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + } + #ifdef HAVE_SRD if (opt_pds) { - GVariant *gvar; - if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, - &gvar) == SR_OK) { - samplerate = g_variant_get_uint64(gvar); - g_variant_unref(gvar); + if (samplerate) { if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)) != SRD_OK) { g_critical("Failed to configure decode session."); @@ -219,14 +195,14 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_DF_META: - g_debug("cli: received SR_DF_META"); + g_debug("cli: Received SR_DF_META."); meta = packet->payload; for (l = meta->config; l; l = l->next) { src = l->data; switch (src->key) { case SR_CONF_SAMPLERATE: samplerate = g_variant_get_uint64(src->data); - g_debug("cli: got samplerate %"PRIu64" Hz", samplerate); + g_debug("cli: Got samplerate %"PRIu64" Hz.", samplerate); #ifdef HAVE_SRD if (opt_pds) { if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE, @@ -238,7 +214,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_CONF_SAMPLE_INTERVAL: samplerate = g_variant_get_uint64(src->data); - g_debug("cli: got sample interval %"PRIu64" ms", samplerate); + g_debug("cli: Got sample interval %"PRIu64" ms.", samplerate); break; default: /* Unknown metadata is not an error. */ @@ -248,16 +224,14 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_DF_TRIGGER: - g_debug("cli: received SR_DF_TRIGGER"); - if (o->format->event) - o->format->event(o, SR_DF_TRIGGER, &output_buf, - &output_len); + g_debug("cli: Received SR_DF_TRIGGER."); triggered = 1; break; case SR_DF_LOGIC: logic = packet->payload; - g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length); + g_message("cli: Received SR_DF_LOGIC (%"PRIu64" bytes, unitsize = %d).", + logic->length, logic->unitsize); if (logic->length == 0) break; @@ -297,16 +271,6 @@ void datafeed_in(const struct sr_dev_inst *sdi, logic->data, input_len) != SRD_OK) sr_session_stop(); #endif - } else { - output_len = 0; - if (o->format->data && packet->type == o->format->df_type) - o->format->data(o, logic->data, input_len, - &output_buf, &output_len); - if (output_len) { - fwrite(output_buf, 1, output_len, outfile); - fflush(outfile); - g_free(output_buf); - } } } @@ -315,59 +279,30 @@ void datafeed_in(const struct sr_dev_inst *sdi, case SR_DF_ANALOG: analog = packet->payload; - g_message("cli: received SR_DF_ANALOG, %d samples", analog->num_samples); + g_message("cli: Received SR_DF_ANALOG (%d samples).", analog->num_samples); if (analog->num_samples == 0) break; if (limit_samples && rcvd_samples_analog >= limit_samples) break; - if (o->format->data && packet->type == o->format->df_type) { - o->format->data(o, (const uint8_t *)analog->data, - analog->num_samples * sizeof(float), - &output_buf, &output_len); - if (output_buf) { - fwrite(output_buf, 1, output_len, outfile); - fflush(outfile); - g_free(output_buf); - } - } - rcvd_samples_analog += analog->num_samples; break; case SR_DF_FRAME_BEGIN: - g_debug("cli: received SR_DF_FRAME_BEGIN"); - if (o->format->event) { - o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf, - &output_len); - if (output_buf) { - fwrite(output_buf, 1, output_len, outfile); - fflush(outfile); - g_free(output_buf); - } - } + g_debug("cli: Received SR_DF_FRAME_BEGIN."); break; case SR_DF_FRAME_END: - g_debug("cli: received SR_DF_FRAME_END"); - if (o->format->event) { - o->format->event(o, SR_DF_FRAME_END, &output_buf, - &output_len); - if (output_buf) { - fwrite(output_buf, 1, output_len, outfile); - fflush(outfile); - g_free(output_buf); - } - } + g_debug("cli: Received SR_DF_FRAME_END."); break; default: break; } - if (o && o->format->receive) { - if (o->format->receive(o, sdi, packet, &out) == SR_OK && out) { + if (o && outfile && !opt_pds) { + if (sr_output_send(o, packet, &out) == SR_OK && out) { fwrite(out->str, 1, out->len, outfile); fflush(outfile); g_string_free(out, TRUE); @@ -377,21 +312,10 @@ void datafeed_in(const struct sr_dev_inst *sdi, /* SR_DF_END needs to be handled after the output module's receive() * is called, so it can properly clean up that module. */ if (packet->type == SR_DF_END) { - g_debug("cli: Received SR_DF_END"); - - if (o->format->event) { - o->format->event(o, SR_DF_END, &output_buf, &output_len); - if (output_buf) { - if (outfile) - fwrite(output_buf, 1, output_len, outfile); - g_free(output_buf); - output_len = 0; - } - } + g_debug("cli: Received SR_DF_END."); - if (o->format->cleanup) - o->format->cleanup(o); - g_free(o); + if (o) + sr_output_free(o); o = NULL; if (outfile && outfile != stdout) @@ -448,7 +372,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) break; src->data = g_variant_new_int32(tmp_u64); break; - case SR_T_CHAR: + case SR_T_STRING: src->data = g_variant_new_string(value); break; case SR_T_BOOL: @@ -533,8 +457,6 @@ void run_session(void) GVariant *gvar; struct sr_dev_inst *sdi; uint64_t min_samples, max_samples; - int max_channels, i; - char **triggerlist; devices = device_scan(); if (!devices) { @@ -576,18 +498,10 @@ void run_session(void) } if (opt_triggers) { - if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) { + if (!parse_triggerstring(sdi, opt_triggers)) { sr_session_destroy(); return; } - max_channels = g_slist_length(sdi->channels); - for (i = 0; i < max_channels; i++) { - if (triggerlist[i]) { - sr_dev_trigger_set(sdi, i, triggerlist[i]); - g_free(triggerlist[i]); - } - } - g_free(triggerlist); } if (opt_continuous) { @@ -685,7 +599,7 @@ void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize) (buf_len + max) / unitsize); memcpy(buf, data + max, data_len - max); buf_len = data_len - max; - } else if (data_len == 0) { + } else if (data_len == 0 && last_unitsize != 0) { /* End of data, flush the buffer out. */ sr_session_append(opt_output_file, buf, last_unitsize, buf_len / last_unitsize);