X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=dfa91eb78b39f8a8db1638cba7409bf497684572;hb=50959ddcdc455c930397fbc9f85c3a745ff45fda;hp=1b6d78c278cb340cf0b1b5fba8107fa1783dc4bd;hpb=d494a4aa9dcbd90126d86757d16fa3e0f0a419f3;p=libsigrok.git diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c index 1b6d78c2..dfa91eb7 100644 --- a/output/output_gnuplot.c +++ b/output/output_gnuplot.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "config.h" struct context { @@ -60,10 +61,30 @@ static int init(struct sr_output *o) char wbuf[1000], comment[128]; time_t t; - if (!(ctx = calloc(1, sizeof(struct context)))) + if (!o) { + sr_warn("gnuplot out: %s: o was NULL", __func__); + return SR_ERR_ARG; + } + + if (!o->device) { + sr_warn("gnuplot out: %s: o->device was NULL", __func__); + return SR_ERR_ARG; + } + + if (!o->device->plugin) { + sr_warn("gnuplot out: %s: o->device->plugin was NULL", + __func__); + return SR_ERR_ARG; + } + + if (!(ctx = calloc(1, sizeof(struct context)))) { + sr_warn("gnuplot out: %s: ctx calloc failed", __func__); return SR_ERR_MALLOC; + } if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) { + sr_warn("gnuplot out: %s: ctx->header calloc failed", + __func__); free(ctx); return SR_ERR_MALLOC; } @@ -71,7 +92,7 @@ static int init(struct sr_output *o) o->internal = ctx; ctx->num_enabled_probes = 0; for (l = o->device->probes; l; l = l->next) { - probe = l->data; + probe = l->data; /* TODO: Error checks. */ if (!probe->enabled) continue; ctx->probelist[ctx->num_enabled_probes++] = probe->name; @@ -81,10 +102,12 @@ static int init(struct sr_output *o) num_probes = g_slist_length(o->device->probes); comment[0] = '\0'; - if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { + if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { samplerate = *((uint64_t *) o->device->plugin->get_device_info( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); if (!(frequency_s = sr_samplerate_string(samplerate))) { + sr_warn("gnuplot out: %s: sr_samplerate_string failed", + __func__); free(ctx->header); free(ctx); return SR_ERR; @@ -102,10 +125,12 @@ static int init(struct sr_output *o) } if (!(frequency_s = sr_period_string(samplerate))) { + sr_warn("gnuplot out: %s: sr_period_string failed", __func__); free(ctx->header); free(ctx); return SR_ERR; } + t = time(NULL); b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header, PACKAGE_STRING, ctime(&t), comment, frequency_s, @@ -113,6 +138,7 @@ static int init(struct sr_output *o) free(frequency_s); if (b < 0) { + sr_warn("gnuplot out: %s: sprintf failed", __func__); free(ctx->header); free(ctx); return SR_ERR; @@ -126,15 +152,35 @@ static int event(struct sr_output *o, int event_type, char **data_out, { struct context *ctx; + if (!o) { + sr_warn("gnuplot out: %s: o was NULL", __func__); + return SR_ERR_ARG; + } + + if (!data_out) { + sr_warn("gnuplot out: %s: data_out was NULL", __func__); + return SR_ERR_ARG; + } + + if (!length_out) { + sr_warn("gnuplot out: %s: length_out was NULL", __func__); + return SR_ERR_ARG; + } + ctx = o->internal; + switch (event_type) { case SR_DF_TRIGGER: - /* TODO: can a trigger mark be in a gnuplot data file? */ + /* TODO: Can a trigger mark be in a gnuplot data file? */ break; case SR_DF_END: free(o->internal); o->internal = NULL; break; + default: + sr_warn("gnuplot out: %s: unsupported event type: %d", + __func__, event_type); + break; } *data_out = NULL; @@ -149,17 +195,44 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in, struct context *ctx; unsigned int max_linelen, outsize, p, curbit, i; uint64_t sample; - static uint64_t samplecount = 0; + static uint64_t samplecount = 0, old_sample = 0; char *outbuf, *c; + if (!o) { + sr_warn("gnuplot out: %s: o was NULL", __func__); + return SR_ERR_ARG; + } + + if (!o->internal) { + sr_warn("gnuplot out: %s: o->internal was NULL", __func__); + return SR_ERR_ARG; + } + + if (!data_in) { + sr_warn("gnuplot out: %s: data_in was NULL", __func__); + return SR_ERR_ARG; + } + + if (!data_out) { + sr_warn("gnuplot out: %s: data_out was NULL", __func__); + return SR_ERR_ARG; + } + + if (!length_out) { + sr_warn("gnuplot out: %s: length_out was NULL", __func__); + return SR_ERR_ARG; + } + ctx = o->internal; max_linelen = 16 + ctx->num_enabled_probes * 2; outsize = length_in / ctx->unitsize * max_linelen; if (ctx->header) outsize += strlen(ctx->header); - if (!(outbuf = calloc(1, outsize))) + if (!(outbuf = calloc(1, outsize))) { + sr_warn("gnuplot out: %s: outbuf calloc failed", __func__); return SR_ERR_MALLOC; + } outbuf[0] = '\0'; if (ctx->header) { @@ -170,8 +243,19 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in, } for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) { + memcpy(&sample, data_in + i, ctx->unitsize); + /* + * Don't output the same samples multiple times. However, make + * sure to output at least the first and last sample. + */ + if (samplecount++ != 0 && sample == old_sample) { + if (i != (length_in - ctx->unitsize)) + continue; + } + old_sample = sample; + /* The first column is a counter (needed for gnuplot). */ c = outbuf + strlen(outbuf); sprintf(c, "%" PRIu64 "\t", samplecount++); @@ -194,7 +278,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in, } struct sr_output_format output_gnuplot = { - .extension = "gnuplot", + .id = "gnuplot", .description = "Gnuplot", .df_type = SR_DF_LOGIC, .init = init, @@ -340,7 +424,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in, } struct sr_output_format output_analog_gnuplot = { - .extension = "analog_gnuplot", + .id = "analog_gnuplot", .description = "Gnuplot analog", .df_type = SR_DF_ANALOG, .init = analog_init,