X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder.c;h=0d266d4625618651deb38c73a4df4830b93f1e78;hb=c4c10b89396fe21a622b8c38dd5815a496b007bf;hp=260f6367787597bc8f9c5818bf362f574b9b1c81;hpb=611a73404f1a42aa92fb32f00ca5407e1cdb2c71;p=libsigrokdecode.git

diff --git a/decoder.c b/decoder.c
index 260f636..0d266d4 100644
--- a/decoder.c
+++ b/decoder.c
@@ -136,6 +136,18 @@ static void annotation_row_free(void *data)
 	g_free(row);
 }
 
+static void logic_output_channel_free(void *data)
+{
+	struct srd_decoder_logic_output_channel *logic_out_ch = data;
+
+	if (!logic_out_ch)
+		return;
+
+	g_free(logic_out_ch->desc);
+	g_free(logic_out_ch->id);
+	g_free(logic_out_ch);
+}
+
 static void decoder_option_free(void *data)
 {
 	struct srd_decoder_option *opt = data;
@@ -171,6 +183,7 @@ static void decoder_free(struct srd_decoder *dec)
 
 	g_slist_free_full(dec->outputs, g_free);
 	g_slist_free_full(dec->inputs, g_free);
+	g_slist_free_full(dec->tags, g_free);
 	g_free(dec->license);
 	g_free(dec->desc);
 	g_free(dec->longname);
@@ -605,6 +618,79 @@ err_out:
 	return SRD_ERR_PYTHON;
 }
 
+/* Convert logic_output_channels to GSList of 'struct srd_decoder_logic_output_channel'. */
+static int get_logic_output_channels(struct srd_decoder *dec)
+{
+	PyObject *py_logic_out_chs, *py_logic_out_ch, *py_item;
+	GSList *logic_out_chs;
+	struct srd_decoder_logic_output_channel *logic_out_ch;
+	ssize_t i;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+
+	if (!PyObject_HasAttrString(dec->py_dec, "logic_output_channels")) {
+		PyGILState_Release(gstate);
+		return SRD_OK;
+	}
+
+	logic_out_chs = NULL;
+
+	py_logic_out_chs = PyObject_GetAttrString(dec->py_dec, "logic_output_channels");
+	if (!py_logic_out_chs)
+		goto except_out;
+
+	if (!PyTuple_Check(py_logic_out_chs)) {
+		srd_err("Protocol decoder %s logic_output_channels "
+			"must be a tuple.", dec->name);
+		goto err_out;
+	}
+
+	for (i = PyTuple_Size(py_logic_out_chs) - 1; i >= 0; i--) {
+		py_logic_out_ch = PyTuple_GetItem(py_logic_out_chs, i);
+		if (!py_logic_out_ch)
+			goto except_out;
+
+		if (!PyTuple_Check(py_logic_out_ch) || PyTuple_Size(py_logic_out_ch) != 2) {
+			srd_err("Protocol decoder %s logic_output_channels "
+				"must contain only tuples of 2 elements.",
+				dec->name);
+			goto err_out;
+		}
+		logic_out_ch = g_malloc0(sizeof(*logic_out_ch));
+		/* Add to list right away so it doesn't get lost. */
+		logic_out_chs = g_slist_prepend(logic_out_chs, logic_out_ch);
+
+		py_item = PyTuple_GetItem(py_logic_out_ch, 0);
+		if (!py_item)
+			goto except_out;
+		if (py_str_as_str(py_item, &logic_out_ch->id) != SRD_OK)
+			goto err_out;
+
+		py_item = PyTuple_GetItem(py_logic_out_ch, 1);
+		if (!py_item)
+			goto except_out;
+		if (py_str_as_str(py_item, &logic_out_ch->desc) != SRD_OK)
+			goto err_out;
+	}
+	dec->logic_output_channels = logic_out_chs;
+	Py_DECREF(py_logic_out_chs);
+	PyGILState_Release(gstate);
+
+	return SRD_OK;
+
+except_out:
+	srd_exception_catch("Failed to get %s decoder logic output channels",
+			dec->name);
+
+err_out:
+	g_slist_free_full(logic_out_chs, &logic_output_channel_free);
+	Py_XDECREF(py_logic_out_chs);
+	PyGILState_Release(gstate);
+
+	return SRD_ERR_PYTHON;
+}
+
 /* Check whether the Decoder class defines the named method. */
 static int check_method(PyObject *py_dec, const char *mod_name,
 		const char *method_name)
@@ -667,6 +753,53 @@ SRD_PRIV long srd_decoder_apiver(const struct srd_decoder *d)
 	return apiver;
 }
 
+static gboolean contains_duplicates(GSList *list)
+{
+	for (GSList *l1 = list; l1; l1 = l1->next) {
+		for (GSList *l2 = l1->next; l2; l2 = l2->next)
+			if (!strcmp(l1->data, l2->data))
+				return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean contains_duplicate_ids(GSList *list1, GSList *list2)
+{
+	for (GSList *l1 = list1; l1; l1 = l1->next) {
+		unsigned int cnt = 0;
+		const char **s1 = l1->data;
+		for (GSList *l2 = list2; l2; l2 = l2->next) {
+			const char **s2 = l2->data;
+			if (!strcmp(s1[0], s2[0]))
+				cnt++;
+			if ((list1 == list2) && cnt > 1)
+				return TRUE;
+			if ((list1 != list2) && cnt > 0)
+				return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+static gboolean contains_duplicate_row_ids(GSList *list1, GSList *list2)
+{
+	for (GSList *l1 = list1; l1; l1 = l1->next) {
+		unsigned int cnt = 0;
+		const struct srd_decoder_annotation_row *r1 = l1->data;
+		for (GSList *l2 = list2; l2; l2 = l2->next) {
+			const struct srd_decoder_annotation_row *r2 = l2->data;
+			if (!strcmp(r1->id, r2->id))
+				cnt++;
+			if (cnt > 1)
+				return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 /**
  * Load a protocol decoder module into the embedded Python interpreter.
  *
@@ -751,6 +884,11 @@ SRD_API int srd_decoder_load(const char *module_name)
 
 	/* Check Decoder class for required methods. */
 
+	if (check_method(d->py_dec, module_name, "reset") != SRD_OK) {
+		fail_txt = "no 'reset()' method";
+		goto err_out;
+	}
+
 	if (check_method(d->py_dec, module_name, "start") != SRD_OK) {
 		fail_txt = "no 'start()' method";
 		goto err_out;
@@ -797,6 +935,11 @@ SRD_API int srd_decoder_load(const char *module_name)
 		goto err_out;
 	}
 
+	if (py_attr_as_strlist(d->py_dec, "tags", &(d->tags)) != SRD_OK) {
+		fail_txt = "missing or malformed 'tags' attribute";
+		goto err_out;
+	}
+
 	/* All options and their default values. */
 	if (get_options(d) != SRD_OK) {
 		fail_txt = "cannot get options";
@@ -831,6 +974,66 @@ SRD_API int srd_decoder_load(const char *module_name)
 		goto err_out;
 	}
 
+	if (contains_duplicates(d->inputs)) {
+		fail_txt = "duplicate input IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicates(d->outputs)) {
+		fail_txt = "duplicate output IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicates(d->tags)) {
+		fail_txt = "duplicate tags";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->channels, d->channels)) {
+		fail_txt = "duplicate channel IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->opt_channels, d->opt_channels)) {
+		fail_txt = "duplicate optional channel IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->channels, d->opt_channels)) {
+		fail_txt = "channel and optional channel IDs contain duplicates";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->options, d->options)) {
+		fail_txt = "duplicate option IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->annotations, d->annotations)) {
+		fail_txt = "duplicate annotation class IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicate_row_ids(d->annotation_rows, d->annotation_rows)) {
+		fail_txt = "duplicate annotation row IDs";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->annotations, d->annotation_rows)) {
+		fail_txt = "annotation class/row IDs contain duplicates";
+		goto err_out;
+	}
+
+	if (contains_duplicate_ids(d->binary, d->binary)) {
+		fail_txt = "duplicate binary class IDs";
+		goto err_out;
+	}
+
+	if (get_logic_output_channels(d) != SRD_OK) {
+		fail_txt = "cannot get logic output channels";
+		goto err_out;
+	}
+
 	PyGILState_Release(gstate);
 
 	/* Append it to the list of loaded decoders. */
@@ -858,7 +1061,7 @@ err_out:
 /**
  * Return a protocol decoder's docstring.
  *
- * @param dec The loaded protocol decoder.
+ * @param dec The loaded protocol decoder. Must not be NULL.
  *
  * @return A newly allocated buffer containing the protocol decoder's
  *         documentation. The caller is responsible for free'ing the buffer.
@@ -874,7 +1077,7 @@ SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec)
 	if (!srd_check_init())
 		return NULL;
 
-	if (!dec)
+	if (!dec || !dec->py_mod)
 		return NULL;
 
 	gstate = PyGILState_Ensure();