Code drop from DreamSourceLabs first source release.

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 266207259ca3c82e9c42c76208af3ae8afb88880..29e19085434bb67acbc9665b129d64d492812c8b 100644 (file)
--- a/session.c
+++ b/session.c
@@ -25,14 +25,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "session: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "session: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * @file
@@ -85,7 +85,7 @@ SR_API struct sr_session *sr_session_new(void)
 
        session->source_timeout = -1;
        session->abort_session = FALSE;
-       g_mutex_init(&session->stop_mutex);
+//     g_mutex_init(&session->stop_mutex);
 
        return session;
 }
@@ -106,9 +106,21 @@ SR_API int sr_session_destroy(void)
 
        sr_session_dev_remove_all();
 
+    sr_session_datafeed_callback_remove_all();
+
+    if (session->sources) {
+        g_free(session->sources);
+        session->sources = NULL;
+    }
+
+    if (session->pollfds) {
+        g_free(session->pollfds);
+        session->pollfds = NULL;
+    }
+
        /* TODO: Error checks needed? */
 
-       g_mutex_clear(&session->stop_mutex);
+//     g_mutex_clear(&session->stop_mutex);
 
        g_free(session);
        session = NULL;
@@ -259,10 +271,13 @@ static int sr_session_run_poll(void)
                         * 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)
+//                     g_mutex_lock(&session->stop_mutex);
+                       if (session->abort_session) {
                                sr_session_stop_sync();
-                       g_mutex_unlock(&session->stop_mutex);
+                               /* But once is enough. */
+                               session->abort_session = FALSE;
+                       }
+//                     g_mutex_unlock(&session->stop_mutex);
                }
        }
 
@@ -373,19 +388,10 @@ SR_PRIV int sr_session_stop_sync(void)
                sdi = l->data;
                if (sdi->driver) {
                        if (sdi->driver->dev_acquisition_stop)
-                               sdi->driver->dev_acquisition_stop(sdi, sdi);
+                sdi->driver->dev_acquisition_stop(sdi, NULL);
                }
        }
 
-       /*
-        * Some sources may not be necessarily associated with a device.
-        * Those sources may still be present even after stopping all devices.
-        * We need to make sure all sources are removed, or we risk running the
-        * session in an infinite loop.
-        */
-       while (session->num_sources)
-               sr_session_source_remove(session->sources[0].poll_object);
-
        return SR_OK;
 }
 
@@ -409,9 +415,9 @@ SR_API int sr_session_stop(void)
                return SR_ERR_BUG;
        }
 
-       g_mutex_lock(&session->stop_mutex);
+//     g_mutex_lock(&session->stop_mutex);
        session->abort_session = TRUE;
-       g_mutex_unlock(&session->stop_mutex);
+//     g_mutex_unlock(&session->stop_mutex);
 
        return SR_OK;
 }
@@ -512,7 +518,7 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
 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, const struct sr_dev_inst *sdi, gintptr poll_object)
 {
        struct source *new_sources, *s;
        GPollFD *new_pollfds;
@@ -542,7 +548,7 @@ static int _sr_session_source_add(GPollFD *pollfd, int timeout,
        s = &new_sources[session->num_sources++];
        s->timeout = timeout;
        s->cb = cb;
-       s->cb_data = cb_data;
+       s->cb_data = sdi;
        s->poll_object = poll_object;
        session->pollfds = new_pollfds;
        session->sources = new_sources;
@@ -567,14 +573,14 @@ static int _sr_session_source_add(GPollFD *pollfd, int timeout,
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
 SR_API int sr_session_source_add(int fd, int events, int timeout,
-               sr_receive_data_callback_t cb, void *cb_data)
+               sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi)
 {
        GPollFD p;
 
        p.fd = fd;
        p.events = events;
 
-       return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd);
+    return _sr_session_source_add(&p, timeout, cb, sdi, (gintptr)fd);
 }
 
 /**
@@ -589,10 +595,10 @@ SR_API int sr_session_source_add(int fd, int events, int timeout,
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
 SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
-               sr_receive_data_callback_t cb, void *cb_data)
+               sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi)
 {
-       return _sr_session_source_add(pollfd, timeout, cb,
-                                     cb_data, (gintptr)pollfd);
+    return _sr_session_source_add(pollfd, timeout, cb,
+                      sdi, (gintptr)pollfd);
 }
 
 /**
@@ -608,7 +614,7 @@ SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
  *         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)
+               int timeout, sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi)
 {
        GPollFD p;
 
@@ -619,7 +625,7 @@ SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
        p.events = events;
 #endif
 
-       return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)channel);
+    return _sr_session_source_add(&p, timeout, cb, sdi, (gintptr)channel);
 }
 
 /**