X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=tests%2Fruntc.c;h=9ba51f4a4ca8f4453f78e3aca70d812bd87e6236;hp=f0649f9d727b5d6a209c620f78d3d61a3bc463e5;hb=919ace16e7100fccd51fda16c6d40fc3ad9915e2;hpb=6b85745afe65ebd2722921bf23e91fa4573f4302 diff --git a/tests/runtc.c b/tests/runtc.c index f0649f9..9ba51f4 100644 --- a/tests/runtc.c +++ b/tests/runtc.c @@ -123,7 +123,6 @@ void usage(char *msg) if (msg) fprintf(stderr, "%s\n", msg); - //while((c = getopt(argc, argv, "dP:p:o:i:O:f:S")) != -1) { printf("Usage: runtc [-dPpoiOf]\n"); printf(" -d Debug\n"); printf(" -P \n"); @@ -136,6 +135,93 @@ void usage(char *msg) } +/* This is a neutered version of libsigrokdecode's py_str_as_str(). It + * does no error checking, but then the only strings it processes are + * generated by Python's repr(), so are known good. */ +char *py_str_as_str(const PyObject *py_str) +{ + PyObject *py_encstr; + char *str, *outstr; + + py_encstr = PyUnicode_AsEncodedString((PyObject *)py_str, "utf-8", NULL); + str = PyBytes_AS_STRING(py_encstr); + outstr = g_strdup(str); + Py_DecRef(py_encstr); + + return outstr; +} + +static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data) +{ + struct output *op; + PyObject *pydata, *pyrepr; + GString *out; + char *s; + + DBG("Python output from %s", pdata->pdo->di->inst_id); + op = cb_data; + pydata = pdata->data; + DBG("ptr %p", pydata); + + if (strcmp(pdata->pdo->di->inst_id, op->pd)) + /* This is not the PD selected for output. */ + return; + + if (!(pyrepr = PyObject_Repr(pydata))) { + ERR("Invalid Python object."); + return; + } + s = py_str_as_str(pyrepr); + Py_DecRef(pyrepr); + + /* Output format for testing is '- : \n' */ + out = g_string_sized_new(128); + g_string_printf(out, "%"PRIu64"-%"PRIu64" %s: %s\n", + pdata->start_sample, pdata->end_sample, + pdata->pdo->di->inst_id, s); + g_free(s); + if (write(op->outfd, out->str, out->len) == -1) + ERR("SRD_OUTPUT_PYTHON callback write failure!"); + DBG("wrote '%s'", out->str); + g_string_free(out, TRUE); + +} + +static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data) +{ + struct srd_proto_data_binary *pdb; + struct output *op; + GString *out; + unsigned int i; + + DBG("Binary output from %s", pdata->pdo->di->inst_id); + op = cb_data; + pdb = pdata->data; + + if (strcmp(pdata->pdo->di->inst_id, op->pd)) + /* This is not the PD selected for output. */ + return; + + if (op->class_idx != -1 && op->class_idx != pdb->bin_class) + /* + * This output takes a specific binary class, + * but not the one that just came in. + */ + return; + + out = g_string_sized_new(128); + 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++) { + g_string_append_printf(out, " %.2x", pdb->data[i]); + } + g_string_append(out, "\n"); + if (write(op->outfd, out->str, out->len) == -1) + ERR("SRD_OUTPUT_BINARY callback write failure!"); + +} + static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data) { struct srd_decoder *dec; @@ -145,18 +231,19 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data) int i; char **dec_ann; - DBG("Annotation from %s", pdata->pdo->di->inst_id); + DBG("Annotation output from %s", pdata->pdo->di->inst_id); op = cb_data; pda = pdata->data; dec = pdata->pdo->di->decoder; - if (strcmp(pdata->pdo->di->inst_id, op->pd)) /* This is not the PD selected for output. */ return; if (op->class_idx != -1 && op->class_idx != pda->ann_format) - /* This output takes a specific annotation class, - * but not the one that just came in. */ + /* + * This output takes a specific annotation class, + * but not the one that just came in. + */ return; dec_ann = g_slist_nth_data(dec->annotations, pda->ann_format); @@ -168,7 +255,7 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data) g_string_append_printf(line, " \"%s\"", pda->ann_text[i]); g_string_append(line, "\n"); if (write(op->outfd, line->str, line->len) == -1) - ERR("Oops!"); + ERR("SRD_OUTPUT_ANN callback write failure!"); g_string_free(line, TRUE); } @@ -220,44 +307,12 @@ static void sr_cb(const struct sr_dev_inst *sdi, } -int get_stats(int stats[2]) -{ - FILE *f; - size_t len; - int tmp; - char *buf; - - stats[0] = stats[1] = -1; - if (!(f = fopen("/proc/self/status", "r"))) - return FALSE; - len = 128; - buf = malloc(len); - while (getline(&buf, &len, f) != -1) { - if (strcasestr(buf, "vmpeak:")) { - stats[0] = strtoul(buf + 10, NULL, 10); - } else if (strcasestr(buf, "vmsize:")) { - tmp = strtoul(buf + 10, NULL, 10); - if (tmp > stats[0]) - stats[0] = tmp; - } else if (strcasestr(buf, "vmhwm:")) { - stats[1] = strtoul(buf + 6, NULL, 10); - } else if (strcasestr(buf, "vmrss:")) { - tmp = strtoul(buf + 10, NULL, 10); - if (tmp > stats[0]) - stats[0] = tmp; - } - } - free(buf); - fclose(f); - - return TRUE; -} - 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; struct pd *pd; struct probe *probe; struct option *option; @@ -281,7 +336,20 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) if (srd_session_new(&sess) != SRD_OK) return FALSE; sr_session_datafeed_callback_add(sr_cb, sess); - srd_pd_output_callback_add(sess, SRD_OUTPUT_ANN, srd_cb_ann, op); + switch (op->type) { + case SRD_OUTPUT_ANN: + cb = srd_cb_ann; + break; + case SRD_OUTPUT_BINARY: + cb = srd_cb_bin; + break; + case SRD_OUTPUT_PYTHON: + cb = srd_cb_py; + break; + default: + return FALSE; + } + srd_pd_output_callback_add(sess, op->type, cb, op); prev_di = NULL; pd = NULL; @@ -316,7 +384,6 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) g_hash_table_destroy(probes); } - /* If this is not the first decoder in the list, stack it * on top of the previous one. */ if (prev_di) { @@ -336,7 +403,7 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) else if (op->type == SRD_OUTPUT_BINARY) l = dec->binary; else - /* Only annotations and binary for now. */ + /* Only annotations and binary can have a class. */ return FALSE; idx = 0; while(l) { @@ -352,7 +419,8 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op) ERR("Output class '%s' not found in decoder %s.", op->class, pd->name); return FALSE; - } + } else + DBG("Class %s index is %d", op->class, op->class_idx); } sr_session_start();