X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=dfa91eb78b39f8a8db1638cba7409bf497684572;hb=f36cbf60cbd43be46ede083265549068db21f4b6;hp=05da1e1aa9fc36e8666d5a7f5782db02880a5e14;hpb=ff35879bb7374a430ef89633df273288d42d4988;p=libsigrok.git diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c index 05da1e1a..dfa91eb7 100644 --- a/output/output_gnuplot.c +++ b/output/output_gnuplot.c @@ -22,17 +22,20 @@ #include #include #include +#include #include "config.h" struct context { unsigned int num_enabled_probes; unsigned int unitsize; - char *probelist[MAX_NUM_PROBES+1]; + char *probelist[SR_MAX_NUM_PROBES + 1]; char *header; }; -#define MAX_HEADER_LEN 1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10)) -const char *gnuplot_header = "\ +#define MAX_HEADER_LEN \ + (1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10))) + +static const char *gnuplot_header = "\ # Sample data in space-separated columns format usable by gnuplot\n\ #\n\ # Generated by: %s on %s%s\ @@ -43,13 +46,13 @@ const char *gnuplot_header = "\ ----------------------------------------\n\ # 0\t\tSample counter (for internal gnuplot purposes)\n%s\n"; -const char *gnuplot_header_comment = "\ +static const char *gnuplot_header_comment = "\ # Comment: Acquisition with %d/%d probes at %s\n"; -static int init(struct output *o) +static int init(struct sr_output *o) { struct context *ctx; - struct probe *probe; + struct sr_probe *probe; GSList *l; uint64_t samplerate; unsigned int i; @@ -58,18 +61,38 @@ static int init(struct output *o) char wbuf[1000], comment[128]; time_t t; - if (!(ctx = calloc(1, sizeof(struct context)))) - return SIGROK_ERR_MALLOC; + 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 SIGROK_ERR_MALLOC; + return SR_ERR_MALLOC; } 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; @@ -79,13 +102,15 @@ static int init(struct output *o) num_probes = g_slist_length(o->device->probes); comment[0] = '\0'; - if (o->device->plugin) { + if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { samplerate = *((uint64_t *) o->device->plugin->get_device_info( - o->device->plugin_index, DI_CUR_SAMPLERATE)); - if (!(frequency_s = sigrok_samplerate_string(samplerate))) { + 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 SIGROK_ERR; + return SR_ERR; } snprintf(comment, 127, gnuplot_header_comment, ctx->num_enabled_probes, num_probes, frequency_s); @@ -99,11 +124,13 @@ static int init(struct output *o) sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]); } - if (!(frequency_s = sigrok_period_string(samplerate))) { + if (!(frequency_s = sr_period_string(samplerate))) { + sr_warn("gnuplot out: %s: sr_period_string failed", __func__); free(ctx->header); free(ctx); - return SIGROK_ERR; + return SR_ERR; } + t = time(NULL); b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header, PACKAGE_STRING, ctime(&t), comment, frequency_s, @@ -111,53 +138,101 @@ static int init(struct output *o) free(frequency_s); if (b < 0) { + sr_warn("gnuplot out: %s: sprintf failed", __func__); free(ctx->header); free(ctx); - return SIGROK_ERR; + return SR_ERR; } return 0; } -static int event(struct output *o, int event_type, char **data_out, +static int event(struct sr_output *o, int event_type, char **data_out, uint64_t *length_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 DF_TRIGGER: - /* TODO: can a trigger mark be in a gnuplot data file? */ + case SR_DF_TRIGGER: + /* TODO: Can a trigger mark be in a gnuplot data file? */ break; - case DF_END: + 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; *length_out = 0; - return SIGROK_OK; + return SR_OK; } -static int data(struct output *o, char *data_in, uint64_t length_in, +static int data(struct sr_output *o, const char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out) { 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))) - return SIGROK_ERR_MALLOC; + if (!(outbuf = calloc(1, outsize))) { + sr_warn("gnuplot out: %s: outbuf calloc failed", __func__); + return SR_ERR_MALLOC; + } outbuf[0] = '\0'; if (ctx->header) { @@ -168,8 +243,19 @@ static int data(struct output *o, 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++); @@ -188,13 +274,24 @@ static int data(struct output *o, char *data_in, uint64_t length_in, *data_out = outbuf; *length_out = strlen(outbuf); - return SIGROK_OK; + return SR_OK; } -static int analog_init(struct output *o) +struct sr_output_format output_gnuplot = { + .id = "gnuplot", + .description = "Gnuplot", + .df_type = SR_DF_LOGIC, + .init = init, + .data = data, + .event = event, +}; + +/* Temporarily disabled. */ +#if 0 +static int analog_init(struct sr_output *o) { struct context *ctx; - struct probe *probe; + struct sr_probe *probe; GSList *l; uint64_t samplerate; unsigned int i; @@ -204,11 +301,11 @@ static int analog_init(struct output *o) time_t t; if (!(ctx = calloc(1, sizeof(struct context)))) - return SIGROK_ERR_MALLOC; + return SR_ERR_MALLOC; if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) { free(ctx); - return SIGROK_ERR_MALLOC; + return SR_ERR_MALLOC; } o->internal = ctx; @@ -221,18 +318,18 @@ static int analog_init(struct output *o) } ctx->probelist[ctx->num_enabled_probes] = 0; // ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; - ctx->unitsize = sizeof(struct analog_sample) + - (ctx->num_enabled_probes * sizeof(struct analog_probe)); + ctx->unitsize = sizeof(struct sr_analog_sample) + + (ctx->num_enabled_probes * sizeof(struct sr_analog_probe)); num_probes = g_slist_length(o->device->probes); comment[0] = '\0'; - if (o->device->plugin) { + if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { samplerate = *((uint64_t *) o->device->plugin->get_device_info( - o->device->plugin_index, DI_CUR_SAMPLERATE)); - if (!(frequency_s = sigrok_samplerate_string(samplerate))) { + o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); + if (!(frequency_s = sr_samplerate_string(samplerate))) { free(ctx->header); free(ctx); - return SIGROK_ERR; + return SR_ERR; } snprintf(comment, 127, gnuplot_header_comment, ctx->num_enabled_probes, num_probes, frequency_s); @@ -246,10 +343,10 @@ static int analog_init(struct output *o) sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]); } - if (!(frequency_s = sigrok_period_string(samplerate))) { + if (!(frequency_s = sr_period_string(samplerate))) { free(ctx->header); free(ctx); - return SIGROK_ERR; + return SR_ERR; } t = time(NULL); b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header, @@ -260,13 +357,13 @@ static int analog_init(struct output *o) if (b < 0) { free(ctx->header); free(ctx); - return SIGROK_ERR; + return SR_ERR; } return 0; } -static int analog_data(struct output *o, char *data_in, uint64_t length_in, +static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out) { struct context *ctx; @@ -274,7 +371,7 @@ static int analog_data(struct output *o, char *data_in, uint64_t length_in, // uint64_t sample; static uint64_t samplecount = 0; char *outbuf, *c; - struct analog_sample *sample; + struct sr_analog_sample *sample; ctx = o->internal; // max_linelen = 16 + ctx->num_enabled_probes * 2; @@ -284,7 +381,7 @@ static int analog_data(struct output *o, char *data_in, uint64_t length_in, outsize += strlen(ctx->header); if (!(outbuf = calloc(1, outsize))) - return SIGROK_ERR_MALLOC; + return SR_ERR_MALLOC; outbuf[0] = '\0'; if (ctx->header) { @@ -296,7 +393,7 @@ static int analog_data(struct output *o, 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); - sample = (struct analog_sample *) (data_in + i); + sample = (struct sr_analog_sample *) (data_in + i); /* The first column is a counter (needed for gnuplot). */ c = outbuf + strlen(outbuf); @@ -323,23 +420,15 @@ static int analog_data(struct output *o, char *data_in, uint64_t length_in, *data_out = outbuf; *length_out = strlen(outbuf); - return SIGROK_OK; + return SR_OK; } -struct output_format output_gnuplot = { - "gnuplot", - "Gnuplot", - DF_LOGIC, - init, - data, - event, -}; - -struct output_format output_analog_gnuplot = { - "analog_gnuplot", - "Gnuplot analog", - DF_ANALOG, - analog_init, - analog_data, - event, +struct sr_output_format output_analog_gnuplot = { + .id = "analog_gnuplot", + .description = "Gnuplot analog", + .df_type = SR_DF_ANALOG, + .init = analog_init, + .data = analog_data, + .event = event, }; +#endif