* This file is part of the sigrok project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
int alen, ret, i;
char **ann;
- py_basedec = py_method = py_attr = NULL;
+ srd_dbg("srd: loading module '%s'", name);
- srd_dbg("decoder: %s: loading module '%s'", __func__, name);
+ py_basedec = py_method = py_attr = NULL;
if (!(d = g_try_malloc0(sizeof(struct srd_decoder)))) {
- srd_err("decoder: %s: d malloc failed", __func__);
+ srd_dbg("srd: Failed to malloc struct srd_decoder");
ret = SRD_ERR_MALLOC;
goto err_out;
}
/* Import the Python module. */
if (!(d->py_mod = PyImport_ImportModule(name))) {
- /* TODO: Report exception message/traceback to err/dbg. */
- srd_warn("decoder: %s: import of '%s' failed", __func__, name);
- PyErr_Print();
- PyErr_Clear();
+ catch_exception("import of '%s' failed.", name);
goto err_out;
}
/* Get the 'Decoder' class as Python object. */
if (!(d->py_dec = PyObject_GetAttrString(d->py_mod, "Decoder"))) {
/* This generated an AttributeError exception. */
- PyErr_Print();
PyErr_Clear();
- srd_err("Decoder class not found in protocol decoder %s", name);
+ srd_err("Decoder class not found in protocol decoder %s.", name);
goto err_out;
}
if (!(py_basedec = PyObject_GetAttrString(mod_sigrokdecode, "Decoder"))) {
- srd_dbg("sigrokdecode module not loaded");
+ srd_dbg("srd: sigrokdecode module not loaded");
goto err_out;
}
if (!PyObject_IsSubclass(d->py_dec, py_basedec)) {
srd_err("Decoder class in protocol decoder module %s is not "
- "a subclass of sigrokdecode.Decoder", name);
+ "a subclass of sigrokdecode.Decoder.", name);
goto err_out;
}
Py_DecRef(py_basedec);
}
py_method = PyObject_GetAttrString(d->py_dec, "start");
if (!PyFunction_Check(py_method)) {
- srd_err("Protocol decoder %s Decoder class attribute 'start'"
+ srd_err("Protocol decoder %s Decoder class attribute 'start' "
"is not a method.", name);
goto err_out;
}
if (PyObject_HasAttrString(d->py_dec, "annotations")) {
py_annlist = PyObject_GetAttrString(d->py_dec, "annotations");
if (!PyList_Check(py_annlist)) {
- srd_err("Protocol decoder module %s annotations should be a list", name);
+ srd_err("Protocol decoder module %s annotations should be a list.", name);
goto err_out;
}
alen = PyList_Size(py_annlist);
for (i = 0; i < alen; i++) {
py_ann = PyList_GetItem(py_annlist, i);
if (!PyList_Check(py_ann) || PyList_Size(py_ann) != 2) {
- srd_err("Protocol decoder module %s annotation %d should be a list with two elements",
- name, i+1);
+ srd_err("Protocol decoder module %s annotation %d should "
+ "be a list with two elements.", name, i+1);
goto err_out;
}
return NULL;
if (!(py_str = PyObject_GetAttrString(dec->py_mod, "__doc__"))) {
- PyErr_Clear();
+ catch_exception("");
return NULL;
}
/* The decoder name is the PD directory name (e.g. "i2c"). */
decodername = g_strdup(direntry);
- /* TODO: Error handling. Use g_try_malloc(). */
- if (!(dec = malloc(sizeof(struct srd_decoder)))) {
- Py_Finalize(); /* Returns void. */
+ if (!(dec = g_try_malloc(sizeof(struct srd_decoder))))
return SRD_ERR_MALLOC;
- }
- /* Load the decoder. */
- /* TODO: Warning if loading fails for a decoder. */
if ((ret = srd_load_decoder(decodername, &dec)) == SRD_OK) {
/* Append it to the list of supported/loaded decoders. */
pd_list = g_slist_append(pd_list, dec);
for (l = srd_list_decoders(); l; l = l->next) {
dec = l->data;
- /* TODO: Error handling. */
srd_unload_decoder(dec);
}