X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=tests%2Fruntc.c;h=75bfff4ff4931fb3fcfb10a4809a344edfdf2edb;hp=af1e3fba961129a3641a4aaa220ad89130ecc779;hb=d841d5b26f2134143fc80c9898522d13387b7cc8;hpb=7023cb9faa3d212b2ba6a0c2f59f93ced0afa547 diff --git a/tests/runtc.c b/tests/runtc.c index af1e3fb..75bfff4 100644 --- a/tests/runtc.c +++ b/tests/runtc.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include "../libsigrokdecode.h" #include #include @@ -35,25 +36,25 @@ #ifdef __LINUX__ #include #endif -#include "../config.h" +#include "config.h" int debug = FALSE; int statistics = FALSE; char *coverage_report; -struct probe { +struct channel { char *name; - int probe; + int channel; }; struct option { char *key; - char *value; + GVariant *value; }; struct pd { char *name; - GSList *probes; + GSList *channels; GSList *options; }; @@ -73,13 +74,11 @@ struct cvg { GSList *missed_lines; }; - struct cvg *get_mod_cov(PyObject *py_cov, char *module_name); void cvg_add(struct cvg *dst, struct cvg *src); struct cvg *cvg_new(void); gboolean find_missed_line(struct cvg *cvg, char *linespec); - static void logmsg(char *prefix, FILE *out, const char *format, va_list args) { if (prefix) @@ -140,8 +139,8 @@ static void usage(char *msg) printf("Usage: runtc [-dPpoiOf]\n"); printf(" -d Debug\n"); printf(" -P \n"); - printf(" -p (optional)\n"); - printf(" -o (optional)\n"); + printf(" -p (optional)\n"); + printf(" -o (optional)\n"); printf(" -i \n"); printf(" -O \n"); printf(" -f (optional)\n"); @@ -189,9 +188,9 @@ static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data) s = py_str_as_str(pyrepr); Py_DecRef(pyrepr); - /* Output format for testing is '- : \n' */ + /* Output format for testing is '- : \n'. */ out = g_string_sized_new(128); - g_string_printf(out, "%"PRIu64"-%"PRIu64" %s: %s\n", + g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s: %s\n", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id, s); g_free(s); @@ -225,7 +224,7 @@ static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data) return; out = g_string_sized_new(128); - g_string_printf(out, "%"PRIu64"-%"PRIu64" %s:", + g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s:", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id); for (i = 0; i < pdb->size; i++) { @@ -263,7 +262,7 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data) dec_ann = g_slist_nth_data(dec->annotations, pda->ann_format); line = g_string_sized_new(256); - g_string_printf(line, "%"PRIu64"-%"PRIu64" %s: %s:", + g_string_printf(line, "%" PRIu64 "-%" PRIu64 " %s: %s:", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id, dec_ann[0]); for (i = 0; pda->ann_text[i]; i++) @@ -327,16 +326,17 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) struct srd_session *sess; struct srd_decoder *dec; struct srd_decoder_inst *di, *prev_di; - srd_pd_output_callback_t cb; + srd_pd_output_callback cb; struct pd *pd; - struct probe *probe; + struct channel *channel; struct option *option; GVariant *gvar; - GHashTable *probes, *opts; + GHashTable *channels, *opts; GSList *pdl, *l; int idx; - int max_probe; + int max_channel; char **decoder_class; + struct sr_session *sr_sess; if (op->outfile) { if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) { @@ -346,12 +346,12 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) } } - if (sr_session_load(infile) != SR_OK) + if (sr_session_load(infile, &sr_sess) != SR_OK) return FALSE; if (srd_session_new(&sess) != SRD_OK) return FALSE; - sr_session_datafeed_callback_add(sr_cb, sess); + sr_session_datafeed_callback_add(sr_sess, sr_cb, sess); switch (op->type) { case SRD_OUTPUT_ANN: cb = srd_cb_ann; @@ -385,23 +385,23 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) return FALSE; g_hash_table_destroy(opts); - /* Map probes. */ - if (pd->probes) { - probes = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, + /* Map channels. */ + if (pd->channels) { + channels = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)g_variant_unref); - max_probe = 0; - for (l = pd->probes; l; l = l->next) { - probe = l->data; - if (probe->probe > max_probe) - max_probe = probe->probe; - gvar = g_variant_new_int32(probe->probe); + max_channel = 0; + for (l = pd->channels; l; l = l->next) { + channel = l->data; + if (channel->channel > max_channel) + max_channel = channel->channel; + gvar = g_variant_new_int32(channel->channel); g_variant_ref_sink(gvar); - g_hash_table_insert(probes, probe->name, gvar); + g_hash_table_insert(channels, channel->name, gvar); } - if (srd_inst_probe_set_all(di, probes, - (max_probe + 8) / 8) != SRD_OK) + if (srd_inst_channel_set_all(di, channels, + (max_channel + 8) / 8) != SRD_OK) return FALSE; - g_hash_table_destroy(probes); + g_hash_table_destroy(channels); } /* If this is not the first decoder in the list, stack it @@ -443,9 +443,9 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) DBG("Class %s index is %d", op->class, op->class_idx); } - sr_session_start(); - sr_session_run(); - sr_session_stop(); + sr_session_start(sr_sess); + sr_session_run(sr_sess); + sr_session_stop(sr_sess); srd_session_destroy(sess); @@ -556,7 +556,7 @@ struct cvg *get_mod_cov(PyObject *py_cov, char *module_name) cvg_mod->coverage = 100 - ((float)cvg_mod->num_missed / (float)cvg_mod->num_lines * 100); Py_DecRef(py_mod); - Py_DecRef(py_path); + Py_DecRef(py_path); return cvg_mod; } @@ -586,7 +586,6 @@ void cvg_add(struct cvg *dst, struct cvg *src) GSList *l; char *linespec; - dst->num_lines += src->num_lines; dst->num_missed += src->num_missed; for (l = src->missed_lines; l; l = l->next) { @@ -638,7 +637,6 @@ static int report_coverage(PyObject *py_cov, GSList *pdlist) printf("coverage: scope=all coverage=%.0f%% lines=%d missed=%d\n", total_coverage, cvg_all->num_lines, cvg_all->num_missed); - /* Write text report to file. */ /* io.open(coverage_report, "w") */ if (!(py_mod = PyImport_ImportModule("io"))) @@ -685,11 +683,11 @@ int main(int argc, char **argv) PyObject *coverage; GSList *pdlist; struct pd *pd; - struct probe *probe; + struct channel *channel; struct option *option; struct output *op; - int ret; - char c, *opt_infile, **kv, **opstr; + int ret, c; + char *opt_infile, **kv, **opstr; op = malloc(sizeof(struct output)); op->pd = NULL; @@ -703,14 +701,14 @@ int main(int argc, char **argv) pd = NULL; coverage = NULL; while ((c = getopt(argc, argv, "dP:p:o:i:O:f:c:S")) != -1) { - switch(c) { + switch (c) { case 'd': debug = TRUE; break; case 'P': pd = g_malloc(sizeof(struct pd)); pd->name = g_strdup(optarg); - pd->probes = pd->options = NULL; + pd->channels = pd->options = NULL; pdlist = g_slist_append(pdlist, pd); break; case 'p': @@ -728,15 +726,16 @@ int main(int argc, char **argv) usage(NULL); } if (c == 'p') { - probe = malloc(sizeof(struct probe)); - probe->name = g_strdup(kv[0]); - probe->probe = strtoul(kv[1], 0, 10); + channel = malloc(sizeof(struct channel)); + channel->name = g_strdup(kv[0]); + channel->channel = strtoul(kv[1], 0, 10); /* Apply to last PD. */ - pd->probes = g_slist_append(pd->probes, probe); + pd->channels = g_slist_append(pd->channels, channel); } else { option = malloc(sizeof(struct option)); option->key = g_strdup(kv[0]); - option->value = g_strdup(kv[1]); + option->value = g_variant_new_string(kv[1]); + g_variant_ref_sink(option->value); /* Apply to last PD. */ pd->options = g_slist_append(pd->options, option); } @@ -759,6 +758,9 @@ int main(int argc, char **argv) op->type = SRD_OUTPUT_BINARY; else if (!strcmp(opstr[1], "python")) op->type = SRD_OUTPUT_PYTHON; + else if (!strcmp(opstr[1], "exception")) + /* Doesn't matter, we just need it to bomb out. */ + op->type = SRD_OUTPUT_PYTHON; else { ERR("Unknown output type '%s'", opstr[1]); g_strfreev(opstr);