struct source {
int64_t timeout; /* microseconds */
int64_t due; /* microseconds */
+
sr_receive_data_callback cb;
void *cb_data;
*/
gintptr poll_object;
- 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;
};
return stop;
}
-static int _sr_session_source_remove(struct sr_session *session, gintptr poll_object);
-
/**
* Poll the session's event sources.
*
int64_t start_time, stop_time, min_due, due;
int timeout_ms;
unsigned int i;
+ int k, fd_index;
int ret;
int fd;
int revents;
struct source *source;
GPollFD *pollfd;
gintptr poll_object;
-#ifdef HAVE_LIBUSB_1_0
+#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32)
int64_t usb_timeout;
int64_t usb_due;
struct timeval tv;
min_due = source->due;
source->triggered = FALSE;
}
-#ifdef HAVE_LIBUSB_1_0
+#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32)
usb_due = INT64_MAX;
if (session->ctx->usb_source_present) {
ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv);
triggered = FALSE;
stopped = FALSE;
+ fd_index = 0;
for (i = 0; i < session->sources->len; ++i) {
source = &g_array_index(session->sources, struct source, i);
- if (source->triggered)
- continue; /* already handled */
poll_object = source->poll_object;
fd = (int)poll_object;
revents = 0;
- if (i < session->pollfds->len) {
- pollfd = &g_array_index(session->pollfds, GPollFD, i);
+ for (k = 0; k < source->num_fds; ++k) {
+ pollfd = &g_array_index(session->pollfds,
+ GPollFD, fd_index + k);
fd = pollfd->fd;
- if (ret > 0)
- revents = pollfd->revents;
+ 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;
+
due = source->due;
-#ifdef HAVE_LIBUSB_1_0
- if (source->is_usb && usb_due < due)
+#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32)
+ if (usb_due < due && source->poll_object
+ == (gintptr)session->ctx->libusb_ctx)
due = usb_due;
#endif
if (revents == 0 && stop_time < due)
* Invoke the source's callback on an event or timeout.
*/
if (!source->cb(fd, revents, source->cb_data))
- _sr_session_source_remove(session, poll_object);
+ 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,
stopped = sr_session_check_aborted(session);
/* Restart loop as the sources list may have changed. */
+ fd_index = 0;
i = 0;
}
* Add an event source for a file descriptor.
*
* @param session The session to use. Must not be NULL.
- * @param pollfd The GPollFD.
+ * @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 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;
}
- /* Note: cb_data can be NULL, that's not a bug. */
-
+ 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.is_usb = is_usb;
+ src.num_fds = num_fds;
src.triggered = FALSE;
if (timeout >= 0) {
src.timeout = -1;
src.due = INT64_MAX;
}
+ g_array_append_val(session->sources, src);
- if (pollfd) {
- /* I/O source */
- g_array_insert_val(session->sources, session->pollfds->len, src);
- g_array_append_vals(session->pollfds, pollfd, 1);
- } else {
- /* Timer source */
- g_array_append_val(session->sources, src);
- }
+ if (num_fds > 0)
+ g_array_append_vals(session->pollfds, pollfds, num_fds);
return SR_OK;
}
p.revents = 0;
return sr_session_source_add_internal(session,
- (fd < 0) ? NULL : &p, timeout, cb, cb_data, fd, FALSE);
+ &p, (fd < 0) ? 0 : 1, timeout, cb, cb_data, fd);
}
/**
sr_err("%s: pollfd was NULL", __func__);
return SR_ERR_ARG;
}
- return sr_session_source_add_internal(session, pollfd, timeout,
- cb, cb_data, (gintptr)pollfd, FALSE);
+ return sr_session_source_add_internal(session, pollfd, 1,
+ timeout, cb, cb_data, (gintptr)pollfd);
}
/**
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)
{
+ struct source *source;
unsigned int i;
+ int fd_index = 0;
for (i = 0; i < session->sources->len; ++i) {
- if (g_array_index(session->sources, struct source, i)
- .poll_object == poll_object) {
+ source = &g_array_index(session->sources, struct source, i);
+ 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);
- if (i < session->pollfds->len)
- g_array_remove_index(session->pollfds, i);
- break;
+ return SR_OK;
}
+ fd_index += source->num_fds;
}
- return SR_OK;
+ /* 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);
+
+ return SR_ERR_BUG;
}
/**
*/
SR_API int sr_session_source_remove(struct sr_session *session, int fd)
{
- return _sr_session_source_remove(session, fd);
+ return sr_session_source_remove_internal(session, fd);
}
/**
sr_err("%s: pollfd was NULL", __func__);
return SR_ERR_ARG;
}
- return _sr_session_source_remove(session, (gintptr)pollfd);
+ return sr_session_source_remove_internal(session, (gintptr)pollfd);
}
/**
sr_err("%s: channel was NULL", __func__);
return SR_ERR_ARG;
}
- return _sr_session_source_remove(session, (gintptr)channel);
+ 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