BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix buffer size, various error checks

This commit is contained in:
Bert Vermeulen 2011-01-08 15:48:39 +01:00
parent 2a3f9541a4
commit d4ae8eaa7c
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
output/output_gnuplot.c
View File

@ -27,15 +27,16 @@
struct context { struct context {
unsigned int num_enabled_probes; unsigned int num_enabled_probes;
unsigned int unitsize; unsigned int unitsize;
char *probelist[65]; char *probelist[MAX_NUM_PROBES+1];
char *header; char *header;
}; };
#define MAX_HEADER_LEN 1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10))
const char *gnuplot_header = "\ const char *gnuplot_header = "\
# Sample data in space-separated columns format usable by gnuplot\n\ # Sample data in space-separated columns format usable by gnuplot\n\
#\n\ #\n\
# Generated by: %s on %s%s\ # Generated by: %s on %s%s\
# Timescale: %d %s\n\ # Period: %s\n\
#\n\ #\n\
# Column\tProbe\n\ # Column\tProbe\n\
# -------------------------------------\ # -------------------------------------\
@ -47,22 +48,24 @@ const char *gnuplot_header_comment = "\
static int init(struct output *o) static int init(struct output *o)
{ {
/* Maximum header length */
#define MAX_HEADER_LEN 2048
struct context *ctx; struct context *ctx;
struct probe *probe; struct probe *probe;
GSList *l; GSList *l;
uint64_t samplerate; uint64_t samplerate;
unsigned int i; unsigned int i;
int b, num_probes; int b, num_probes;
char *c, *samplerate_s; char *c, *frequency_s;
char wbuf[1000], comment[128]; char wbuf[1000], comment[128];
time_t t; time_t t;
if (!(ctx = calloc(1, sizeof(struct context)))) if (!(ctx = calloc(1, sizeof(struct context))))
return SIGROK_ERR_MALLOC; return SIGROK_ERR_MALLOC;
if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
free(ctx);
return SIGROK_ERR_MALLOC;
}
o->internal = ctx; o->internal = ctx;
ctx->num_enabled_probes = 0; ctx->num_enabled_probes = 0;
for (l = o->device->probes; l; l = l->next) { for (l = o->device->probes; l; l = l->next) {
@ -71,32 +74,22 @@ static int init(struct output *o)
continue; continue;
ctx->probelist[ctx->num_enabled_probes++] = probe->name; ctx->probelist[ctx->num_enabled_probes++] = probe->name;
} }
ctx->probelist[ctx->num_enabled_probes] = 0; ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
/* TODO: Allow for configuration via o->param. */
if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
free(ctx);
return SIGROK_ERR_MALLOC;
}
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
/* TODO: Handle num_probes == 0, too many probes, etc. */
comment[0] = '\0'; comment[0] = '\0';
if (o->device->plugin) { if (o->device->plugin) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, DI_CUR_SAMPLERATE)); o->device->plugin_index, DI_CUR_SAMPLERATE));
if (!(samplerate_s = sigrok_samplerate_string(samplerate))) { if (!(frequency_s = sigrok_samplerate_string(samplerate))) {
free(ctx->header); free(ctx->header);
free(ctx); free(ctx);
return SIGROK_ERR; return SIGROK_ERR;
} }
snprintf(comment, 127, gnuplot_header_comment, snprintf(comment, 127, gnuplot_header_comment,
ctx->num_enabled_probes, num_probes, samplerate_s); ctx->num_enabled_probes, num_probes, frequency_s);
free(samplerate_s); free(frequency_s);
} }
/* Columns / channels */ /* Columns / channels */
@ -106,14 +99,22 @@ static int init(struct output *o)
sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]); sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
} }
/* TODO: date: File or signals? Make y/n configurable. */ if (!(frequency_s = sigrok_period_string(samplerate))) {
/* TODO: Timescale */ free(ctx->header);
free(ctx);
return SIGROK_ERR;
}
t = time(NULL); t = time(NULL);
b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header, b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
PACKAGE_STRING, ctime(&t), comment, 1, "ns", PACKAGE_STRING, ctime(&t), comment, frequency_s,
(char *)&wbuf); (char *)&wbuf);
free(frequency_s);
/* TODO: Handle snprintf errors. */ if (b < 0) {
free(ctx->header);
free(ctx);
return SIGROK_ERR;
}
return 0; return 0;
} }
@ -143,19 +144,19 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out) char **data_out, uint64_t *length_out)
{ {
struct context *ctx; struct context *ctx;
unsigned int i, outsize, p, curbit; unsigned int max_linelen, outsize, p, curbit, i;
uint64_t sample; uint64_t sample;
static uint64_t samplecount = 0; static uint64_t samplecount = 0;
char *outbuf, *c; char *outbuf, *c;
ctx = o->internal; ctx = o->internal;
outsize = 0; max_linelen = 16 + ctx->num_enabled_probes * 2;
outsize = length_in / ctx->unitsize * max_linelen;
if (ctx->header) if (ctx->header)
outsize = strlen(ctx->header); outsize += strlen(ctx->header);
/* FIXME: Use realloc(). */ if (!(outbuf = calloc(1, outsize)))
if (!(outbuf = calloc(1, outsize + 1 + 1000000))) return SIGROK_ERR_MALLOC;
return SIGROK_ERR_MALLOC; /* TODO: free()? What to free? */
outbuf[0] = '\0'; outbuf[0] = '\0';
if (ctx->header) { if (ctx->header) {
@ -165,14 +166,12 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
ctx->header = NULL; ctx->header = NULL;
} }
/* TODO: Are disabled probes handled correctly? */
for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) { for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
memcpy(&sample, data_in + i, ctx->unitsize); memcpy(&sample, data_in + i, ctx->unitsize);
/* The first column is a counter (needed for gnuplot). */ /* The first column is a counter (needed for gnuplot). */
c = outbuf + strlen(outbuf); c = outbuf + strlen(outbuf);
sprintf(c, "%" PRIu64 "\t\t", samplecount++); sprintf(c, "%" PRIu64 "\t", samplecount++);
/* The next columns are the values of all channels. */ /* The next columns are the values of all channels. */
for (p = 0; p < ctx->num_enabled_probes; p++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
@ -183,8 +182,6 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
c = outbuf + strlen(outbuf); c = outbuf + strlen(outbuf);
sprintf(c, "\n"); sprintf(c, "\n");
/* TODO: realloc() if strlen(outbuf) is almost "full"... */
} }
*data_out = outbuf; *data_out = outbuf;