#include "libsigrok.h"
#include "libsigrok-internal.h"
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/gnuplot: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "output/gnuplot: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
struct context {
unsigned int num_enabled_probes;
unsigned int unitsize;
- char *probelist[SR_MAX_NUM_PROBES + 1];
char *header;
+ uint8_t *old_sample;
};
-#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\
GVariant *gvar;
uint64_t samplerate;
unsigned int i;
- int b, num_probes;
+ int num_probes;
char *c, *frequency_s;
char wbuf[1000], comment[128];
time_t t;
return SR_ERR_ARG;
}
- if (!o->sdi->driver) {
- sr_err("%s: o->sdi->driver was NULL", __func__);
- return SR_ERR_ARG;
- }
-
if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
sr_err("%s: ctx malloc failed", __func__);
return SR_ERR_MALLOC;
}
- if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
- sr_err("%s: ctx->header malloc failed", __func__);
- g_free(ctx);
- return SR_ERR_MALLOC;
- }
-
o->internal = ctx;
ctx->num_enabled_probes = 0;
for (l = o->sdi->probes; l; l = l->next) {
probe = l->data;
- if (!probe->enabled)
- continue;
- ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+ if (probe->enabled)
+ ctx->num_enabled_probes++;
}
- ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
num_probes = g_slist_length(o->sdi->probes);
comment[0] = '\0';
samplerate = 0;
- if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
- o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+ if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar) == SR_OK) {
samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
if (!(frequency_s = sr_samplerate_string(samplerate))) {
sr_err("%s: sr_samplerate_string failed", __func__);
- g_free(ctx->header);
g_free(ctx);
- g_variant_unref(gvar);
return SR_ERR;
}
snprintf(comment, 127, gnuplot_header_comment,
ctx->num_enabled_probes, num_probes, frequency_s);
g_free(frequency_s);
- g_variant_unref(gvar);
}
/* Columns / channels */
wbuf[0] = '\0';
- for (i = 0; i < ctx->num_enabled_probes; i++) {
+ for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
+ probe = l->data;
+ if (!probe->enabled)
+ continue;
c = (char *)&wbuf + strlen((const char *)&wbuf);
- sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
+ sprintf(c, "# %d\t\t%s\n", i + 1, probe->name);
}
if (!(frequency_s = sr_period_string(samplerate))) {
sr_err("%s: sr_period_string failed", __func__);
- g_free(ctx->header);
g_free(ctx);
return SR_ERR;
}
t = time(NULL);
- b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
- PACKAGE_STRING, ctime(&t), comment, frequency_s,
- (char *)&wbuf);
+ ctx->header = g_strdup_printf(gnuplot_header, PACKAGE_STRING,
+ ctime(&t), comment, frequency_s, (char *)&wbuf);
g_free(frequency_s);
- if (b < 0) {
- sr_err("%s: sprintf failed", __func__);
+ if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) {
+ sr_err("%s: ctx->old_sample malloc failed", __func__);
g_free(ctx->header);
g_free(ctx);
- return SR_ERR;
+ return SR_ERR_MALLOC;
}
return 0;
{
struct context *ctx;
unsigned int max_linelen, outsize, p, curbit, i;
- uint64_t sample;
- static uint64_t samplecount = 0, old_sample = 0;
+ const uint8_t *sample;
+ static uint64_t samplecount = 0;
uint8_t *outbuf, *c;
if (!o) {
for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
- memcpy(&sample, data_in + i, ctx->unitsize);
+ sample = data_in + i;
/*
* 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 (samplecount++ != 0 &&
+ !memcmp(sample, ctx->old_sample, ctx->unitsize)) {
if (i != (length_in - ctx->unitsize))
continue;
}
- old_sample = sample;
+ memcpy(ctx->old_sample, sample, ctx->unitsize);
/* The first column is a counter (needed for gnuplot). */
c = outbuf + strlen((const char *)outbuf);
/* The next columns are the values of all channels. */
for (p = 0; p < ctx->num_enabled_probes; p++) {
- curbit = (sample & ((uint64_t) (1 << p))) >> p;
+ curbit = (sample[p / 8] & ((uint8_t) (1 << (p % 8)))) >> (p % 8);
c = outbuf + strlen((const char *)outbuf);
sprintf((char *)c, "%d ", curbit);
}
projects / libsigrok.git / blobdiff