#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
session->source_timeout = -1;
session->abort_session = FALSE;
- g_mutex_init(&session->stop_mutex);
+// g_mutex_init(&session->stop_mutex);
return session;
}
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;
return SR_OK;
}
-/**
- * Close a device instance.
- *
- * @param sdi The device instance to close. Must not be NULL. Also,
- * sdi->driver, sdi->driver->priv, and sdi->priv must not be NULL.
- */
-static void sr_dev_close(struct sr_dev_inst *sdi)
-{
- int ret;
-
- if (!sdi) {
- sr_err("Invalid device instance, can't close device.");
- return;
- }
-
- /* In the drivers sdi->priv is a 'struct dev_context *devc'. */
- if (!sdi->priv) {
- /*
- * Should be sr_err() in theory, but the 'demo' driver has
- * NULL for sdi->priv, so we use sr_dbg() until that's fixed.
- */
- sr_dbg("Invalid device context, can't close device.");
- return;
- }
-
- if (!sdi->driver) {
- sr_err("Invalid driver, can't close device.");
- return;
- }
-
- if (!sdi->driver->priv) {
- sr_err("Driver not initialized, can't close device.");
- return;
- }
-
- sr_spew("Closing '%s' device instance %d.", sdi->driver->name,
- sdi->index);
-
- if ((ret = sdi->driver->dev_close(sdi)) < 0)
- sr_err("Failed to close device instance: %d.", ret);
-}
-
/**
* Remove all the devices from the current session.
*
return SR_ERR_BUG;
}
- g_slist_free_full(session->devs, (GDestroyNotify)sr_dev_close);
+ g_slist_free(session->devs);
session->devs = NULL;
return SR_OK;
*/
SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
{
- int ret;
if (!sdi) {
sr_err("%s: sdi was NULL", __func__);
return SR_ERR_BUG;
}
- if ((ret = sdi->driver->dev_open((struct sr_dev_inst *)sdi)) != SR_OK) {
- sr_err("%s: dev_open failed (%d)", __func__, ret);
- return ret;
- }
-
session->devs = g_slist_append(session->devs, (gpointer)sdi);
return SR_OK;
* 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);
}
}
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;
}
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;
}
* 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;
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;
* 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);
}
/**
* 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);
}
/**
* 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;
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);
}
/**
projects / libsigrok.git / blobdiff