#include <stdio.h>
#include <string.h>
#include <dirent.h>
+#include <config.h>
/* Re-define some string functions for Python >= 3.0. */
#if PY_VERSION_HEX >= 0x03000000
/* The list of protocol decoders. */
GSList *list_pds = NULL;
+/*
+ * Here's a quick overview of Python/C API reference counting.
+ *
+ * Check the Python/C API docs for what type of reference a function returns.
+ *
+ * - If it returns a "new reference", you're responsible to Py_DECREF() it.
+ *
+ * - If it returns a "borrowed reference", you MUST NOT Py_DECREF() it.
+ *
+ * - If a function "steals" a reference, you no longer are responsible for
+ * Py_DECREF()ing it (someone else will do it for you at some point).
+ */
+
/**
* Initialize libsigrokdecode.
*
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
- /* Add some more search directories for convenience. */
+ /* Add search directory for the protocol decoders. */
/* FIXME: Check error code. */
/* FIXME: What happens if this function is called multiple times? */
- PyRun_SimpleString(
- "import sys;"
- "sys.path.append('libsigrokdecode/decoders');"
- "sys.path.append('" DECODERS_DIR "');"
- );
+ PyRun_SimpleString("import sys;"
+ "sys.path.append(r'" DECODERS_DIR "');");
if (!(dir = opendir(DECODERS_DIR)))
return SIGROKDECODE_ERR_DECODERS_DIR;
while ((dp = readdir(dir)) != NULL) {
- if (!strstr(dp->d_name, ".py"))
+ if (!g_str_has_suffix(dp->d_name, ".py"))
continue;
- if ((tmp = strdup(dp->d_name)))
+ /* For now use the filename (without .py) as decoder name. */
+ if ((tmp = g_strndup(dp->d_name, strlen(dp->d_name) - 3)))
list_pds = g_slist_append(list_pds, tmp);
}
closedir(dir);
return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
}
+ /*
+ * IMPORTANT: PyTuple_SetItem() "steals" a reference to py_value!
+ * That means we are no longer responsible for Py_DECREF()'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) {
PyErr_Print();
- Py_DECREF(py_value);
+ Py_DECREF(py_value); /* TODO: Ref. stolen upon error? */
Py_DECREF(py_args);
Py_DECREF(py_func);
Py_DECREF(py_mod);
if (!(py_res = PyObject_CallObject(py_func, py_args))) {
PyErr_Print();
- Py_DECREF(py_value);
Py_DECREF(py_args);
Py_DECREF(py_func);
Py_DECREF(py_mod);
(Py_ssize_t *)outbuflen))) {
PyErr_Print();
Py_DECREF(py_res);
- Py_DECREF(py_value);
Py_DECREF(py_args);
Py_DECREF(py_func);
Py_DECREF(py_mod);
}
Py_DECREF(py_res);
- // Py_DECREF(py_value);
Py_DECREF(py_args);
Py_DECREF(py_func);
Py_DECREF(py_mod);