X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=ae85bb53fb11baa1433bb784970929b309ef7203;hb=9bd4c95606668bdc58a6df3c30bcd91f288a4ea9;hp=ac5981ad050b6993478ca04f0838345c704e2eb8;hpb=a819da9c258bd1f295604e4078c84ca0bab2de04;p=libsigrok.git

diff --git a/session.c b/session.c
index ac5981ad..ae85bb53 100644
--- a/session.c
+++ b/session.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -59,6 +59,11 @@ struct source {
 	gintptr poll_object;
 };
 
+struct datafeed_callback {
+	sr_datafeed_callback_t cb;
+	void *cb_data;
+};
+
 /* There can only be one session at a time. */
 /* 'session' is not static, it's used elsewhere (via 'extern'). */
 struct sr_session *session;
@@ -79,6 +84,8 @@ SR_API struct sr_session *sr_session_new(void)
 	}
 
 	session->source_timeout = -1;
+	session->abort_session = FALSE;
+	g_mutex_init(&session->stop_mutex);
 
 	return session;
 }
@@ -101,6 +108,8 @@ SR_API int sr_session_destroy(void)
 
 	/* TODO: Error checks needed? */
 
+	g_mutex_clear(&session->stop_mutex);
+
 	g_free(session);
 	session = NULL;
 
@@ -230,7 +239,7 @@ SR_API int sr_session_datafeed_callback_remove_all(void)
 		return SR_ERR_BUG;
 	}
 
-	g_slist_free(session->datafeed_callbacks);
+	g_slist_free_full(session->datafeed_callbacks, g_free);
 	session->datafeed_callbacks = NULL;
 
 	return SR_OK;
@@ -241,11 +250,14 @@ SR_API int sr_session_datafeed_callback_remove_all(void)
  *
  * @param cb Function to call when a chunk of data is received.
  *           Must not be NULL.
+ * @param cb_data Opaque pointer passed in by the caller.
  *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */
-SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb)
+SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb, void *cb_data)
 {
+	struct datafeed_callback *cb_struct;
+
 	if (!session) {
 		sr_err("%s: session was NULL", __func__);
 		return SR_ERR_BUG;
@@ -256,8 +268,14 @@ SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb)
 		return SR_ERR_ARG;
 	}
 
+	if (!(cb_struct = g_try_malloc0(sizeof(struct datafeed_callback))))
+		return SR_ERR_MALLOC;
+
+	cb_struct->cb = cb;
+	cb_struct->cb_data = cb_data;
+
 	session->datafeed_callbacks =
-	    g_slist_append(session->datafeed_callbacks, cb);
+	    g_slist_append(session->datafeed_callbacks, cb_struct);
 
 	return SR_OK;
 }
@@ -283,6 +301,16 @@ static int sr_session_run_poll(void)
 						session->sources[i].cb_data))
 					sr_session_source_remove(session->sources[i].poll_object);
 			}
+			/*
+			 * We want to take as little time as possible to stop
+			 * the session if we have been told to do so. Therefore,
+			 * we check the flag after processing every source, not
+			 * just once per main event loop.
+			 */
+			g_mutex_lock(&session->stop_mutex);
+			if (session->abort_session)
+				sr_session_stop_sync();
+			g_mutex_unlock(&session->stop_mutex);
 		}
 	}
 
@@ -372,9 +400,12 @@ SR_API int sr_session_run(void)
  * The current session is stopped immediately, with all acquisition sessions
  * being stopped and hardware drivers cleaned up.
  *
+ * This must be called from within the session thread, to prevent freeing
+ * resources that the session thread will try to use.
+ *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */
-SR_API int sr_session_stop(void)
+SR_PRIV int sr_session_stop_sync(void)
 {
 	struct sr_dev_inst *sdi;
 	GSList *l;
@@ -406,6 +437,33 @@ SR_API int sr_session_stop(void)
 	return SR_OK;
 }
 
+/**
+ * Stop the current session.
+ *
+ * The current session is stopped immediately, with all acquisition sessions
+ * being stopped and hardware drivers cleaned up.
+ *
+ * If the session is run in a separate thread, this function will not block
+ * until the session is finished executing. It is the caller's responsibility
+ * to wait for the session thread to return before assuming that the session is
+ * completely decommissioned.
+ *
+ * @return SR_OK upon success, SR_ERR_BUG if no session exists.
+ */
+SR_API int sr_session_stop(void)
+{
+	if (!session) {
+		sr_err("%s: session was NULL", __func__);
+		return SR_ERR_BUG;
+	}
+
+	g_mutex_lock(&session->stop_mutex);
+	session->abort_session = TRUE;
+	g_mutex_unlock(&session->stop_mutex);
+
+	return SR_OK;
+}
+
 /**
  * Debug helper.
  *
@@ -467,7 +525,7 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 			    const struct sr_datafeed_packet *packet)
 {
 	GSList *l;
-	sr_datafeed_callback_t cb;
+	struct datafeed_callback *cb_struct;
 
 	if (!sdi) {
 		sr_err("%s: sdi was NULL", __func__);
@@ -482,8 +540,8 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 	for (l = session->datafeed_callbacks; l; l = l->next) {
 		if (sr_log_loglevel_get() >= SR_LOG_DBG)
 			datafeed_dump(packet);
-		cb = l->data;
-		cb(sdi, packet);
+		cb_struct = l->data;
+		cb_struct->cb(sdi, packet, cb_struct->cb_data);
 	}
 
 	return SR_OK;