X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=92ee648a631c77d41092beb3bf010f00c5537d30;hb=c9166745f23889e1c5abb010513733c829c00d1b;hp=43e97dbc63bbd1aff654d5fa0c9075744cefa637;hpb=249ae2be8f0e5132d601ab431ac8783b5b1c7439;p=libsigrok.git

diff --git a/session.c b/session.c
index 43e97dbc..92ee648a 100644
--- a/session.c
+++ b/session.c
@@ -39,16 +39,6 @@ struct source {
 /* There can only be one session at a time. */
 /* 'session' is not static, it's used elsewhere (via 'extern'). */
 struct sr_session *session;
-static int num_sources = 0;
-
-/* Both "sources" and "pollfds" are of the same size and contain pairs of
- * descriptor and callback function. We can not embed the GPollFD into the
- * source struct since we want to be able to pass the array of all poll
- * descriptors to g_poll.
- */
-static struct source *sources = NULL;
-static GPollFD *pollfds;
-static int source_timeout = -1;
 
 /**
  * Create a new session.
@@ -65,6 +55,8 @@ SR_API struct sr_session *sr_session_new(void)
 		return NULL; /* TODO: SR_ERR_MALLOC? */
 	}
 
+	session->source_timeout = -1;
+
 	return session;
 }
 
@@ -82,8 +74,7 @@ SR_API int sr_session_destroy(void)
 		return SR_ERR_BUG;
 	}
 
-	g_slist_free(session->devs);
-	session->devs = NULL;
+	sr_session_dev_remove_all();
 
 	/* TODO: Error checks needed? */
 
@@ -95,6 +86,12 @@ SR_API int sr_session_destroy(void)
 	return SR_OK;
 }
 
