*/
struct source {
- int64_t due;
+ int64_t timeout; /* microseconds */
+ int64_t due; /* microseconds */
+
sr_receive_data_callback cb;
void *cb_data;
*/
gintptr poll_object;
- int timeout;
- gboolean is_usb;
+ /* Number of fds to poll for this source. This will be 0 for timer
+ * sources, 1 for normal I/O sources, and 1 or more for libusb I/O
+ * sources on Unix platforms.
+ */
+ int num_fds;
+
+ gboolean triggered;
};
struct datafeed_callback {
session = g_malloc0(sizeof(struct sr_session));
session->ctx = ctx;
- session->running = FALSE;
- session->abort_session = FALSE;
+
+ session->sources = g_array_new(FALSE, FALSE, sizeof(struct source));
+ session->pollfds = g_array_new(FALSE, FALSE, sizeof(GPollFD));
+
g_mutex_init(&session->stop_mutex);
*new_session = session;
g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
+ g_array_unref(session->pollfds);
+ g_array_unref(session->sources);
+
g_free(session);
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.
+ * Poll the session's event sources.
*
* @param session The session to use. Must not be NULL.
* @retval SR_OK Success.
*/
static int sr_session_iteration(struct sr_session *session)
{
- int64_t start_time;
- int64_t stop_time;
- int64_t min_due;
- int64_t due;
+ int64_t start_time, stop_time, min_due, due;
+ int timeout_ms;
unsigned int i;
- int ret, timeout;
+ int k, fd_index;
+ int ret;
+ int fd;
int revents;
- gboolean stop_checked;
- gboolean stopped;
+ gboolean triggered, stopped;
struct source *source;
GPollFD *pollfd;
gintptr poll_object;
-#ifdef HAVE_LIBUSB_1_0
+#if HAVE_LIBUSB_1_0
+ int64_t usb_timeout;
int64_t usb_due;
struct timeval tv;
#endif
- if (session->num_sources <= 0) {
+ if (session->sources->len == 0) {
sr_session_check_aborted(session);
return SR_OK;
}
start_time = g_get_monotonic_time();
min_due = INT64_MAX;
- for (i = 0; i < session->num_sources; ++i) {
- if (session->sources[i].due < min_due)
- min_due = session->sources[i].due;
+ for (i = 0; i < session->sources->len; ++i) {
+ source = &g_array_index(session->sources, struct source, i);
+ if (source->due < min_due)
+ min_due = source->due;
+ source->triggered = FALSE;
}
-#ifdef HAVE_LIBUSB_1_0
+#if HAVE_LIBUSB_1_0
usb_due = INT64_MAX;
if (session->ctx->usb_source_present) {
ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv);
libusb_error_name(ret));
return SR_ERR;
} else if (ret == 1) {
- usb_due = start_time + tv.tv_usec
- + (int64_t)tv.tv_sec * G_USEC_PER_SEC;
+ usb_timeout = (int64_t)tv.tv_sec * G_USEC_PER_SEC
+ + tv.tv_usec;
+ usb_due = start_time + usb_timeout;
if (usb_due < min_due)
min_due = usb_due;
+
+ sr_spew("poll: next USB timeout %g ms",
+ 1e-3 * usb_timeout);
}
}
#endif
- if (min_due > start_time)
- timeout = (min_due == INT64_MAX) ? -1
- : MIN((min_due - start_time + 999) / 1000, INT_MAX);
+ if (min_due == INT64_MAX)
+ timeout_ms = -1;
+ else if (min_due > start_time)
+ timeout_ms = MIN((min_due - start_time + 999) / 1000, INT_MAX);
else
- timeout = 0;
+ timeout_ms = 0;
+
+ sr_spew("poll enter: %u sources, %u fds, %d ms timeout",
+ session->sources->len, session->pollfds->len, timeout_ms);
- ret = g_poll(session->pollfds, session->num_sources, timeout);
+ ret = g_poll((GPollFD *)session->pollfds->data,
+ session->pollfds->len, timeout_ms);
#ifdef G_OS_UNIX
if (ret < 0 && errno != EINTR) {
sr_err("Error in poll: %s", g_strerror(errno));
}
#endif
stop_time = g_get_monotonic_time();
- stop_checked = FALSE;
+
+ sr_spew("poll leave: %g ms elapsed, %d events",
+ 1e-3 * (stop_time - start_time), ret);
+
+ triggered = FALSE;
stopped = FALSE;
+ fd_index = 0;
+
+ for (i = 0; i < session->sources->len; ++i) {
+ source = &g_array_index(session->sources, struct source, i);
+
+ poll_object = source->poll_object;
+ fd = (int)poll_object;
+ revents = 0;
+
+ for (k = 0; k < source->num_fds; ++k) {
+ pollfd = &g_array_index(session->pollfds,
+ GPollFD, fd_index + k);
+ fd = pollfd->fd;
+ revents |= pollfd->revents;
+ }
+ fd_index += source->num_fds;
+
+ if (source->triggered)
+ continue; /* already handled */
+ if (ret > 0 && revents == 0)
+ continue; /* skip timeouts if any I/O event occurred */
+
+ /* Make invalid to avoid confusion in case of multiple FDs. */
+ if (source->num_fds > 1)
+ fd = -1;
+ if (ret <= 0)
+ revents = 0;
- for (i = 0; i < session->num_sources; i++) {
- source = &session->sources[i];
- pollfd = &session->pollfds[i];
- revents = (ret > 0) ? pollfd->revents : 0;
due = source->due;
-#ifdef HAVE_LIBUSB_1_0
- if (source->is_usb && usb_due < due)
+#if HAVE_LIBUSB_1_0
+ if (usb_due < due && poll_object
+ == (gintptr)session->ctx->libusb_ctx)
due = usb_due;
#endif
if (revents == 0 && stop_time < due)
* The source may be gone after the callback returns,
* so access any data now that needs accessing.
*/
- poll_object = source->poll_object;
- if (source->timeout > 0)
- source->due = stop_time + INT64_C(1000) * source->timeout;
- pollfd->revents = 0;
+ if (source->timeout >= 0)
+ source->due = stop_time + source->timeout;
+ source->triggered = TRUE;
+ triggered = TRUE;
/*
* Invoke the source's callback on an event or timeout.
*/
- if (!source->cb(pollfd->fd, revents, source->cb_data))
- sr_session_source_remove(session, poll_object);
+ if (!source->cb(fd, revents, source->cb_data))
+ sr_session_source_remove_internal(session, 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.
*/
- if (!stopped) {
+ if (!stopped)
stopped = sr_session_check_aborted(session);
- stop_checked = TRUE;
- }
+
/* Restart loop as the sources list may have changed. */
+ fd_index = 0;
i = 0;
}
- if (!stop_checked)
+
+ /* Check for abort at least once per iteration. */
+ if (!triggered)
sr_session_check_aborted(session);
return SR_OK;
*
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid session passed.
+ * @retval SR_ERR Error during event processing.
*
* @since 0.4.0
*/
SR_API int sr_session_run(struct sr_session *session)
{
+ int ret;
+
if (!session) {
sr_err("%s: session was NULL", __func__);
return SR_ERR_ARG;
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);
+ /* Poll event sources until none are left. */
+ while (session->sources->len > 0) {
+ ret = sr_session_iteration(session);
+ if (ret != SR_OK)
+ return ret;
}
-
return SR_OK;
}
* 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[in] pollfds The FDs to poll, or NULL if @a num_fds is 0.
+ * @param[in] num_fds Number of FDs in the array.
+ * @param[in] 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.
* @param poll_object Handle by which the source is identified
- * @param is_usb TRUE for a libusb polling source
*
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid argument.
+ * @retval SR_ERR An event source for @a poll_object is already installed.
*/
SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
- GPollFD *pollfd, int timeout, sr_receive_data_callback cb,
- void *cb_data, gintptr poll_object, gboolean is_usb)
+ const GPollFD *pollfds, int num_fds, int timeout,
+ sr_receive_data_callback cb, void *cb_data,
+ gintptr poll_object)
{
- struct source *new_sources, *s;
- GPollFD *new_pollfds;
+ struct source src;
+ unsigned int i;
+ /* Note: cb_data can be NULL, that's not a bug. */
if (!cb) {
sr_err("%s: cb was NULL", __func__);
return SR_ERR_ARG;
}
+ if (!pollfds && num_fds != 0) {
+ sr_err("%s: pollfds was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ /* Make sure that poll_object is unique.
+ */
+ for (i = 0; i < session->sources->len; ++i) {
+ if (g_array_index(session->sources, struct source, i)
+ .poll_object == poll_object) {
+ sr_err("Event source for object %" G_GINTPTR_FORMAT
+ " already installed.", poll_object);
+ return SR_ERR;
+ }
+ }
+ src.cb = cb;
+ src.cb_data = cb_data;
+ src.poll_object = poll_object;
+ src.num_fds = num_fds;
+ src.triggered = FALSE;
+
+ if (timeout >= 0) {
+ src.timeout = INT64_C(1000) * timeout;
+ src.due = g_get_monotonic_time() + src.timeout;
+ } else {
+ src.timeout = -1;
+ src.due = INT64_MAX;
+ }
+ g_array_append_val(session->sources, src);
- /* Note: cb_data can be NULL, that's not a bug. */
-
- 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));
-
- new_pollfds[session->num_sources] = *pollfd;
- s = &new_sources[session->num_sources++];
- if (timeout > 0)
- s->due = g_get_monotonic_time() + INT64_C(1000) * timeout;
- else
- s->due = INT64_MAX;
- s->cb = cb;
- s->cb_data = cb_data;
- s->poll_object = poll_object;
- s->timeout = timeout;
- s->is_usb = is_usb;
- session->pollfds = new_pollfds;
- session->sources = new_sources;
+ if (num_fds > 0)
+ g_array_append_vals(session->pollfds, pollfds, num_fds);
return SR_OK;
}
* @param session The session to use. Must not be NULL.
* @param fd The file descriptor.
* @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.
*
{
GPollFD p;
+ if (fd < 0 && timeout < 0) {
+ sr_err("Timer source without timeout would block indefinitely");
+ return SR_ERR_ARG;
+ }
p.fd = fd;
p.events = events;
p.revents = 0;
- return sr_session_source_add_internal(session, &p, timeout,
- cb, cb_data, fd, FALSE);
+ return sr_session_source_add_internal(session,
+ &p, (fd < 0) ? 0 : 1, timeout, cb, cb_data, fd);
}
/**
* 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_internal(session, pollfd, timeout,
- cb, cb_data, (gintptr)pollfd, FALSE);
+ if (!pollfd) {
+ sr_err("%s: pollfd was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+ return sr_session_source_add_internal(session, pollfd, 1,
+ timeout, cb, cb_data, (gintptr)pollfd);
}
/**
* @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.
*
{
GPollFD p;
-#ifdef _WIN32
+#ifdef G_OS_WIN32
g_io_channel_win32_make_pollfd(channel, events, &p);
#else
p.fd = g_io_channel_unix_get_fd(channel);
p.events = events;
p.revents = 0;
#endif
- return sr_session_source_add_internal(session, &p, timeout, cb,
- cb_data, (gintptr)channel, FALSE);
+ return sr_session_source_add_internal(session, &p, 1,
+ timeout, cb, cb_data, (gintptr)channel);
}
/**
- * 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.
*
* @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,
+ gintptr poll_object)
{
- unsigned int old;
-
- if (!session->sources || !session->num_sources) {
- sr_err("%s: sources was NULL", __func__);
- 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;
+ struct source *source;
+ unsigned int i;
+ int fd_index = 0;
- session->num_sources--;
+ for (i = 0; i < session->sources->len; ++i) {
+ source = &g_array_index(session->sources, struct source, i);
- 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));
+ if (source->poll_object == poll_object) {
+ if (source->num_fds > 0)
+ g_array_remove_range(session->pollfds,
+ fd_index, source->num_fds);
+ g_array_remove_index(session->sources, i);
+ /*
+ * This is a bit of a hack. To be removed when
+ * porting over to the GLib main loop.
+ */
+ if (poll_object == (gintptr)session->ctx->libusb_ctx)
+ session->ctx->usb_source_present = FALSE;
+ return SR_OK;
+ }
+ fd_index += source->num_fds;
}
+ /* Trying to remove an already removed event source is problematic
+ * since the poll_object handle may have been reused in the meantime.
+ */
+ sr_warn("Cannot remove non-existing event source for object %"
+ G_GINTPTR_FORMAT ".", poll_object);
- session->pollfds = g_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
- session->sources = g_realloc(session->sources, sizeof(struct source) * session->num_sources);
-
- return SR_OK;
+ return SR_ERR_BUG;
}
/**
*/
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, 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, (gintptr)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, (gintptr)channel);
}
static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy)
projects / libsigrok.git / blobdiff