X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=instance.c;h=23732ddb3ad1645825aa389c61d2dfa413055206;hp=36fb2d0c32889b609712ba6dc2f42a00f1aecda2;hb=HEAD;hpb=b92543610e86daf57b0f042a899c9897d8234fa0

diff --git a/instance.c b/instance.c
index 36fb2d0..067e98d 100644
--- a/instance.c
+++ b/instance.c
@@ -167,7 +167,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
 			}
 		} else if (g_variant_is_of_type(value, G_VARIANT_TYPE_INT64)) {
 			val_int = g_variant_get_int64(value);
-			if (!(py_optval = PyLong_FromLong(val_int))) {
+			if (!(py_optval = PyLong_FromLongLong(val_int))) {
 				/* ValueError Exception */
 				PyErr_Clear();
 				srd_err("Option '%s' has invalid integer value.", sdo->id);
@@ -426,6 +426,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
 	di->got_new_samples = FALSE;
 	di->handled_all_samples = FALSE;
 	di->want_wait_terminate = FALSE;
+	di->communicate_eof = FALSE;
 	di->decoder_state = SRD_OK;
 
 	/*
@@ -500,6 +501,7 @@ static void srd_inst_reset_state(struct srd_decoder_inst *di)
 	di->got_new_samples = FALSE;
 	di->handled_all_samples = FALSE;
 	di->want_wait_terminate = FALSE;
+	di->communicate_eof = FALSE;
 	di->decoder_state = SRD_OK;
 	/* Conditions and mutex got reset after joining the thread. */
 }
@@ -699,7 +701,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
 	Py_DECREF(py_res);
 
 	/* Set self.samplenum to 0. */
-	py_samplenum = PyLong_FromLong(0);
+	py_samplenum = PyLong_FromUnsignedLongLong(0);
 	PyObject_SetAttrString(di->py_inst, "samplenum", py_samplenum);
 	Py_DECREF(py_samplenum);
 
@@ -895,6 +897,8 @@ static gboolean all_terms_match(const struct srd_decoder_inst *di,
 
 	for (l = cond; l; l = l->next) {
 		term = l->data;
+		if (term->type == SRD_TERM_ALWAYS_FALSE)
+			return FALSE;
 		if (!term_matches(di, term, sample_pos))
 			return FALSE;
 	}
@@ -1056,6 +1060,17 @@ static gpointer di_thread(gpointer data)
 	py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
 	srd_dbg("%s: decode() terminated.", di->inst_id);
 
+	/*
+	 * Termination with an EOFError exception is accepted to simplify
+	 * the implementation of decoders and for backwards compatibility.
+	 */
+	if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_EOFError)) {
+		srd_dbg("%s: ignoring EOFError during decode() execution.",
+			di->inst_id);
+		PyErr_Clear();
+		if (!py_res)
+			py_res = Py_None;
+	}
 	if (!py_res)
 		di->decoder_state = SRD_ERR;
 
@@ -1232,12 +1247,111 @@ SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di,
 		g_cond_wait(&di->handled_all_samples_cond, &di->data_mutex);
 	g_mutex_unlock(&di->data_mutex);
 
+	/* Flush all PDs in the stack that can be flushed */
+	srd_inst_flush(di);
+
 	if (di->want_wait_terminate)
 		return SRD_ERR_TERM_REQ;
 
 	return SRD_OK;
 }
 
+
+/**
+ * Flush all data that is pending, bottom decoder first up to the top of the stack.
+ *
+ * @param di The decoder instance to call. Must not be NULL.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *
+ * @private
+ */
+SRD_PRIV int srd_inst_flush(struct srd_decoder_inst *di)
+{
+	PyGILState_STATE gstate;
+	PyObject *py_ret;
+	GSList *l;
+	int ret;
+
+	if (!di)
+		return SRD_ERR_ARG;
+
+	gstate = PyGILState_Ensure();
+	if (PyObject_HasAttrString(di->py_inst, "flush")) {
+		srd_dbg("Calling flush() of instance %s", di->inst_id);
+		py_ret = PyObject_CallMethod(di->py_inst, "flush", NULL);
+		Py_XDECREF(py_ret);
+	}
+	PyGILState_Release(gstate);
+
+	/* Pass the "flush" request to all stacked decoders. */
+	for (l = di->next_di; l; l = l->next) {
+		ret = srd_inst_flush(l->data);
+		if (ret != SRD_OK)
+			return ret;
+	}
+
+	return di->decoder_state;
+}
+
+/**
+ * Communicate the end of the stream of sample data to a decoder instance.
+ *
+ * @param[in] di The decoder instance to call. Must not be NULL.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *
+ * @private
+ */
+SRD_PRIV int srd_inst_send_eof(struct srd_decoder_inst *di)
+{
+	GSList *l;
+	int ret;
+
+	if (!di)
+		return SRD_ERR_ARG;
+
+	/*
+	 * Send EOF to the caller specified decoder instance. Only
+	 * communicate EOF to currently executing decoders. Never
+	 * started or previously finished is perfectly acceptable.
+	 */
+	srd_dbg("End of sample data: instance %s.", di->inst_id);
+	if (!di->thread_handle) {
+		srd_dbg("No worker thread, nothing to do.");
+		return SRD_OK;
+	}
+
+	/* Signal the thread about the EOF condition. */
+	g_mutex_lock(&di->data_mutex);
+	di->inbuf = NULL;
+	di->inbuflen = 0;
+	di->got_new_samples = TRUE;
+	di->handled_all_samples = FALSE;
+	di->want_wait_terminate = TRUE;
+	di->communicate_eof = TRUE;
+	g_cond_signal(&di->got_new_samples_cond);
+	g_mutex_unlock(&di->data_mutex);
+
+	/* Only return from here when the condition was handled. */
+	g_mutex_lock(&di->data_mutex);
+	while (!di->handled_all_samples && !di->want_wait_terminate)
+		g_cond_wait(&di->handled_all_samples_cond, &di->data_mutex);
+	g_mutex_unlock(&di->data_mutex);
+
+	/* Flush the decoder instance which handled EOF. */
+	srd_inst_flush(di);
+
+	/* Pass EOF to all stacked decoders. */
+	for (l = di->next_di; l; l = l->next) {
+		ret = srd_inst_send_eof(l->data);
+		if (ret != SRD_OK)
+			return ret;
+	}
+
+	return SRD_OK;
+}
+
 /**
  * Terminate current decoder work, prepare for re-use on new input data.
  *