X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fsession.c;h=8d3f66966a4f156c632d185d4f788274b15e58be;hp=b88590210c63c4a215f09729c26a76521c8f2690;hb=64f26f744bf3185eddb07e8bfe9855e3c7bfac19;hpb=cbc1413f31f3946ce79da5540cfbeace8924c9d1

diff --git a/src/session.c b/src/session.c
index b8859021..8d3f6696 100644
--- a/src/session.c
+++ b/src/session.c
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +52,7 @@ struct datafeed_callback {
 };
 
 /** Custom GLib event source for generic descriptor I/O.
- * @internal
+ * @see https://developer.gnome.org/glib/stable/glib-The-Main-Event-Loop.html
  */
 struct fd_source {
 	GSource base;
@@ -67,6 +68,7 @@ struct fd_source {
 };
 
 /** FD event source prepare() method.
+ * This is called immediately before poll().
  */
 static gboolean fd_source_prepare(GSource *source, int *timeout)
 {
@@ -93,6 +95,7 @@ static gboolean fd_source_prepare(GSource *source, int *timeout)
 }
 
 /** FD event source check() method.
+ * This is called after poll() returns to check whether an event fired.
  */
 static gboolean fd_source_check(GSource *source)
 {
@@ -107,31 +110,23 @@ static gboolean fd_source_check(GSource *source)
 }
 
 /** FD event source dispatch() method.
+ * This is called if either prepare() or check() returned TRUE.
  */
 static gboolean fd_source_dispatch(GSource *source,
 		GSourceFunc callback, void *user_data)
 {
 	struct fd_source *fsource;
-	const char *name;
 	unsigned int revents;
 	gboolean keep;
 
 	fsource = (struct fd_source *)source;
-	name = g_source_get_name(source);
 	revents = fsource->pollfd.revents;
 
-	if (revents != 0) {
-		sr_spew("%s: %s " G_POLLFD_FORMAT ", revents 0x%.2X",
-			__func__, name, fsource->pollfd.fd, revents);
-	} else {
-		sr_spew("%s: %s " G_POLLFD_FORMAT ", timed out",
-			__func__, name, fsource->pollfd.fd);
-	}
 	if (!callback) {
 		sr_err("Callback not set, cannot dispatch event.");
 		return G_SOURCE_REMOVE;
 	}
-	keep = (*(sr_receive_data_callback)callback)
+	keep = (*SR_RECEIVE_DATA_CALLBACK(callback))
 			(fsource->pollfd.fd, revents, user_data);
 
 	if (fsource->timeout_us >= 0 && G_LIKELY(keep)
@@ -162,7 +157,9 @@ static void fd_source_finalize(GSource *source)
  * @param session The session the event source belongs to.
  * @param key The key used to identify this source.
  * @param fd The file descriptor or HANDLE.
+ * @param events Events.
  * @param timeout_ms The timeout interval in ms, or -1 to wait indefinitely.
+ *
  * @return A new event source object, or NULL on failure.
  */
 static GSource *fd_source_new(struct sr_session *session, void *key,
@@ -260,6 +257,8 @@ SR_API int sr_session_destroy(struct sr_session *session)
 	sr_session_dev_remove_all(session);
 	g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
 
+	sr_session_datafeed_callback_remove_all(session);
+
 	g_hash_table_unref(session->event_sources);
 
 	g_mutex_clear(&session->main_mutex);
@@ -341,7 +340,7 @@ SR_API int sr_session_dev_add(struct sr_session *session,
 	/* If sdi->driver is NULL, this is a virtual device. */
 	if (!sdi->driver) {
 		/* Just add the device, don't run dev_open(). */
-		session->devs = g_slist_append(session->devs, (gpointer)sdi);
+		session->devs = g_slist_append(session->devs, sdi);
 		sdi->session = session;
 		return SR_OK;
 	}
@@ -352,9 +351,12 @@ SR_API int sr_session_dev_add(struct sr_session *session,
 		return SR_ERR_BUG;
 	}
 
-	session->devs = g_slist_append(session->devs, (gpointer)sdi);
+	session->devs = g_slist_append(session->devs, sdi);
 	sdi->session = session;
 
+	/* TODO: This is invalid if the session runs in a different thread.
+	 * The usage semantics and restrictions need to be documented.
+	 */
 	if (session->running) {
 		/* Adding a device to a running session. Commit settings
 		 * and start acquisition on that device now. */
@@ -364,8 +366,7 @@ SR_API int sr_session_dev_add(struct sr_session *session,
 			       sr_strerror(ret));
 			return ret;
 		}
-		if ((ret = sdi->driver->dev_acquisition_start(sdi,
-						(void *)sdi)) != SR_OK) {
+		if ((ret = sr_dev_acquisition_start(sdi)) != SR_OK) {
 			sr_err("Failed to start acquisition of device in "
 			       "running session (%s)", sr_strerror(ret));
 			return ret;
@@ -404,6 +405,45 @@ SR_API int sr_session_dev_list(struct sr_session *session, GSList **devlist)
 	return SR_OK;
 }
 
+/**
+ * Remove a device instance from a session.
+ *
+ * @param session The session to remove from. Must not be NULL.
+ * @param sdi The device instance to remove from a session. Must not
+ *            be NULL. Also, sdi->driver and sdi->driver->dev_open must
+ *            not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ *
+ * @since 0.4.0
+ */
+SR_API int sr_session_dev_remove(struct sr_session *session,
+		struct sr_dev_inst *sdi)
+{
+	if (!sdi) {
+		sr_err("%s: sdi was NULL", __func__);
+		return SR_ERR_ARG;
+	}
+
+	if (!session) {
+		sr_err("%s: session was NULL", __func__);
+		return SR_ERR_ARG;
+	}
+
+	/* If sdi->session is not session, the device is not in this
+	 * session. */
+	if (sdi->session != session) {
+		sr_err("%s: not assigned to this session", __func__);
+		return SR_ERR_ARG;
+	}
+
+	session->devs = g_slist_remove(session->devs, sdi);
+	sdi->session = NULL;
+
+	return SR_OK;
+}
+
 /**
  * Remove all datafeed callbacks in a session.
  *
@@ -548,41 +588,38 @@ static int verify_trigger(struct sr_trigger *trigger)
  */
 static int set_main_context(struct sr_session *session)
 {
-	GMainContext *def_context;
-
-	/* May happen if sr_session_start() is called again after
-	 * sr_session_run(), but the session hasn't been stopped yet.
-	 */
-	if (session->main_loop) {
-		sr_err("Cannot set main context; main loop already created.");
-		return SR_ERR;
-	}
+	GMainContext *main_context;
 
 	g_mutex_lock(&session->main_mutex);
 
-	def_context = g_main_context_get_thread_default();
+	/* May happen if sr_session_start() is called a second time
+	 * while the session is still running.
+	 */
+	if (session->main_context) {
+		sr_err("Main context already set.");
 
-	if (!def_context)
-		def_context = g_main_context_default();
+		g_mutex_unlock(&session->main_mutex);
+		return SR_ERR;
+	}
+	main_context = g_main_context_ref_thread_default();
 	/*
 	 * Try to use an existing main context if possible, but only if we
 	 * can make it owned by the current thread. Otherwise, create our
 	 * own main context so that event source callbacks can execute in
 	 * the session thread.
 	 */
-	if (g_main_context_acquire(def_context)) {
-		g_main_context_release(def_context);
+	if (g_main_context_acquire(main_context)) {
+		g_main_context_release(main_context);
 
 		sr_dbg("Using thread-default main context.");
-
-		session->main_context = def_context;
-		session->main_context_is_default = TRUE;
 	} else {
-		sr_dbg("Creating our own main context.");
+		g_main_context_unref(main_context);
 
-		session->main_context = g_main_context_new();
-		session->main_context_is_default = FALSE;
+		sr_dbg("Creating our own main context.");
+		main_context = g_main_context_new();
 	}
+	session->main_context = main_context;
+
 	g_mutex_unlock(&session->main_mutex);
 
 	return SR_OK;
@@ -603,9 +640,7 @@ static int unset_main_context(struct sr_session *session)
 	g_mutex_lock(&session->main_mutex);
 
 	if (session->main_context) {
-		if (!session->main_context_is_default)
-			g_main_context_unref(session->main_context);
-
+		g_main_context_unref(session->main_context);
 		session->main_context = NULL;
 		ret = SR_OK;
 	} else {
@@ -619,13 +654,99 @@ static int unset_main_context(struct sr_session *session)
 	return ret;
 }
 
+static unsigned int session_source_attach(struct sr_session *session,
+		GSource *source)
+{
+	unsigned int id = 0;
+
+	g_mutex_lock(&session->main_mutex);
+
+	if (session->main_context)
+		id = g_source_attach(source, session->main_context);
+	else
+		sr_err("Cannot add event source without main context.");
+
+	g_mutex_unlock(&session->main_mutex);
+
+	return id;
+}
+
+/* Idle handler; invoked when the number of registered event sources
+ * for a running session drops to zero.
+ */
+static gboolean delayed_stop_check(void *data)
+{
+	struct sr_session *session;
+
+	session = data;
+	session->stop_check_id = 0;
+
+	/* Session already ended? */
+	if (!session->running)
+		return G_SOURCE_REMOVE;
+
+	/* New event sources may have been installed in the meantime. */
+	if (g_hash_table_size(session->event_sources) != 0)
+		return G_SOURCE_REMOVE;
+
+	session->running = FALSE;
+	unset_main_context(session);
+
+	sr_info("Stopped.");
+
+	/* This indicates a bug in user code, since it is not valid to
+	 * restart or destroy a session while it may still be running.
+	 */
+	if (!session->main_loop && !session->stopped_callback) {
+		sr_err("BUG: Session stop left unhandled.");
+		return G_SOURCE_REMOVE;
+	}
+	if (session->main_loop)
+		g_main_loop_quit(session->main_loop);
+
+	if (session->stopped_callback)
+		(*session->stopped_callback)(session->stopped_cb_data);
+
+	return G_SOURCE_REMOVE;
+}
+
+static int stop_check_later(struct sr_session *session)
+{
+	GSource *source;
+	unsigned int source_id;
+
+	if (session->stop_check_id != 0)
+		return SR_OK; /* idle handler already installed */
+
+	source = g_idle_source_new();
+	g_source_set_callback(source, &delayed_stop_check, session, NULL);
+
+	source_id = session_source_attach(session, source);
+	session->stop_check_id = source_id;
+
+	g_source_unref(source);
+
+	return (source_id != 0) ? SR_OK : SR_ERR;
+}
+
 /**
  * Start a session.
  *
+ * When this function returns with a status code indicating success, the
+ * session is running. Use sr_session_stopped_callback_set() to receive
+ * notification upon completion, or call sr_session_run() to block until
+ * the session stops.
+ *
+ * Session events will be processed in the context of the current thread.
+ * If a thread-default GLib main context has been set, and is not owned by
+ * any other thread, it will be used. Otherwise, libsigrok will create its
+ * own main context for the current thread.
+ *
  * @param session The session to use. Must not be NULL.
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid session passed.
+ * @retval SR_ERR Other error.
  *
  * @since 0.4.0
  */
@@ -633,8 +754,8 @@ SR_API int sr_session_start(struct sr_session *session)
 {
 	struct sr_dev_inst *sdi;
 	struct sr_channel *ch;
-	GSList *l, *c;
-	int enabled_channels, ret;
+	GSList *l, *c, *lend;
+	int ret;
 
 	if (!session) {
 		sr_err("%s: session was NULL", __func__);
@@ -647,63 +768,100 @@ SR_API int sr_session_start(struct sr_session *session)
 		return SR_ERR_ARG;
 	}
 
-	if (session->trigger && verify_trigger(session->trigger) != SR_OK)
+	if (session->running) {
+		sr_err("Cannot (re-)start session while it is still running.");
 		return SR_ERR;
+	}
 
-	ret = set_main_context(session);
-	if (ret != SR_OK)
-		return ret;
-
-	session->running = TRUE;
-
-	sr_info("Starting.");
+	if (session->trigger) {
+		ret = verify_trigger(session->trigger);
+		if (ret != SR_OK)
+			return ret;
+	}
 
+	/* Check enabled channels and commit settings of all devices. */
 	for (l = session->devs; l; l = l->next) {
 		sdi = l->data;
-		enabled_channels = 0;
 		for (c = sdi->channels; c; c = c->next) {
 			ch = c->data;
-			if (ch->enabled) {
-				enabled_channels++;
+			if (ch->enabled)
 				break;
-			}
 		}
-		if (enabled_channels == 0) {
-			ret = SR_ERR;
-			sr_err("%s using connection %s has no enabled channels!",
-					sdi->driver->name, sdi->connection_id);
-			break;
+		if (!c) {
+			sr_err("%s device %s has no enabled channels.",
+				sdi->driver->name, sdi->connection_id);
+			return SR_ERR;
 		}
 
-		if ((ret = sr_config_commit(sdi)) != SR_OK) {
-			sr_err("Failed to commit device settings before "
-			       "starting acquisition (%s)", sr_strerror(ret));
+		ret = sr_config_commit(sdi);
+		if (ret != SR_OK) {
+			sr_err("Failed to commit %s device %s settings "
+				"before starting acquisition.",
+				sdi->driver->name, sdi->connection_id);
+			return ret;
+		}
+	}
+
+	ret = set_main_context(session);
+	if (ret != SR_OK)
+		return ret;
+
+	sr_info("Starting.");
+
+	session->running = TRUE;
+
+	/* Have all devices start acquisition. */
+	for (l = session->devs; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			sr_err("Device sdi was NULL, can't start session.");
+			ret = SR_ERR;
 			break;
 		}
-		if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) {
-			sr_err("%s: could not start an acquisition "
-			       "(%s)", __func__, sr_strerror(ret));
+		ret = sr_dev_acquisition_start(sdi);
+		if (ret != SR_OK) {
+			sr_err("Could not start %s device %s acquisition.",
+				sdi->driver->name, sdi->connection_id);
 			break;
 		}
 	}
 
 	if (ret != SR_OK) {
-		unset_main_context(session);
+		/* If there are multiple devices, some of them may already have
+		 * started successfully. Stop them now before returning. */
+		lend = l->next;
+		for (l = session->devs; l != lend; l = l->next) {
+			sdi = l->data;
+			sr_dev_acquisition_stop(sdi);
+		}
+		/* TODO: Handle delayed stops. Need to iterate the event
+		 * sources... */
 		session->running = FALSE;
+
+		unset_main_context(session);
+		return ret;
 	}
-	/* TODO: What if there are multiple devices? Which return code? */
 
-	return ret;
+	if (g_hash_table_size(session->event_sources) == 0)
+		stop_check_later(session);
+
+	return SR_OK;
 }
 
 /**
- * Run a session.
+ * Block until the running session stops.
+ *
+ * This is a convenience function which creates a GLib main loop and runs
+ * it to process session events until the session stops.
+ *
+ * Instead of using this function, applications may run their own GLib main
+ * loop, and use sr_session_stopped_callback_set() to receive notification
+ * when the session finished running.
  *
  * @param session The session to use. Must not be NULL.
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid session passed.
- * @retval SR_ERR Error during event processing.
+ * @retval SR_ERR Other error.
  *
  * @since 0.4.0
  */
@@ -713,30 +871,24 @@ SR_API int sr_session_run(struct sr_session *session)
 		sr_err("%s: session was NULL", __func__);
 		return SR_ERR_ARG;
 	}
-	if (!session->devs) {
-		/* TODO: Actually the case? */
-		sr_err("%s: session->devs was NULL; a session "
-		       "cannot be run without devices.", __func__);
-		return SR_ERR_ARG;
+	if (!session->running) {
+		sr_err("No session running.");
+		return SR_ERR;
 	}
 	if (session->main_loop) {
 		sr_err("Main loop already created.");
 		return SR_ERR;
 	}
-	if (g_hash_table_size(session->event_sources) == 0) {
-		sr_warn("No event sources, returning immediately.");
-		return SR_OK;
-	}
 
 	g_mutex_lock(&session->main_mutex);
+
 	if (!session->main_context) {
 		sr_err("Cannot run without main context.");
 		g_mutex_unlock(&session->main_mutex);
 		return SR_ERR;
 	}
-	sr_info("Running.");
-
 	session->main_loop = g_main_loop_new(session->main_context, FALSE);
+
 	g_mutex_unlock(&session->main_mutex);
 
 	g_main_loop_run(session->main_loop);
@@ -762,10 +914,8 @@ static gboolean session_stop_sync(void *user_data)
 
 	for (node = session->devs; node; node = node->next) {
 		sdi = node->data;
-		if (sdi->driver && sdi->driver->dev_acquisition_stop)
-			sdi->driver->dev_acquisition_stop(sdi, sdi);
+		sr_dev_acquisition_stop(sdi);
 	}
-	session->running = FALSE;
 
 	return G_SOURCE_REMOVE;
 }
@@ -773,39 +923,107 @@ static gboolean session_stop_sync(void *user_data)
 /**
  * Stop a session.
  *
- * The session is stopped immediately, with all acquisition sessions being
- * stopped and hardware drivers cleaned up.
+ * This requests the drivers of each device participating in the session to
+ * abort the acquisition as soon as possible. Even after this function returns,
+ * event processing still continues until all devices have actually stopped.
+ *
+ * Use sr_session_stopped_callback_set() to receive notification when the event
+ * processing finished.
  *
- * 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.
+ * This function is reentrant. That is, it may be called from a different
+ * thread than the one executing the session, as long as it can be ensured
+ * that the session object is valid.
+ *
+ * If the session is not running, sr_session_stop() silently does nothing.
  *
  * @param session The session to use. Must not be NULL.
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid session passed.
- * @retval SR_ERR Other error.
  *
  * @since 0.4.0
  */
 SR_API int sr_session_stop(struct sr_session *session)
 {
+	GMainContext *main_context;
+
 	if (!session) {
 		sr_err("%s: session was NULL", __func__);
 		return SR_ERR_ARG;
 	}
+
 	g_mutex_lock(&session->main_mutex);
 
-	if (session->main_context) {
-		g_main_context_invoke(session->main_context,
-				&session_stop_sync, session);
-	} else {
-		sr_err("No main context set; already stopped?");
-	}
+	main_context = (session->main_context)
+		? g_main_context_ref(session->main_context)
+		: NULL;
+
 	g_mutex_unlock(&session->main_mutex);
 
-	return unset_main_context(session);
+	if (!main_context) {
+		sr_dbg("No main context set; already stopped?");
+		/* Not an error; as it would be racy. */
+		return SR_OK;
+	}
+	g_main_context_invoke(main_context, &session_stop_sync, session);
+	g_main_context_unref(main_context);
+
+	return SR_OK;
+}
+
+/**
+ * Return whether the session is currently running.
+ *
+ * Note that this function should be called from the same thread
+ * the session was started in.
+ *
+ * @param session The session to use. Must not be NULL.
+ *
+ * @retval TRUE Session is running.
+ * @retval FALSE Session is not running.
+ * @retval SR_ERR_ARG Invalid session passed.
+ *
+ * @since 0.4.0
+ */
+SR_API int sr_session_is_running(struct sr_session *session)
+{
+	if (!session) {
+		sr_err("%s: session was NULL", __func__);
+		return SR_ERR_ARG;
+	}
+	return session->running;
+}
+
+/**
+ * Set the callback to be invoked after a session stopped running.
+ *
+ * Install a callback to receive notification when a session run stopped.
+ * This can be used to integrate session execution with an existing main
+ * loop, without having to block in sr_session_run().
+ *
+ * Note that the callback will be invoked in the context of the thread
+ * that calls sr_session_start().
+ *
+ * @param session The session to use. Must not be NULL.
+ * @param cb The callback to invoke on session stop. May be NULL to unset.
+ * @param cb_data User data pointer to be passed to the callback.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid session passed.
+ *
+ * @since 0.4.0
+ */
+SR_API int sr_session_stopped_callback_set(struct sr_session *session,
+		sr_session_stopped_callback cb, void *cb_data)
+{
+	if (!session) {
+		sr_err("%s: session was NULL", __func__);
+		return SR_ERR_ARG;
+	}
+	session->stopped_callback = cb;
+	session->stopped_cb_data = cb_data;
+
+	return SR_OK;
 }
 
 /**
@@ -817,7 +1035,6 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_logic *logic;
 	const struct sr_datafeed_analog *analog;
-	const struct sr_datafeed_analog2 *analog2;
 
 	/* Please use the same order as in libsigrok.h. */
 	switch (packet->type) {
@@ -838,21 +1055,16 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 		sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
 		       "unitsize = %d).", logic->length, logic->unitsize);
 		break;
-	case SR_DF_ANALOG:
-		analog = packet->payload;
-		sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
-		       analog->num_samples);
-		break;
 	case SR_DF_FRAME_BEGIN:
 		sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
 		break;
 	case SR_DF_FRAME_END:
 		sr_dbg("bus: Received SR_DF_FRAME_END packet.");
 		break;
-	case SR_DF_ANALOG2:
-		analog2 = packet->payload;
-		sr_dbg("bus: Received SR_DF_ANALOG2 packet (%d samples).",
-		       analog2->num_samples);
+	case SR_DF_ANALOG:
+		analog = packet->payload;
+		sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
+		       analog->num_samples);
 		break;
 	default:
 		sr_dbg("bus: Received unknown packet type: %d.", packet->type);
@@ -860,6 +1072,42 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 	}
 }
 
+/**
+ * Helper to send a meta datafeed package (SR_DF_META) to the session bus.
+ *
+ * @param sdi The device instance to send the package from. Must not be NULL.
+ * @param key The config key to send to the session bus.
+ * @param var The value to send to the session bus.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ *
+ * @private
+ */
+SR_PRIV int sr_session_send_meta(const struct sr_dev_inst *sdi,
+		uint32_t key, GVariant *var)
+{
+	struct sr_config *cfg;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_meta meta;
+	int ret;
+
+	cfg = sr_config_new(key, var);
+
+	memset(&meta, 0, sizeof(meta));
+
+	packet.type = SR_DF_META;
+	packet.payload = &meta;
+
+	meta.config = g_slist_append(NULL, cfg);
+
+	ret = sr_session_send(sdi, &packet);
+	g_slist_free(meta.config);
+	sr_config_free(cfg);
+
+	return ret;
+}
+
 /**
  * Send a packet to whatever is listening on the datafeed bus.
  *
@@ -948,15 +1196,17 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
  * @param session The session to use. Must not be NULL.
  * @param key The key which identifies the event source.
  * @param source An event source object. Must not be NULL.
+ *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_BUG Event source with @a key already installed.
  * @retval SR_ERR Other error.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
 		void *key, GSource *source)
 {
-	int ret;
 	/*
 	 * This must not ever happen, since the source has already been
 	 * created and its finalize() method will remove the key for the
@@ -969,22 +1219,13 @@ SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
 	}
 	g_hash_table_insert(session->event_sources, key, source);
 
-	g_mutex_lock(&session->main_mutex);
-
-	if (session->main_context) {
-		if (g_source_attach(source, session->main_context) > 0)
-			ret = SR_OK;
-		else
-			ret = SR_ERR;
-	} else {
-		sr_err("Cannot add event source without main context.");
-		ret = SR_ERR;
-	}
-	g_mutex_unlock(&session->main_mutex);
+	if (session_source_attach(session, source) == 0)
+		return SR_ERR;
 
-	return ret;
+	return SR_OK;
 }
 
+/** @private */
 SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
 		void *key, gintptr fd, int events, int timeout,
 		sr_receive_data_callback cb, void *cb_data)
@@ -996,7 +1237,7 @@ SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
 	if (!source)
 		return SR_ERR;
 
-	g_source_set_callback(source, (GSourceFunc)cb, cb_data, NULL);
+	g_source_set_callback(source, G_SOURCE_FUNC(cb), cb_data, NULL);
 
 	ret = sr_session_source_add_internal(session, key, source);
 	g_source_unref(source);
@@ -1019,8 +1260,9 @@ SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add(struct sr_session *session, int fd,
+SR_PRIV int sr_session_source_add(struct sr_session *session, int fd,
 		int events, int timeout, sr_receive_data_callback cb, void *cb_data)
 {
 	if (fd < 0 && timeout < 0) {
@@ -1045,8 +1287,9 @@ SR_API int sr_session_source_add(struct sr_session *session, int fd,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add_pollfd(struct sr_session *session,
+SR_PRIV int sr_session_source_add_pollfd(struct sr_session *session,
 		GPollFD *pollfd, int timeout, sr_receive_data_callback cb,
 		void *cb_data)
 {
@@ -1073,8 +1316,9 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add_channel(struct sr_session *session,
+SR_PRIV int sr_session_source_add_channel(struct sr_session *session,
 		GIOChannel *channel, int events, int timeout,
 		sr_receive_data_callback cb, void *cb_data)
 {
@@ -1087,7 +1331,7 @@ SR_API int sr_session_source_add_channel(struct sr_session *session,
 	/* We should be using g_io_create_watch(), but can't without
 	 * changing the driver API, as the callback signature is different.
 	 */
-#ifdef G_OS_WIN32
+#ifdef _WIN32
 	g_io_channel_win32_make_pollfd(channel, events, &pollfd);
 #else
 	pollfd.fd = g_io_channel_unix_get_fd(channel);
@@ -1105,6 +1349,8 @@ SR_API int sr_session_source_add_channel(struct sr_session *session,
  *
  * @retval SR_OK Success
  * @retval SR_ERR_BUG No event source for poll_object found.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
 		void *key)
@@ -1136,8 +1382,9 @@ SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
  * @retval SR_ERR_BUG Internal error.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_remove(struct sr_session *session, int fd)
+SR_PRIV int sr_session_source_remove(struct sr_session *session, int fd)
 {
 	return sr_session_source_remove_internal(session, GINT_TO_POINTER(fd));
 }
@@ -1153,8 +1400,9 @@ SR_API int sr_session_source_remove(struct sr_session *session, int fd)
  *         internal errors.
  *
  * @since 0.2.0
+ * @private
  */
-SR_API int sr_session_source_remove_pollfd(struct sr_session *session,
+SR_PRIV int sr_session_source_remove_pollfd(struct sr_session *session,
 		GPollFD *pollfd)
 {
 	if (!pollfd) {
@@ -1175,8 +1423,9 @@ SR_API int sr_session_source_remove_pollfd(struct sr_session *session,
  * @return SR_ERR_BUG Internal error.
  *
  * @since 0.2.0
+ * @private
  */
-SR_API int sr_session_source_remove_channel(struct sr_session *session,
+SR_PRIV int sr_session_source_remove_channel(struct sr_session *session,
 		GIOChannel *channel)
 {
 	if (!channel) {
@@ -1196,6 +1445,9 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG Event source for @a key does not match @a source.
+ * @retval SR_ERR Other error.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_destroyed(struct sr_session *session,
 		void *key, GSource *source)
@@ -1217,28 +1469,32 @@ SR_PRIV int sr_session_source_destroyed(struct sr_session *session,
 		return SR_ERR_BUG;
 	}
 	g_hash_table_remove(session->event_sources, key);
-	/*
-	 * Quit the main loop if we just removed the last event source.
-	 * TODO: This may need an idle callback depending on when event
-	 * sources are finalized. (The issue is remove followed by add
-	 * within the same main loop iteration.)
+
+	if (g_hash_table_size(session->event_sources) > 0)
+		return SR_OK;
+
+	/* If no event sources are left, consider the acquisition finished.
+	 * This is pretty crude, as it requires all event sources to be
+	 * registered via the libsigrok API.
 	 */
-	if (session->main_loop
-			&& g_hash_table_size(session->event_sources) == 0) {
-		sr_dbg("Stopping main loop...");
-		g_main_loop_quit(session->main_loop);
-	}
-	return SR_OK;
+	return stop_check_later(session);
 }
 
 static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy)
 {
+	struct sr_config *item;
+
+#if GLIB_CHECK_VERSION(2, 67, 3)
+	item = g_memdup2(src, sizeof(*src));
+#else
+	item = g_memdup(src, sizeof(*src));
+#endif
+
 	g_variant_ref(src->data);
-	meta_copy->config = g_slist_append(meta_copy->config,
-	                                   g_memdup(src, sizeof(struct sr_config)));
+	meta_copy->config = g_slist_append(meta_copy->config, item);
 }
 
-SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
+SR_API int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		struct sr_datafeed_packet **copy)
 {
 	const struct sr_datafeed_meta *meta;
@@ -1247,6 +1503,9 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 	struct sr_datafeed_logic *logic_copy;
 	const struct sr_datafeed_analog *analog;
 	struct sr_datafeed_analog *analog_copy;
+	struct sr_analog_encoding *encoding_copy;
+	struct sr_analog_meaning *meaning_copy;
+	struct sr_analog_spec *spec_copy;
 	uint8_t *payload;
 
 	*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
@@ -1270,22 +1529,41 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		break;
 	case SR_DF_LOGIC:
 		logic = packet->payload;
-		logic_copy = g_malloc(sizeof(logic));
+		logic_copy = g_malloc(sizeof(*logic_copy));
+		if (!logic_copy)
+			return SR_ERR;
 		logic_copy->length = logic->length;
 		logic_copy->unitsize = logic->unitsize;
+		logic_copy->data = g_malloc(logic->length * logic->unitsize);
+		if (!logic_copy->data) {
+			g_free(logic_copy);
+			return SR_ERR;
+		}
 		memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
 		(*copy)->payload = logic_copy;
 		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
-		analog_copy = g_malloc(sizeof(analog));
-		analog_copy->channels = g_slist_copy(analog->channels);
-		analog_copy->num_samples = analog->num_samples;
-		analog_copy->mq = analog->mq;
-		analog_copy->unit = analog->unit;
-		analog_copy->mqflags = analog->mqflags;
+		analog_copy = g_malloc(sizeof(*analog_copy));
+		analog_copy->data = g_malloc(
+				analog->encoding->unitsize * analog->num_samples);
 		memcpy(analog_copy->data, analog->data,
-				analog->num_samples * sizeof(float));
+				analog->encoding->unitsize * analog->num_samples);
+		analog_copy->num_samples = analog->num_samples;
+#if GLIB_CHECK_VERSION(2, 67, 3)
+		encoding_copy = g_memdup2(analog->encoding, sizeof(*analog->encoding));
+		meaning_copy = g_memdup2(analog->meaning, sizeof(*analog->meaning));
+		spec_copy = g_memdup2(analog->spec, sizeof(*analog->spec));
+#else
+		encoding_copy = g_memdup(analog->encoding, sizeof(*analog->encoding));
+		meaning_copy = g_memdup(analog->meaning, sizeof(*analog->meaning));
+		spec_copy = g_memdup(analog->spec, sizeof(*analog->spec));
+#endif
+		analog_copy->encoding = encoding_copy;
+		analog_copy->meaning = meaning_copy;
+		analog_copy->meaning->channels = g_slist_copy(
+				analog->meaning->channels);
+		analog_copy->spec = spec_copy;
 		(*copy)->payload = analog_copy;
 		break;
 	default:
@@ -1296,7 +1574,7 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 	return SR_OK;
 }
 
-void sr_packet_free(struct sr_datafeed_packet *packet)
+SR_API void sr_packet_free(struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
@@ -1330,15 +1608,17 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
 		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
-		g_slist_free(analog->channels);
 		g_free(analog->data);
+		g_free(analog->encoding);
+		g_slist_free(analog->meaning->channels);
+		g_free(analog->meaning);
+		g_free(analog->spec);
 		g_free((void *)packet->payload);
 		break;
 	default:
 		sr_err("Unknown packet type %d", packet->type);
 	}
 	g_free(packet);
-
 }
 
 /** @} */