+static void sr_dev_close(struct sr_dev *dev)
+{
+	if (dev && dev->driver && dev->driver->dev_close)
+		dev->driver->dev_close(dev->driver_index);
+}
+
 /**
  * Remove all the devices from the current session. TODO?
  *
@@ -110,7 +107,7 @@ SR_API int sr_session_dev_remove_all(void)
 		return SR_ERR_BUG;
 	}
 
-	g_slist_free(session->devs);
+	g_slist_free_full(session->devs, (GDestroyNotify)sr_dev_close);
 	session->devs = NULL;
 
 	return SR_OK;
@@ -213,22 +210,23 @@ SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb)
  */
 static int sr_session_run_poll(void)
 {
-	int ret, i;
+	unsigned int i;
+	int ret;
 
 	while (session->running) {
-		ret = g_poll(pollfds, num_sources, source_timeout);
+		ret = g_poll(session->pollfds, session->num_sources, session->source_timeout);
 
-		for (i = 0; i < num_sources; i++) {
-			if (pollfds[i].revents > 0 || (ret == 0
-				&& source_timeout == sources[i].timeout)) {
+		for (i = 0; i < session->num_sources; i++) {
+			if (session->pollfds[i].revents > 0 || (ret == 0
+				&& session->source_timeout == session->sources[i].timeout)) {
 				/*
 				 * Invoke the source's callback on an event,
 				 * or if the poll timeout out and this source
 				 * asked for that timeout.
 				 */
-				if (!sources[i].cb(pollfds[i].fd, pollfds[i].revents,
-						  sources[i].cb_data))
-					sr_session_source_remove(pollfds[i].fd);
+				if (!session->sources[i].cb(session->pollfds[i].fd, session->pollfds[i].revents,
+						  session->sources[i].cb_data))
+					sr_session_source_remove(session->sources[i].poll_object);
 			}
 		}
 	}
@@ -308,10 +306,10 @@ SR_API int sr_session_run(void)
 	session->running = TRUE;
 
 	/* Do we have real sources? */
-	if (num_sources == 1 && pollfds[0].fd == -1) {
+	if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
 		/* Dummy source, freewheel over it. */
 		while (session->running)
-			sources[0].cb(-1, 0, sources[0].cb_data);
+			session->sources[0].cb(-1, 0, session->sources[0].cb_data);
 	} else {
 		/* Real sources, use g_poll() main loop. */
 		sr_session_run_poll();
@@ -323,22 +321,15 @@ SR_API int sr_session_run(void)
 /**
  * Halt the current session.
  *
- * This requests the current session be stopped as soon as possible, for
- * example on receiving an SR_DF_END packet.
+ * This function is deprecated and should not be used in new code, use
+ * sr_session_stop() instead. The behaviour of this function is identical to
+ * sr_session_stop().
  *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */
 SR_API int sr_session_halt(void)
 {
-	if (!session) {
-		sr_err("session: %s: session was NULL", __func__);
-		return SR_ERR_BUG;
-	}
-
-	sr_info("session: halting");
-	session->running = FALSE;
-
-	return SR_OK;
+	return sr_session_stop();
 }
 
 /**
@@ -368,8 +359,6 @@ SR_API int sr_session_stop(void)
 		if (dev->driver) {
 			if (dev->driver->dev_acquisition_stop)
 				dev->driver->dev_acquisition_stop(dev->driver_index, dev);
-			if (dev->driver->cleanup)
-				dev->driver->cleanup();
 		}
 	}
 
@@ -462,7 +451,7 @@ SR_PRIV int sr_session_send(struct sr_dev *dev,
 }
 
 static int _sr_session_source_add(GPollFD *pollfd, int timeout,
-		sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object)
+	sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object)
 {
 	struct source *new_sources, *s;
 	GPollFD *new_pollfds;
@@ -474,30 +463,31 @@ static int _sr_session_source_add(GPollFD *pollfd, int timeout,
 
 	/* Note: cb_data can be NULL, that's not a bug. */
 
-	new_pollfds = g_try_realloc(pollfds, sizeof(GPollFD) * (num_sources + 1));
+	new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * (session->num_sources + 1));
 	if (!new_pollfds) {
-		sr_err("session: %s: new_sources malloc failed", __func__);
+		sr_err("session: %s: new_pollfds malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	new_sources = g_try_realloc(sources, sizeof(struct source) * (num_sources + 1));
+	new_sources = g_try_realloc(session->sources, sizeof(struct source) *
+	(session->num_sources + 1));
 	if (!new_sources) {
 		sr_err("session: %s: new_sources malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	new_pollfds[num_sources] = *pollfd;
-	s = &new_sources[num_sources++];
+	new_pollfds[session->num_sources] = *pollfd;
+	s = &new_sources[session->num_sources++];
 	s->timeout = timeout;
 	s->cb = cb;
 	s->cb_data = cb_data;
 	s->poll_object = poll_object;
-	pollfds = new_pollfds;
-	sources = new_sources;
+	session->pollfds = new_pollfds;
+	session->sources = new_sources;
 
-	if (timeout != source_timeout && timeout > 0
-	    && (source_timeout == -1 || timeout < source_timeout))
-		source_timeout = timeout;
+	if (timeout != session->source_timeout && timeout > 0
+	    && (session->source_timeout == -1 || timeout < session->source_timeout))
+		session->source_timeout = timeout;
 
 	return SR_OK;
 }
@@ -526,7 +516,7 @@ SR_API int sr_session_source_add(int fd, int events, int timeout,
 }
 
 /**
- * Add a event source for a GPollFD
+ * Add an event source for a GPollFD.
  *
  * TODO: More error checks etc.
  *
@@ -541,11 +531,12 @@ SR_API int sr_session_source_add(int fd, int events, int timeout,
 SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
 		sr_receive_data_callback_t cb, void *cb_data)
 {
-	return _sr_session_source_add(pollfd, timeout, cb, cb_data, (gintptr)pollfd);
+	return _sr_session_source_add(pollfd, timeout, cb,
+				      cb_data, (gintptr)pollfd);
 }
 
 /**
- * Add a event source for a GIOChannel
+ * Add an event source for a GIOChannel.
  *
  * TODO: More error checks etc.
  *
@@ -558,8 +549,8 @@ SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
-SR_API int sr_session_source_add_channel(GIOChannel *channel, int events, int timeout,
-		sr_receive_data_callback_t cb, void *cb_data)
+SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
+		int timeout, sr_receive_data_callback_t cb, void *cb_data)
 {
 	GPollFD p;
 
@@ -579,45 +570,45 @@ static int _sr_session_source_remove(gintptr poll_object)
 {
 	struct source *new_sources;
 	GPollFD *new_pollfds;
-	int old;
+	unsigned int old;
 
-	if (!sources) {
+	if (!session->sources || !session->num_sources) {
 		sr_err("session: %s: sources was NULL", __func__);
 		return SR_ERR_BUG;
 	}
 
-	for (old = 0; old < num_sources; old++) {
-		if (sources[old].poll_object == poll_object)
+	for (old = 0; old < session->num_sources; old++) {
+		if (session->sources[old].poll_object == poll_object)
 			break;
 	}
 
 	/* fd not found, nothing to do */
-	if (old == num_sources)
+	if (old == session->num_sources)
 		return SR_OK;
 
-	num_sources -= 1;
+	session->num_sources -= 1;
 
-	if (old != num_sources) {
-		memmove(&pollfds[old], &pollfds[old+1],
-			(num_sources - old) * sizeof(GPollFD));
-		memmove(&sources[old], &sources[old+1],
-			(num_sources - old) * sizeof(struct source));
+	if (old != session->num_sources) {
+		memmove(&session->pollfds[old], &session->pollfds[old+1],
+			(session->num_sources - old) * sizeof(GPollFD));
+		memmove(&session->sources[old], &session->sources[old+1],
+			(session->num_sources - old) * sizeof(struct source));
 	}
 
-	new_pollfds = g_try_realloc(sources, sizeof(GPollFD) * num_sources);
-	if (!new_pollfds && num_sources > 0) {
-		sr_err("session: %s: new_sources malloc failed", __func__);
+	new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
+	if (!new_pollfds && session->num_sources > 0) {
+		sr_err("session: %s: new_pollfds malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	new_sources = g_try_realloc(sources, sizeof(struct source) * num_sources);
-	if (!new_sources && num_sources > 0) {
+	new_sources = g_try_realloc(session->sources, sizeof(struct source) * session->num_sources);
+	if (!new_sources && session->num_sources > 0) {
 		sr_err("session: %s: new_sources malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	pollfds = new_pollfds;
-	sources = new_sources;
+	session->pollfds = new_pollfds;
+	session->sources = new_sources;
 
 	return SR_OK;
 }
@@ -627,7 +618,7 @@ static int _sr_session_source_remove(gintptr poll_object)
  *
  * TODO: More error checks.
  *
- * @param fd: The file descriptor for which the source should be removed.
+ * @param fd The file descriptor for which the source should be removed.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
@@ -659,7 +650,7 @@ SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
  *
  * TODO: More error checks.
  *
- * @parama channel: The channel for which the source should be removed.
+ * @param channel The channel for which the source should be removed.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon