X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=module_sigrokdecode.c;h=39b5b4392e479a5dfde3fa2985002b50f0e2384c;hb=bca4fea3c8e8447a768e816e51c6f1d9e78a2d05;hp=d5172d6febf5823dd22503c6c73604b3cfaa606e;hpb=7ee0c40b4ac605c68a8ec2008ef4ab61a1872475;p=libsigrokdecode.git
diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index d5172d6..39b5b43 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -17,18 +17,12 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
-#include "config.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
/** @cond PRIVATE */
-/* type_decoder.c */
-extern SRD_PRIV PyTypeObject srd_Decoder_type;
-
-/* type_logic.c */
-extern SRD_PRIV PyTypeObject srd_logic_type;
-
/*
* When initialized, a reference to this module inside the Python interpreter
* lives here.
@@ -47,42 +41,46 @@ static struct PyModuleDef sigrokdecode_module = {
/** @cond PRIVATE */
PyMODINIT_FUNC PyInit_sigrokdecode(void)
{
- PyObject *mod;
+ PyObject *mod, *Decoder_type;
+ PyGILState_STATE gstate;
- /* tp_new needs to be assigned here for compiler portability. */
- srd_Decoder_type.tp_new = PyType_GenericNew;
- if (PyType_Ready(&srd_Decoder_type) < 0)
- return NULL;
-
- srd_logic_type.tp_new = PyType_GenericNew;
- if (PyType_Ready(&srd_logic_type) < 0)
- return NULL;
+ gstate = PyGILState_Ensure();
mod = PyModule_Create(&sigrokdecode_module);
- Py_INCREF(&srd_Decoder_type);
- if (PyModule_AddObject(mod, "Decoder",
- (PyObject *)&srd_Decoder_type) == -1)
- return NULL;
- Py_INCREF(&srd_logic_type);
- if (PyModule_AddObject(mod, "srd_logic",
- (PyObject *)&srd_logic_type) == -1)
- return NULL;
+ if (!mod)
+ goto err_out;
+
+ Decoder_type = srd_Decoder_type_new();
+ if (!Decoder_type)
+ goto err_out;
+ if (PyModule_AddObject(mod, "Decoder", Decoder_type) < 0)
+ goto err_out;
/* Expose output types as symbols in the sigrokdecode module */
- if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
- return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) == -1)
- return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) == -1)
- return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) == -1)
- return NULL;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) < 0)
+ goto err_out;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) < 0)
+ goto err_out;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) < 0)
+ goto err_out;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) < 0)
+ goto err_out;
/* Expose meta input symbols. */
- if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) == -1)
- return NULL;
+ if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) < 0)
+ goto err_out;
mod_sigrokdecode = mod;
+ PyGILState_Release(gstate);
+
return mod;
+
+err_out:
+ Py_XDECREF(mod);
+ srd_exception_catch("Failed to initialize module");
+ PyGILState_Release(gstate);
+
+ return NULL;
}
+
/** @endcond */