* This file is part of the libsigrok project.
*
* Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2015 Daniel Elstner <daniel.kitta@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
* @{
*/
-struct source {
- int timeout;
- sr_receive_data_callback cb;
- void *cb_data;
-
- /* This is used to keep track of the object (fd, pollfd or channel) which is
- * being polled and will be used to match the source when removing it again.
- */
- gintptr poll_object;
-};
-
struct datafeed_callback {
sr_datafeed_callback cb;
void *cb_data;
};
+/** Custom GLib event source for generic descriptor I/O.
+ * @internal
+ */
+struct fd_source {
+ GSource base;
+
+ int64_t timeout_us;
+ int64_t due_us;
+
+ /* Meta-data needed to keep track of installed sources */
+ struct sr_session *session;
+ void *key;
+
+ GPollFD pollfd;
+};
+
+/** FD event source prepare() method.
+ */
+static gboolean fd_source_prepare(GSource *source, int *timeout)
+{
+ int64_t now_us;
+ struct fd_source *fsource;
+ int remaining_ms;
+
+ fsource = (struct fd_source *)source;
+
+ if (fsource->timeout_us >= 0) {
+ now_us = g_source_get_time(source);
+
+ if (fsource->due_us == 0) {
+ /* First-time initialization of the expiration time */
+ fsource->due_us = now_us + fsource->timeout_us;
+ }
+ remaining_ms = (MAX(0, fsource->due_us - now_us) + 999) / 1000;
+ } else {
+ remaining_ms = -1;
+ }
+ *timeout = remaining_ms;
+
+ return (remaining_ms == 0);
+}
+
+/** FD event source check() method.
+ */
+static gboolean fd_source_check(GSource *source)
+{
+ struct fd_source *fsource;
+ unsigned int revents;
+
+ fsource = (struct fd_source *)source;
+ revents = fsource->pollfd.revents;
+
+ return (revents != 0 || (fsource->timeout_us >= 0
+ && fsource->due_us <= g_source_get_time(source)));
+}
+
+/** FD event source dispatch() method.
+ */
+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)
+ (fsource->pollfd.fd, revents, user_data);
+
+ if (fsource->timeout_us >= 0 && G_LIKELY(keep)
+ && G_LIKELY(!g_source_is_destroyed(source)))
+ fsource->due_us = g_source_get_time(source)
+ + fsource->timeout_us;
+ return keep;
+}
+
+/** FD event source finalize() method.
+ */
+static void fd_source_finalize(GSource *source)
+{
+ struct fd_source *fsource;
+
+ fsource = (struct fd_source *)source;
+
+ sr_dbg("%s: key %p", __func__, fsource->key);
+
+ sr_session_source_destroyed(fsource->session, fsource->key, source);
+}
+
+/** Create an event source for I/O on a file descriptor.
+ *
+ * In order to maintain API compatibility, this event source also doubles
+ * as a timer event 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 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,
+ gintptr fd, int events, int timeout_ms)
+{
+ static GSourceFuncs fd_source_funcs = {
+ .prepare = &fd_source_prepare,
+ .check = &fd_source_check,
+ .dispatch = &fd_source_dispatch,
+ .finalize = &fd_source_finalize
+ };
+ GSource *source;
+ struct fd_source *fsource;
+
+ source = g_source_new(&fd_source_funcs, sizeof(struct fd_source));
+ fsource = (struct fd_source *)source;
+
+ g_source_set_name(source, (fd < 0) ? "timer" : "fd");
+
+ if (timeout_ms >= 0) {
+ fsource->timeout_us = 1000 * (int64_t)timeout_ms;
+ fsource->due_us = 0;
+ } else {
+ fsource->timeout_us = -1;
+ fsource->due_us = INT64_MAX;
+ }
+ fsource->session = session;
+ fsource->key = key;
+
+ fsource->pollfd.fd = fd;
+ fsource->pollfd.events = events;
+ fsource->pollfd.revents = 0;
+
+ if (fd >= 0)
+ g_source_add_poll(source, &fsource->pollfd);
+
+ return source;
+}
+
/**
* Create a new session.
*
session = g_malloc0(sizeof(struct sr_session));
session->ctx = ctx;
- session->source_timeout = -1;
- session->running = FALSE;
- session->abort_session = FALSE;
- g_mutex_init(&session->stop_mutex);
+
+ g_mutex_init(&session->main_mutex);
+
+ /* To maintain API compatibility, we need a lookup table
+ * which maps poll_object IDs to GSource* pointers.
+ */
+ session->event_sources = g_hash_table_new(NULL, NULL);
*new_session = session;
}
sr_session_dev_remove_all(session);
- g_mutex_clear(&session->stop_mutex);
- if (session->trigger)
- sr_trigger_free(session->trigger);
-
g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
+ g_hash_table_unref(session->event_sources);
+
+ g_mutex_clear(&session->main_mutex);
+
g_free(session);
return SR_OK;
return SR_OK;
}
-/**
- * Call every device in the current session's callback.
- *
- * For sessions not driven by select loops such as sr_session_run(),
- * but driven by another scheduler, this can be used to poll the devices
- * from within that scheduler.
- *
- * @param session The session to use. Must not be NULL.
- * @param block If TRUE, this call will wait for any of the session's
- * sources to fire an event on the file descriptors, or
- * any of their timeouts to activate. In other words, this
- * can be used as a select loop.
- * If FALSE, all sources have their callback run, regardless
- * of file descriptor or timeout status.
- *
- * @retval SR_OK Success.
- * @retval SR_ERR Error occurred.
- */
-static int sr_session_iteration(struct sr_session *session, gboolean block)
-{
- unsigned int i;
- int ret, timeout;
-#ifdef HAVE_LIBUSB_1_0
- int usb_timeout;
- struct timeval tv;
-#endif
-
- timeout = block ? session->source_timeout : 0;
-
-#ifdef HAVE_LIBUSB_1_0
- if (session->ctx->usb_source_present) {
- ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv);
- if (ret < 0) {
- sr_err("Error getting libusb timeout: %s",
- libusb_error_name(ret));
- return SR_ERR;
- } else if (ret == 1) {
- usb_timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
- timeout = MIN(timeout, usb_timeout);
- }
- }
-#endif
-
- ret = g_poll(session->pollfds, session->num_sources, 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 timed out and this source
- * asked for that timeout.
- */
- if (!session->sources[i].cb(session->pollfds[i].fd,
- session->pollfds[i].revents,
- session->sources[i].cb_data))
- sr_session_source_remove(session,
- 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(session);
- /* But once is enough. */
- session->abort_session = FALSE;
- }
- g_mutex_unlock(&session->stop_mutex);
- }
-
- return SR_OK;
-}
-
static int verify_trigger(struct sr_trigger *trigger)
{
struct sr_trigger_stage *stage;
return SR_OK;
}
+/** Set up the main context the session will be executing in.
+ *
+ * Must be called just before the session starts, by the thread which
+ * will execute the session main loop. Once acquired, the main context
+ * pointer is immutable for the duration of the session run.
+ */
+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;
+ }
+
+ g_mutex_lock(&session->main_mutex);
+
+ def_context = g_main_context_get_thread_default();
+
+ if (!def_context)
+ def_context = g_main_context_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);
+
+ 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.");
+
+ session->main_context = g_main_context_new();
+ session->main_context_is_default = FALSE;
+ }
+ g_mutex_unlock(&session->main_mutex);
+
+ return SR_OK;
+}
+
+/** Unset the main context used for the current session run.
+ *
+ * Must be called right after stopping the session. Note that if the
+ * session is stopped asynchronously, the main loop may still be running
+ * after the main context has been unset. This is OK as long as no new
+ * event sources are created -- the main loop holds its own reference
+ * to the main context.
+ */
+static int unset_main_context(struct sr_session *session)
+{
+ int ret;
+
+ g_mutex_lock(&session->main_mutex);
+
+ if (session->main_context) {
+ if (!session->main_context_is_default)
+ g_main_context_unref(session->main_context);
+
+ session->main_context = NULL;
+ ret = SR_OK;
+ } else {
+ /* May happen if the set/unset calls are not matched.
+ */
+ sr_err("No main context to unset.");
+ ret = SR_ERR;
+ }
+ g_mutex_unlock(&session->main_mutex);
+
+ return ret;
+}
+
/**
* Start a session.
*
if (session->trigger && verify_trigger(session->trigger) != SR_OK)
return SR_ERR;
+ ret = set_main_context(session);
+ if (ret != SR_OK)
+ return ret;
+
+ session->running = TRUE;
+
sr_info("Starting.");
- ret = SR_OK;
for (l = session->devs; l; l = l->next) {
sdi = l->data;
enabled_channels = 0;
}
}
+ if (ret != SR_OK) {
+ unset_main_context(session);
+ session->running = FALSE;
+ }
/* TODO: What if there are multiple devices? Which return code? */
return ret;
*
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid session passed.
+ * @retval SR_ERR Error during event processing.
*
* @since 0.4.0
*/
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;
}
- session->running = TRUE;
+ 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.");
- /* Do we have real sources? */
- if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
- /* Dummy source, freewheel over it. */
- while (session->num_sources)
- session->sources[0].cb(-1, 0, session->sources[0].cb_data);
- } else {
- /* Real sources, use g_poll() main loop. */
- while (session->num_sources)
- sr_session_iteration(session, TRUE);
- }
+ session->main_loop = g_main_loop_new(session->main_context, FALSE);
+ g_mutex_unlock(&session->main_mutex);
+
+ g_main_loop_run(session->main_loop);
+
+ g_main_loop_unref(session->main_loop);
+ session->main_loop = NULL;
return SR_OK;
}
-/**
- * Stop a session.
- *
- * The session is stopped immediately, with all acquisition sessions 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.
- *
- * @param session The session to use. Must not be NULL.
- *
- * @retval SR_OK Success.
- * @retval SR_ERR_ARG Invalid session passed.
- *
- * @private
- */
-SR_PRIV int sr_session_stop_sync(struct sr_session *session)
+static gboolean session_stop_sync(void *user_data)
{
+ struct sr_session *session;
struct sr_dev_inst *sdi;
- GSList *l;
+ GSList *node;
- if (!session) {
- sr_err("%s: session was NULL", __func__);
- return SR_ERR_ARG;
- }
+ session = user_data;
+
+ if (!session->running)
+ return G_SOURCE_REMOVE;
sr_info("Stopping.");
- for (l = session->devs; l; l = l->next) {
- sdi = l->data;
- if (sdi->driver) {
- if (sdi->driver->dev_acquisition_stop)
- sdi->driver->dev_acquisition_stop(sdi, sdi);
- }
+ 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);
}
session->running = FALSE;
- return SR_OK;
+ return G_SOURCE_REMOVE;
}
/**
*
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid session passed.
+ * @retval SR_ERR Other error.
*
* @since 0.4.0
*/
{
if (!session) {
sr_err("%s: session was NULL", __func__);
- return SR_ERR_BUG;
+ return SR_ERR_ARG;
}
+ g_mutex_lock(&session->main_mutex);
- g_mutex_lock(&session->stop_mutex);
- session->abort_session = TRUE;
- g_mutex_unlock(&session->stop_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?");
+ }
+ g_mutex_unlock(&session->main_mutex);
- return SR_OK;
+ return unset_main_context(session);
}
/**
* Add an event source for a file descriptor.
*
* @param session The session to use. Must not be NULL.
- * @param pollfd The GPollFD.
- * @param[in] timeout Max time to wait before the callback is called,
- * ignored if 0.
- * @param cb Callback function to add. Must not be NULL.
- * @param cb_data Data for the callback function. Can be NULL.
- * @param poll_object TODO.
- *
+ * @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.
*/
-static int _sr_session_source_add(struct sr_session *session, GPollFD *pollfd,
- int timeout, sr_receive_data_callback cb, void *cb_data, gintptr poll_object)
+SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
+ void *key, GSource *source)
{
- struct source *new_sources, *s;
- GPollFD *new_pollfds;
+ int ret;
+ /*
+ * This must not ever happen, since the source has already been
+ * created and its finalize() method will remove the key for the
+ * already installed source. (Well it would, if we did not have
+ * another sanity check there.)
+ */
+ if (g_hash_table_contains(session->event_sources, key)) {
+ sr_err("Event source with key %p already exists.", key);
+ return SR_ERR_BUG;
+ }
+ g_hash_table_insert(session->event_sources, key, source);
- if (!cb) {
- sr_err("%s: cb was NULL", __func__);
- return SR_ERR_ARG;
+ 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);
- /* Note: cb_data can be NULL, that's not a bug. */
+ return ret;
+}
+
+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)
+{
+ GSource *source;
+ int ret;
- new_pollfds = g_realloc(session->pollfds,
- sizeof(GPollFD) * (session->num_sources + 1));
- new_sources = g_realloc(session->sources, sizeof(struct source) *
- (session->num_sources + 1));
+ source = fd_source_new(session, key, fd, events, timeout);
+ if (!source)
+ return SR_ERR;
- 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;
- session->pollfds = new_pollfds;
- session->sources = new_sources;
+ g_source_set_callback(source, (GSourceFunc)cb, cb_data, NULL);
- if (timeout != session->source_timeout && timeout > 0
- && (session->source_timeout == -1 || timeout < session->source_timeout))
- session->source_timeout = timeout;
+ ret = sr_session_source_add_internal(session, key, source);
+ g_source_unref(source);
- return SR_OK;
+ return ret;
}
/**
* Add an event source for a file descriptor.
*
* @param session The session to use. Must not be NULL.
- * @param fd The file descriptor.
+ * @param fd The file descriptor, or a negative value to create a timer source.
* @param events Events to check for.
- * @param timeout Max time to wait before the callback is called, ignored if 0.
+ * @param timeout Max time in ms to wait before the callback is called,
+ * or -1 to wait indefinitely.
* @param cb Callback function to add. Must not be NULL.
* @param cb_data Data for the callback function. Can be NULL.
*
SR_API int sr_session_source_add(struct sr_session *session, int fd,
int events, int timeout, sr_receive_data_callback cb, void *cb_data)
{
- GPollFD p;
-
- p.fd = fd;
- p.events = events;
- p.revents = 0;
-
- return _sr_session_source_add(session, &p, timeout, cb, cb_data, (gintptr)fd);
+ if (fd < 0 && timeout < 0) {
+ sr_err("Cannot create timer source without timeout.");
+ return SR_ERR_ARG;
+ }
+ return sr_session_fd_source_add(session, GINT_TO_POINTER(fd),
+ fd, events, timeout, cb, cb_data);
}
/**
* Add an event source for a GPollFD.
*
* @param session The session to use. Must not be NULL.
- * @param pollfd The GPollFD.
- * @param timeout Max time to wait before the callback is called, ignored if 0.
+ * @param pollfd The GPollFD. Must not be NULL.
+ * @param timeout Max time in ms to wait before the callback is called,
+ * or -1 to wait indefinitely.
* @param cb Callback function to add. Must not be NULL.
* @param cb_data Data for the callback function. Can be NULL.
*
GPollFD *pollfd, int timeout, sr_receive_data_callback cb,
void *cb_data)
{
- return _sr_session_source_add(session, pollfd, timeout, cb,
- cb_data, (gintptr)pollfd);
+ if (!pollfd) {
+ sr_err("%s: pollfd was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ return sr_session_fd_source_add(session, pollfd, pollfd->fd,
+ pollfd->events, timeout, cb, cb_data);
}
/**
* @param session The session to use. Must not be NULL.
* @param channel The GIOChannel.
* @param events Events to poll on.
- * @param timeout Max time to wait before the callback is called, ignored if 0.
+ * @param timeout Max time in ms to wait before the callback is called,
+ * or -1 to wait indefinitely.
* @param cb Callback function to add. Must not be NULL.
* @param cb_data Data for the callback function. Can be NULL.
*
GIOChannel *channel, int events, int timeout,
sr_receive_data_callback cb, void *cb_data)
{
- GPollFD p;
+ GPollFD pollfd;
-#ifdef _WIN32
- g_io_channel_win32_make_pollfd(channel, events, &p);
+ if (!channel) {
+ sr_err("%s: channel was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ /* 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
+ g_io_channel_win32_make_pollfd(channel, events, &pollfd);
#else
- p.fd = g_io_channel_unix_get_fd(channel);
- p.events = events;
- p.revents = 0;
+ pollfd.fd = g_io_channel_unix_get_fd(channel);
+ pollfd.events = events;
#endif
-
- return _sr_session_source_add(session, &p, timeout, cb, cb_data, (gintptr)channel);
+ return sr_session_fd_source_add(session, channel, pollfd.fd,
+ pollfd.events, timeout, cb, cb_data);
}
/**
- * Remove the source belonging to the specified channel.
+ * Remove the source identified by the specified poll object.
*
* @param session The session to use. Must not be NULL.
- * @param poll_object The channel for which the source should be removed.
+ * @param key The key by which the source is identified.
*
* @retval SR_OK Success
- * @retval SR_ERR_ARG Invalid arguments
- * @retval SR_ERR_BUG Internal error
+ * @retval SR_ERR_BUG No event source for poll_object found.
*/
-static int _sr_session_source_remove(struct sr_session *session, gintptr poll_object)
+SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
+ void *key)
{
- unsigned int old;
+ GSource *source;
- if (!session->sources || !session->num_sources) {
- sr_err("%s: sources was NULL", __func__);
+ source = g_hash_table_lookup(session->event_sources, key);
+ /*
+ * Trying to remove an already removed event source is problematic
+ * since the poll_object handle may have been reused in the meantime.
+ */
+ if (!source) {
+ sr_warn("Cannot remove non-existing event source %p.", key);
return SR_ERR_BUG;
}
-
- 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 == session->num_sources)
- return SR_OK;
-
- session->num_sources--;
-
- 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));
- }
-
- session->pollfds = g_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
- session->sources = g_realloc(session->sources, sizeof(struct source) * session->num_sources);
+ g_source_destroy(source);
return SR_OK;
}
*/
SR_API int sr_session_source_remove(struct sr_session *session, int fd)
{
- return _sr_session_source_remove(session, (gintptr)fd);
+ return sr_session_source_remove_internal(session, GINT_TO_POINTER(fd));
}
/**
*
* @param session The session to use. Must not be NULL.
* @param pollfd The poll descriptor for which the source should be removed.
- *
+ * Must not be NULL.
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
* SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
* internal errors.
SR_API int sr_session_source_remove_pollfd(struct sr_session *session,
GPollFD *pollfd)
{
- return _sr_session_source_remove(session, (gintptr)pollfd);
+ if (!pollfd) {
+ sr_err("%s: pollfd was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ return sr_session_source_remove_internal(session, pollfd);
}
/**
*
* @param session The session to use. Must not be NULL.
* @param channel The channel for which the source should be removed.
- *
+ * Must not be NULL.
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid argument.
* @return SR_ERR_BUG Internal error.
SR_API int sr_session_source_remove_channel(struct sr_session *session,
GIOChannel *channel)
{
- return _sr_session_source_remove(session, (gintptr)channel);
+ if (!channel) {
+ sr_err("%s: channel was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ return sr_session_source_remove_internal(session, channel);
+}
+
+/** Unregister an event source that has been destroyed.
+ *
+ * This is intended to be called from a source's finalize() method.
+ *
+ * @param session The session to use. Must not be NULL.
+ * @param key The key used to identify @a source.
+ * @param source The source object that was destroyed.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_BUG Event source for @a key does not match @a source.
+ */
+SR_PRIV int sr_session_source_destroyed(struct sr_session *session,
+ void *key, GSource *source)
+{
+ GSource *registered_source;
+
+ registered_source = g_hash_table_lookup(session->event_sources, key);
+ /*
+ * Trying to remove an already removed event source is problematic
+ * since the poll_object handle may have been reused in the meantime.
+ */
+ if (!registered_source) {
+ sr_err("No event source for key %p found.", key);
+ return SR_ERR_BUG;
+ }
+ if (registered_source != source) {
+ sr_err("Event source for key %p does not match"
+ " destroyed source.", key);
+ 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 (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;
}
static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy)
struct sr_datafeed_logic *logic_copy;
const struct sr_datafeed_analog *analog;
struct sr_datafeed_analog *analog_copy;
+ const struct sr_datafeed_analog2 *analog2;
+ struct sr_datafeed_analog2 *analog2_copy;
uint8_t *payload;
*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
analog_copy->mq = analog->mq;
analog_copy->unit = analog->unit;
analog_copy->mqflags = analog->mqflags;
+ analog_copy->data = g_malloc(analog->num_samples * sizeof(float));
memcpy(analog_copy->data, analog->data,
analog->num_samples * sizeof(float));
(*copy)->payload = analog_copy;
break;
+ case SR_DF_ANALOG2:
+ analog2 = packet->payload;
+ analog2_copy = g_malloc(sizeof(analog2));
+ analog2_copy->data = g_malloc(
+ analog2->encoding->unitsize * analog2->num_samples);
+ memcpy(analog2_copy->data, analog2->data,
+ analog2->encoding->unitsize * analog2->num_samples);
+ analog2_copy->num_samples = analog2->num_samples;
+ analog2_copy->encoding = g_memdup(analog2->encoding,
+ sizeof(struct sr_analog_encoding));
+ analog2_copy->meaning = g_memdup(analog2->meaning,
+ sizeof(struct sr_analog_meaning));
+ analog2_copy->meaning->channels = g_slist_copy(
+ analog2->meaning->channels);
+ analog2_copy->spec = g_memdup(analog2->spec,
+ sizeof(struct sr_analog_spec));
+ (*copy)->payload = analog2_copy;
+ break;
default:
sr_err("Unknown packet type %d", packet->type);
return SR_ERR;
projects / libsigrok.git / blobdiff