X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=b706124121dcff48ff2185b9c4057dea033dc08c;hp=21a6e0195c914aa4de97d29aab92454284dece53;hb=3b24e3781a0374ce2d66f1d3de59a5a5d10d657a;hpb=f9b54a6ca92f1d1532237db0439fc772789f3718 diff --git a/decode.c b/decode.c index 21a6e01..b706124 100644 --- a/decode.c +++ b/decode.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include #include #include -#include /* Re-define some string functions for Python >= 3.0. */ #if PY_VERSION_HEX >= 0x03000000 @@ -32,7 +32,7 @@ #endif /* The list of protocol decoders. */ -GSList *list_pds = NULL; +static GSList *list_pds = NULL; /* * Here's a quick overview of Python/C API reference counting. @@ -47,25 +47,48 @@ GSList *list_pds = NULL; * Py_XDECREF()ing it (someone else will do it for you at some point). */ -static int sigrokdecode_load_decoder(const char *name, - struct sigrokdecode_decoder **dec); +static int srd_load_decoder(const char *name, struct srd_decoder **dec); + +static int _unitsize = 1; + +static PyObject* +emb_put(PyObject *self, PyObject *args) +{ + PyObject *arg; + + if (!PyArg_ParseTuple(args, "O:put", &arg)) + return NULL; + + fprintf(stderr, "sigrok.put() called by decoder:\n", arg); + PyObject_Print(arg, stdout, Py_PRINT_RAW); + + Py_RETURN_NONE; +} + +static PyMethodDef EmbMethods[] = { + {"put", emb_put, METH_VARARGS, + "Accepts a dictionary with the following keys: time, duration, data"}, + {NULL, NULL, 0, NULL} +}; /** * Initialize libsigrokdecode. * - * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. */ -int sigrokdecode_init(void) +int srd_init(void) { DIR *dir; struct dirent *dp; char *decodername; - struct sigrokdecode_decoder *dec; + struct srd_decoder *dec; int ret; /* Py_Initialize() returns void and usually cannot fail. */ Py_Initialize(); + Py_InitModule("sigrok", EmbMethods); + /* Add search directory for the protocol decoders. */ /* FIXME: Check error code. */ /* FIXME: What happens if this function is called multiple times? */ @@ -73,7 +96,7 @@ int sigrokdecode_init(void) "sys.path.append(r'" DECODERS_DIR "');"); if (!(dir = opendir(DECODERS_DIR))) - return SIGROKDECODE_ERR_DECODERS_DIR; + return SRD_ERR_DECODERS_DIR; while ((dp = readdir(dir)) != NULL) { if (!g_str_has_suffix(dp->d_name, ".py")) @@ -83,17 +106,19 @@ int sigrokdecode_init(void) decodername = g_strndup(dp->d_name, strlen(dp->d_name) - 3); /* TODO: Error handling. */ - dec = malloc(sizeof(struct sigrokdecode_decoder)); + dec = malloc(sizeof(struct srd_decoder)); /* Load the decoder. */ - ret = sigrokdecode_load_decoder(decodername, &dec); - - /* Append it to the list of supported/loaded decoders. */ - list_pds = g_slist_append(list_pds, dec); + ret = srd_load_decoder(decodername, &dec); + if (!ret) + { + /* Append it to the list of supported/loaded decoders. */ + list_pds = g_slist_append(list_pds, dec); + } } closedir(dir); - return SIGROKDECODE_OK; + return SRD_OK; } /** @@ -103,7 +128,7 @@ int sigrokdecode_init(void) * * @return List of decoders, NULL if none are supported or loaded. */ -GSList *sigrokdecode_list_decoders(void) +GSList *srd_list_decoders(void) { return list_pds; } @@ -114,12 +139,12 @@ GSList *sigrokdecode_list_decoders(void) * @param id The ID string of the decoder to return. * @return The decoder with the specified ID, or NULL if not found. */ -struct sigrokdecode_decoder *sigrokdecode_get_decoder_by_id(const char *id) +struct srd_decoder *srd_get_decoder_by_id(const char *id) { GSList *l; - struct sigrokdecode_decoder *dec; + struct srd_decoder *dec; - for (l = sigrokdecode_list_decoders(); l; l = l->next) { + for (l = srd_list_decoders(); l; l = l->next) { dec = l->data; if (!strcmp(dec->id, id)) return dec; @@ -133,10 +158,10 @@ struct sigrokdecode_decoder *sigrokdecode_get_decoder_by_id(const char *id) * * TODO: @param entries. * - * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. * The 'outstr' argument points to a malloc()ed string upon success. */ -static int h_str(PyObject *py_res, PyObject *py_func, PyObject *py_mod, +static int h_str(PyObject *py_res, PyObject *py_mod, const char *key, char **outstr) { PyObject *py_str; @@ -145,8 +170,8 @@ static int h_str(PyObject *py_res, PyObject *py_func, PyObject *py_mod, py_str = PyMapping_GetItemString(py_res, (char *)key); if (!py_str || !PyString_Check(py_str)) { - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ - goto err_h_decref_func; + ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ + goto err_h_decref_mod; } /* @@ -155,23 +180,22 @@ static int h_str(PyObject *py_res, PyObject *py_func, PyObject *py_mod, * must not be free()'d. */ if (!(str = PyString_AsString(py_str))) { - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ goto err_h_decref_str; } if (!(*outstr = g_strdup(str))) { - ret = SIGROKDECODE_ERR_MALLOC; + ret = SRD_ERR_MALLOC; goto err_h_decref_str; } Py_XDECREF(py_str); - return SIGROKDECODE_OK; + return SRD_OK; err_h_decref_str: Py_XDECREF(py_str); -err_h_decref_func: - Py_XDECREF(py_func); +err_h_decref_mod: Py_XDECREF(py_mod); if (PyErr_Occurred()) @@ -185,65 +209,144 @@ err_h_decref_func: * * @param name TODO * - * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. */ -static int sigrokdecode_load_decoder(const char *name, - struct sigrokdecode_decoder **dec) +static int srd_load_decoder(const char *name, + struct srd_decoder **dec) { - struct sigrokdecode_decoder *d; - PyObject *py_mod, *py_func, *py_res /* , *py_tuple */; + struct srd_decoder *d; + PyObject *py_mod, *py_func, *py_res, *py_instance = NULL, *py_args, *py_value/* , *py_tuple */; int r; + fprintf(stdout, "\n%s\n", name); /* "Import" the Python module. */ if (!(py_mod = PyImport_ImportModule(name))) { /* NEWREF */ PyErr_Print(); /* Returns void. */ - return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + return SRD_ERR_PYTHON; /* TODO: More specific error? */ } - /* Get the 'register' function name as Python callable object. */ - py_func = PyObject_GetAttrString(py_mod, "register"); /* NEWREF */ - if (!py_func || !PyCallable_Check(py_func)) { + /* Get the 'register' dictionary as Python object. */ + py_res = PyObject_GetAttrString(py_mod, "register"); /* NEWREF */ + if (!py_res || PyCallable_Check(py_res)) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ Py_XDECREF(py_mod); - return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + fprintf(stderr, "register dictionary was not found or is declared a function.\n"); + return SRD_ERR_PYTHON; /* TODO: More specific error? */ } - /* Call the 'register' function without arguments, get the result. */ - if (!(py_res = PyObject_CallFunction(py_func, NULL))) { /* NEWREF */ - PyErr_Print(); /* Returns void. */ - Py_XDECREF(py_func); - Py_XDECREF(py_mod); - return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ - } - if (!(d = malloc(sizeof(struct sigrokdecode_decoder)))) - return SIGROKDECODE_ERR_MALLOC; + if (!(d = malloc(sizeof(struct srd_decoder)))) + return SRD_ERR_MALLOC; + + if ((r = h_str(py_res, py_mod, "id", &(d->id))) < 0) + return r; + + if ((r = h_str(py_res, py_mod, "name", &(d->name))) < 0) + return r; + + if ((r = h_str(py_res, py_mod, "longname", + &(d->longname))) < 0) + return r; + + if ((r = h_str(py_res, py_mod, "desc", &(d->desc))) < 0) + return r; + + if ((r = h_str(py_res, py_mod, "longdesc", + &(d->longdesc))) < 0) + return r; - if ((r = h_str(py_res, py_func, py_mod, "id", &(d->id))) < 0) + if ((r = h_str(py_res, py_mod, "author", &(d->author))) < 0) return r; - if ((r = h_str(py_res, py_func, py_mod, "name", &(d->name))) < 0) + if ((r = h_str(py_res, py_mod, "email", &(d->email))) < 0) return r; - if ((r = h_str(py_res, py_func, py_mod, "desc", &(d->desc))) < 0) + if ((r = h_str(py_res, py_mod, "license", &(d->license))) < 0) return r; d->py_mod = py_mod; Py_XDECREF(py_res); - Py_XDECREF(py_func); - - /* Get the 'decode' function name as Python callable object. */ - py_func = PyObject_GetAttrString(py_mod, "decode"); /* NEWREF */ - if (!py_func || !PyCallable_Check(py_func)) { + + + /* Get the 'Decoder' class as Python object. */ + py_res = PyObject_GetAttrString(py_mod, "Decoder"); /* NEWREF */ + if (!py_res) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ - Py_XDECREF(py_mod); - return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + //Py_XDECREF(py_mod); + fprintf(stderr, "Decoder class not found in PD module %s\n", name); + //return SRD_ERR_PYTHON; /* TODO: More specific error? */ + + + /* Get the 'decode' function name as Python callable object. */ + py_func = PyObject_GetAttrString(py_mod, "decode"); /* NEWREF */ + if (!py_func || !PyCallable_Check(py_func)) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + Py_XDECREF(py_mod); + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + } else { + PyObject_Print(py_res, stdout, Py_PRINT_RAW); + fprintf(stdout, "\n"); + + /* Create a Python tuple of size 1. */ + if (!(py_args = PyTuple_New(1))) { /* NEWREF */ + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + + Py_XDECREF(py_res); + Py_XDECREF(py_mod); + + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + + py_value = Py_BuildValue("{sssisd}", + "driver", "demo", + "unitsize", _unitsize, //FIXME: Pass in a unitsize that matches the selected LA + "starttime", 129318231823.0 //TODO: Fill with something reasonable. + ); + /* + * IMPORTANT: PyTuple_SetItem() "steals" a reference to py_value! + * That means we are no longer responsible for Py_XDECREF()'ing it. + * It will automatically be free'd when the 'py_args' tuple is free'd. + */ + if (PyTuple_SetItem(py_args, 0, py_value) != 0) { /* STEAL */ + Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ + Py_XDECREF(py_res); + Py_XDECREF(py_mod); + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + + /* Create an instance of the Decoder class */ + py_instance = PyObject_CallObject(py_res, py_args); + if (!py_instance) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ + Py_XDECREF(py_res); + Py_XDECREF(py_mod); + fprintf(stderr, "Unable to create instance of Decoder class in PD module %s\n", name); + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } else { + /* OK, we have successfully created an instance of the Decoder object */ + + /* Get the 'decode' function name as Python callable object. */ + py_func = PyObject_GetAttrString(py_instance, "decode"); /* NEWREF */ + if (!py_func || !PyCallable_Check(py_func)) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + fprintf(stderr, "Unable to find decode function in instance of Decoder class in PD module %s\n", name); + Py_XDECREF(py_instance); + Py_XDECREF(py_mod); + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + } } - d->py_func = py_func; + d->py_decodefunc = py_func; /* TODO: Handle func, inputformats, outputformats. */ /* Note: They must at least be set to NULL, will segfault otherwise. */ @@ -253,7 +356,7 @@ static int sigrokdecode_load_decoder(const char *name, *dec = d; - return SIGROKDECODE_OK; + return SRD_OK; } /** @@ -265,72 +368,72 @@ static int sigrokdecode_load_decoder(const char *name, * @param outbuf TODO * @param outbuflen TODO * - * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. */ -int sigrokdecode_run_decoder(struct sigrokdecode_decoder *dec, +int srd_run_decoder(struct srd_decoder *dec, uint8_t *inbuf, uint64_t inbuflen, uint8_t **outbuf, uint64_t *outbuflen) { PyObject *py_mod, *py_func, *py_args, *py_value, *py_res; int r, ret; + + /* FIXME: Don't have a timebase available here. Make one up. */ + static int _timehack = 0; + _timehack += inbuflen; /* TODO: Use #defines for the return codes. */ /* Return an error upon unusable input. */ if (dec == NULL) - return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */ + return SRD_ERR_ARGS; /* TODO: More specific error? */ if (inbuf == NULL) - return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */ + return SRD_ERR_ARGS; /* TODO: More specific error? */ if (inbuflen == 0) /* No point in working on empty buffers. */ - return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */ + return SRD_ERR_ARGS; /* TODO: More specific error? */ if (outbuf == NULL) - return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */ + return SRD_ERR_ARGS; /* TODO: More specific error? */ if (outbuflen == NULL) - return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */ - + return SRD_ERR_ARGS; /* TODO: More specific error? */ + /* TODO: Error handling. */ py_mod = dec->py_mod; Py_XINCREF(py_mod); - py_func = dec->py_func; + py_func = dec->py_decodefunc; Py_XINCREF(py_func); /* Create a Python tuple of size 1. */ if (!(py_args = PyTuple_New(1))) { /* NEWREF */ - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ goto err_run_decref_func; } /* Get the input buffer as Python "string" (byte array). */ /* TODO: int vs. uint64_t for 'inbuflen'? */ - if (!(py_value = Py_BuildValue("s#", inbuf, inbuflen))) { /* NEWREF */ - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ - goto err_run_decref_args; - } + py_value = Py_BuildValue("{sisiss#}", + "time", _timehack, + "duration", 10, + "data", inbuf, inbuflen / _unitsize + ); + /* * IMPORTANT: PyTuple_SetItem() "steals" a reference to py_value! * That means we are no longer responsible for Py_XDECREF()'ing it. * It will automatically be free'd when the 'py_args' tuple is free'd. */ if (PyTuple_SetItem(py_args, 0, py_value) != 0) { /* STEAL */ - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ goto err_run_decref_args; } - + if (!(py_res = PyObject_CallObject(py_func, py_args))) { /* NEWREF */ - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ + ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ goto err_run_decref_args; } - if ((r = PyObject_AsCharBuffer(py_res, (const char **)outbuf, - (Py_ssize_t *)outbuflen))) { - ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ - Py_XDECREF(py_res); - goto err_run_decref_args; - } - ret = SIGROKDECODE_OK; + ret = SRD_OK; Py_XDECREF(py_res); @@ -349,7 +452,7 @@ err_run_decref_func: /** * TODO */ -static int sigrokdecode_unload_decoder(struct sigrokdecode_decoder *dec) +static int srd_unload_decoder(struct srd_decoder *dec) { g_free(dec->id); g_free(dec->name); @@ -363,43 +466,43 @@ static int sigrokdecode_unload_decoder(struct sigrokdecode_decoder *dec) if (dec->outputformats != NULL) g_slist_free(dec->outputformats); - Py_XDECREF(dec->py_func); + Py_XDECREF(dec->py_decodefunc); Py_XDECREF(dec->py_mod); - return SIGROKDECODE_OK; + return SRD_OK; } /** * TODO */ -static int sigrokdecode_unload_all_decoders(void) +static int srd_unload_all_decoders(void) { GSList *l; - struct sigrokdecode_decoder *dec; + struct srd_decoder *dec; - for (l = sigrokdecode_list_decoders(); l; l = l->next) { + for (l = srd_list_decoders(); l; l = l->next) { dec = l->data; /* TODO: Error handling. */ - sigrokdecode_unload_decoder(dec); + srd_unload_decoder(dec); } - return SIGROKDECODE_OK; + return SRD_OK; } /** * Shutdown libsigrokdecode. * - * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. */ -int sigrokdecode_shutdown(void) +int srd_exit(void) { /* Unload/free all decoders, and then the list of decoders itself. */ /* TODO: Error handling. */ - sigrokdecode_unload_all_decoders(); + srd_unload_all_decoders(); g_slist_free(list_pds); /* Py_Finalize() returns void, any finalization errors are ignored. */ Py_Finalize(); - return SIGROKDECODE_OK; + return SRD_OK; }