2010-04-02 18:18:27 +00:00
|
|
|
/*
|
2013-04-23 20:24:30 +00:00
|
|
|
* This file is part of the libsigrok project.
|
2010-04-02 18:18:27 +00:00
|
|
|
*
|
2012-02-13 13:31:51 +00:00
|
|
|
* Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
|
2015-09-10 07:46:45 +00:00
|
|
|
* Copyright (C) 2015 Daniel Elstner <daniel.kitta@gmail.com>
|
2010-04-02 18:18:27 +00:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2015-09-13 16:22:17 +00:00
|
|
|
#include <config.h>
|
2015-08-30 12:23:38 +00:00
|
|
|
#include <errno.h>
|
2010-04-02 18:18:27 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <string.h>
|
2011-01-30 01:40:55 +00:00
|
|
|
#include <glib.h>
|
2015-08-12 23:18:51 +00:00
|
|
|
#include <libsigrok/libsigrok.h>
|
2012-07-04 22:55:07 +00:00
|
|
|
#include "libsigrok-internal.h"
|
2011-01-24 06:46:16 +00:00
|
|
|
|
2014-04-25 16:40:59 +00:00
|
|
|
/** @cond PRIVATE */
|
2013-12-23 03:38:35 +00:00
|
|
|
#define LOG_PREFIX "session"
|
2014-04-25 16:40:59 +00:00
|
|
|
/** @endcond */
|
2013-01-29 11:55:00 +00:00
|
|
|
|
2012-10-21 22:30:12 +00:00
|
|
|
/**
|
|
|
|
* @file
|
|
|
|
*
|
|
|
|
* Creating, using, or destroying libsigrok sessions.
|
|
|
|
*/
|
|
|
|
|
2012-10-21 14:13:36 +00:00
|
|
|
/**
|
|
|
|
* @defgroup grp_session Session handling
|
|
|
|
*
|
|
|
|
* Creating, using, or destroying libsigrok sessions.
|
|
|
|
*
|
|
|
|
* @{
|
|
|
|
*/
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
struct datafeed_callback {
|
|
|
|
sr_datafeed_callback cb;
|
2012-02-29 21:32:34 +00:00
|
|
|
void *cb_data;
|
2015-09-10 07:46:45 +00:00
|
|
|
};
|
2012-06-30 18:54:44 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
/** Custom GLib event source for generic descriptor I/O.
|
2015-10-09 00:35:47 +00:00
|
|
|
* @see https://developer.gnome.org/glib/stable/glib-The-Main-Event-Loop.html
|
2015-09-10 07:46:45 +00:00
|
|
|
* @internal
|
|
|
|
*/
|
|
|
|
struct fd_source {
|
|
|
|
GSource base;
|
2015-08-30 19:43:30 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
int64_t timeout_us;
|
|
|
|
int64_t due_us;
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
/* Meta-data needed to keep track of installed sources */
|
|
|
|
struct sr_session *session;
|
|
|
|
void *key;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
GPollFD pollfd;
|
2013-04-15 20:08:55 +00:00
|
|
|
};
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
/** FD event source prepare() method.
|
2015-10-09 00:35:47 +00:00
|
|
|
* This is called immediately before poll().
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
|
|
|
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.
|
2015-10-09 00:35:47 +00:00
|
|
|
* This is called after poll() returns to check whether an event fired.
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
|
|
|
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.
|
2015-10-09 00:35:47 +00:00
|
|
|
* This is called if either prepare() or check() returned TRUE.
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
|
|
|
static gboolean fd_source_dispatch(GSource *source,
|
|
|
|
GSourceFunc callback, void *user_data)
|
|
|
|
{
|
|
|
|
struct fd_source *fsource;
|
|
|
|
unsigned int revents;
|
|
|
|
gboolean keep;
|
|
|
|
|
|
|
|
fsource = (struct fd_source *)source;
|
|
|
|
revents = fsource->pollfd.revents;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Create a new session.
|
2014-08-10 15:27:43 +00:00
|
|
|
*
|
2015-03-25 01:41:10 +00:00
|
|
|
* @param ctx The context in which to create the new session.
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param new_session This will contain a pointer to the newly created
|
|
|
|
* session if the return value is SR_OK, otherwise the value
|
|
|
|
* is undefined and should not be used. Must not be NULL.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-08-11 11:15:43 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2015-03-25 01:41:10 +00:00
|
|
|
SR_API int sr_session_new(struct sr_context *ctx,
|
|
|
|
struct sr_session **new_session)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2014-07-21 13:08:17 +00:00
|
|
|
struct sr_session *session;
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2014-08-11 11:15:43 +00:00
|
|
|
if (!new_session)
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
|
2014-07-21 13:08:17 +00:00
|
|
|
session = g_malloc0(sizeof(struct sr_session));
|
2012-07-06 21:23:31 +00:00
|
|
|
|
2015-03-25 01:43:30 +00:00
|
|
|
session->ctx = ctx;
|
2015-08-31 00:35:57 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_mutex_init(&session->main_mutex);
|
2015-08-31 00:35:57 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
/* 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);
|
2014-05-04 22:07:00 +00:00
|
|
|
|
2014-07-21 13:08:17 +00:00
|
|
|
*new_session = session;
|
2014-05-04 22:07:00 +00:00
|
|
|
|
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Destroy a session.
|
2012-01-02 13:15:25 +00:00
|
|
|
* This frees up all memory used by the session.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to destroy. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_destroy(struct sr_session *session)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2014-05-04 22:07:00 +00:00
|
|
|
sr_session_dev_remove_all(session);
|
2014-10-12 14:56:36 +00:00
|
|
|
g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
|
|
|
|
|
2015-11-26 02:04:39 +00:00
|
|
|
sr_session_datafeed_callback_remove_all(session);
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_hash_table_unref(session->event_sources);
|
|
|
|
|
|
|
|
g_mutex_clear(&session->main_mutex);
|
2015-08-31 00:35:57 +00:00
|
|
|
|
2010-04-02 18:18:27 +00:00
|
|
|
g_free(session);
|
2014-05-04 22:07:00 +00:00
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Remove all the devices from a session.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
|
|
|
* The session itself (i.e., the struct sr_session) is not free'd and still
|
|
|
|
* exists after this function returns.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_BUG Invalid session passed.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_dev_remove_all(struct sr_session *session)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2014-05-04 22:07:00 +00:00
|
|
|
struct sr_dev_inst *sdi;
|
|
|
|
GSList *l;
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (l = session->devs; l; l = l->next) {
|
|
|
|
sdi = (struct sr_dev_inst *) l->data;
|
|
|
|
sdi->session = NULL;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2013-04-28 20:35:42 +00:00
|
|
|
g_slist_free(session->devs);
|
2012-02-17 21:25:01 +00:00
|
|
|
session->devs = NULL;
|
2012-01-07 16:08:54 +00:00
|
|
|
|
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Add a device instance to a session.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to add to. Must not be NULL.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @param sdi The device instance to add to a session. Must not
|
2012-07-22 13:31:56 +00:00
|
|
|
* be NULL. Also, sdi->driver and sdi->driver->dev_open must
|
|
|
|
* not be NULL.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_dev_add(struct sr_session *session,
|
|
|
|
struct sr_dev_inst *sdi)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2013-09-21 15:44:49 +00:00
|
|
|
int ret;
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
if (!sdi) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: sdi was NULL", __func__);
|
2012-01-02 13:15:25 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
2012-03-18 11:57:34 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If sdi->session is not NULL, the device is already in this or
|
|
|
|
* another session. */
|
|
|
|
if (sdi->session) {
|
|
|
|
sr_err("%s: already assigned to session", __func__);
|
|
|
|
return SR_ERR_ARG;
|
2012-03-18 11:57:34 +00:00
|
|
|
}
|
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
/* If sdi->driver is NULL, this is a virtual device. */
|
|
|
|
if (!sdi->driver) {
|
2012-03-18 11:57:34 +00:00
|
|
|
/* Just add the device, don't run dev_open(). */
|
2015-10-09 00:35:47 +00:00
|
|
|
session->devs = g_slist_append(session->devs, sdi);
|
2014-05-04 22:07:00 +00:00
|
|
|
sdi->session = session;
|
2012-03-18 11:57:34 +00:00
|
|
|
return SR_OK;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
/* sdi->driver is non-NULL (i.e. we have a real device). */
|
|
|
|
if (!sdi->driver->dev_open) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: sdi->driver->dev_open was NULL", __func__);
|
2012-03-21 18:28:43 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
session->devs = g_slist_append(session->devs, sdi);
|
2014-05-04 22:07:00 +00:00
|
|
|
sdi->session = session;
|
2011-01-24 06:46:16 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
/* TODO: This is invalid if the session runs in a different thread.
|
|
|
|
* The usage semantics and restrictions need to be documented.
|
|
|
|
*/
|
2013-09-21 15:44:49 +00:00
|
|
|
if (session->running) {
|
2014-01-20 22:04:49 +00:00
|
|
|
/* Adding a device to a running session. Commit settings
|
|
|
|
* and start acquisition on that device now. */
|
|
|
|
if ((ret = sr_config_commit(sdi)) != SR_OK) {
|
|
|
|
sr_err("Failed to commit device settings before "
|
|
|
|
"starting acquisition in running session (%s)",
|
|
|
|
sr_strerror(ret));
|
|
|
|
return ret;
|
|
|
|
}
|
2016-03-27 22:40:16 +00:00
|
|
|
if ((ret = sdi->driver->dev_acquisition_start(sdi)) != SR_OK) {
|
2013-09-21 15:44:49 +00:00
|
|
|
sr_err("Failed to start acquisition of device in "
|
2014-01-20 22:04:49 +00:00
|
|
|
"running session (%s)", sr_strerror(ret));
|
|
|
|
return ret;
|
|
|
|
}
|
2013-09-21 15:44:49 +00:00
|
|
|
}
|
|
|
|
|
2011-01-29 15:23:12 +00:00
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2013-09-02 12:24:32 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* List all device instances attached to a session.
|
2013-09-02 12:24:32 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2013-09-02 12:24:32 +00:00
|
|
|
* @param devlist A pointer where the device instance list will be
|
|
|
|
* stored on return. If no devices are in the session,
|
|
|
|
* this will be NULL. Each element in the list points
|
|
|
|
* to a struct sr_dev_inst *.
|
|
|
|
* The list must be freed by the caller, but not the
|
|
|
|
* elements pointed to.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2013-09-02 12:24:32 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_dev_list(struct sr_session *session, GSList **devlist)
|
2013-09-02 12:24:32 +00:00
|
|
|
{
|
|
|
|
if (!session)
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
|
|
|
|
if (!devlist)
|
|
|
|
return SR_ERR_ARG;
|
2013-09-02 12:24:32 +00:00
|
|
|
|
|
|
|
*devlist = g_slist_copy(session->devs);
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
2015-11-26 01:30:42 +00:00
|
|
|
/**
|
|
|
|
* Remove a device instance from a session.
|
|
|
|
*
|
|
|
|
* @param session The session to remove from. Must not be NULL.
|
|
|
|
* @param sdi The device instance to remove from a session. Must not
|
|
|
|
* be NULL. Also, sdi->driver and sdi->driver->dev_open must
|
|
|
|
* not be NULL.
|
|
|
|
*
|
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
|
|
|
*
|
|
|
|
* @since 0.4.0
|
|
|
|
*/
|
|
|
|
SR_API int sr_session_dev_remove(struct sr_session *session,
|
|
|
|
struct sr_dev_inst *sdi)
|
|
|
|
{
|
|
|
|
if (!sdi) {
|
|
|
|
sr_err("%s: sdi was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If sdi->session is not session, the device is not in this
|
|
|
|
* session. */
|
|
|
|
if (sdi->session != session) {
|
|
|
|
sr_err("%s: not assigned to this session", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
|
|
|
|
session->devs = g_slist_remove(session->devs, sdi);
|
|
|
|
sdi->session = NULL;
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Remove all datafeed callbacks in a session.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_datafeed_callback_remove_all(struct sr_session *session)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2013-04-15 20:08:55 +00:00
|
|
|
g_slist_free_full(session->datafeed_callbacks, g_free);
|
2010-04-02 18:18:27 +00:00
|
|
|
session->datafeed_callbacks = NULL;
|
2012-01-07 16:08:54 +00:00
|
|
|
|
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Add a datafeed callback to a session.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2012-02-29 20:56:24 +00:00
|
|
|
* @param cb Function to call when a chunk of data is received.
|
2012-03-04 14:08:11 +00:00
|
|
|
* Must not be NULL.
|
2013-04-16 10:48:58 +00:00
|
|
|
* @param cb_data Opaque pointer passed in by the caller.
|
2012-02-13 02:36:32 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_BUG No session exists.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_datafeed_callback_add(struct sr_session *session,
|
|
|
|
sr_datafeed_callback cb, void *cb_data)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2013-04-15 20:08:55 +00:00
|
|
|
struct datafeed_callback *cb_struct;
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-03-04 14:08:11 +00:00
|
|
|
if (!cb) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: cb was NULL", __func__);
|
2012-03-04 14:08:11 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2014-11-21 18:02:10 +00:00
|
|
|
cb_struct = g_malloc0(sizeof(struct datafeed_callback));
|
2013-04-15 20:08:55 +00:00
|
|
|
cb_struct->cb = cb;
|
|
|
|
cb_struct->cb_data = cb_data;
|
|
|
|
|
2010-04-15 18:16:53 +00:00
|
|
|
session->datafeed_callbacks =
|
2013-04-15 20:08:55 +00:00
|
|
|
g_slist_append(session->datafeed_callbacks, cb_struct);
|
2012-01-07 16:08:54 +00:00
|
|
|
|
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2014-11-23 23:50:11 +00:00
|
|
|
/**
|
|
|
|
* Get the trigger assigned to this session.
|
|
|
|
*
|
|
|
|
* @param session The session to use.
|
|
|
|
*
|
|
|
|
* @retval NULL Invalid (NULL) session was passed to the function.
|
|
|
|
* @retval other The trigger assigned to this session (can be NULL).
|
|
|
|
*
|
|
|
|
* @since 0.4.0
|
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session)
|
2014-05-22 23:21:58 +00:00
|
|
|
{
|
2014-11-23 23:50:11 +00:00
|
|
|
if (!session)
|
|
|
|
return NULL;
|
|
|
|
|
2014-05-22 23:21:58 +00:00
|
|
|
return session->trigger;
|
|
|
|
}
|
|
|
|
|
2014-11-23 23:50:11 +00:00
|
|
|
/**
|
|
|
|
* Set the trigger of this session.
|
|
|
|
*
|
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
* @param trig The trigger to assign to this session. Can be NULL.
|
|
|
|
*
|
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
|
|
|
*
|
|
|
|
* @since 0.4.0
|
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_trigger_set(struct sr_session *session, struct sr_trigger *trig)
|
2014-05-22 23:21:58 +00:00
|
|
|
{
|
2014-11-23 23:50:11 +00:00
|
|
|
if (!session)
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
|
2014-05-22 23:21:58 +00:00
|
|
|
session->trigger = trig;
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int verify_trigger(struct sr_trigger *trigger)
|
|
|
|
{
|
|
|
|
struct sr_trigger_stage *stage;
|
|
|
|
struct sr_trigger_match *match;
|
|
|
|
GSList *l, *m;
|
|
|
|
|
|
|
|
if (!trigger->stages) {
|
|
|
|
sr_err("No trigger stages defined.");
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
sr_spew("Checking trigger:");
|
|
|
|
for (l = trigger->stages; l; l = l->next) {
|
|
|
|
stage = l->data;
|
|
|
|
if (!stage->matches) {
|
|
|
|
sr_err("Stage %d has no matches defined.", stage->stage);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
for (m = stage->matches; m; m = m->next) {
|
|
|
|
match = m->data;
|
|
|
|
if (!match->channel) {
|
|
|
|
sr_err("Stage %d match has no channel.", stage->stage);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
if (!match->match) {
|
|
|
|
sr_err("Stage %d match is not defined.", stage->stage);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
sr_spew("Stage %d match on channel %s, match %d", stage->stage,
|
|
|
|
match->channel->name, match->match);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
2015-03-20 13:36:47 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
/** 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)
|
|
|
|
{
|
2015-10-09 13:49:12 +00:00
|
|
|
GMainContext *main_context;
|
|
|
|
|
|
|
|
g_mutex_lock(&session->main_mutex);
|
2015-09-10 07:46:45 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
/* May happen if sr_session_start() is called a second time
|
|
|
|
* while the session is still running.
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
2015-10-09 00:35:47 +00:00
|
|
|
if (session->main_context) {
|
|
|
|
sr_err("Main context already set.");
|
2015-10-09 13:49:12 +00:00
|
|
|
|
|
|
|
g_mutex_unlock(&session->main_mutex);
|
2015-09-10 07:46:45 +00:00
|
|
|
return SR_ERR;
|
|
|
|
}
|
2015-10-09 13:49:12 +00:00
|
|
|
main_context = g_main_context_ref_thread_default();
|
2015-09-10 07:46:45 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2015-10-09 13:49:12 +00:00
|
|
|
if (g_main_context_acquire(main_context)) {
|
|
|
|
g_main_context_release(main_context);
|
2015-09-10 07:46:45 +00:00
|
|
|
|
|
|
|
sr_dbg("Using thread-default main context.");
|
|
|
|
} else {
|
2015-10-09 13:49:12 +00:00
|
|
|
g_main_context_unref(main_context);
|
2015-09-10 07:46:45 +00:00
|
|
|
|
2015-10-09 13:49:12 +00:00
|
|
|
sr_dbg("Creating our own main context.");
|
|
|
|
main_context = g_main_context_new();
|
2015-09-10 07:46:45 +00:00
|
|
|
}
|
2015-10-09 13:49:12 +00:00
|
|
|
session->main_context = main_context;
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
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) {
|
2015-10-09 13:49:12 +00:00
|
|
|
g_main_context_unref(session->main_context);
|
2015-09-10 07:46:45 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
static unsigned int session_source_attach(struct sr_session *session,
|
|
|
|
GSource *source)
|
|
|
|
{
|
|
|
|
unsigned int id = 0;
|
|
|
|
|
|
|
|
g_mutex_lock(&session->main_mutex);
|
|
|
|
|
|
|
|
if (session->main_context)
|
|
|
|
id = g_source_attach(source, session->main_context);
|
|
|
|
else
|
|
|
|
sr_err("Cannot add event source without main context.");
|
|
|
|
|
|
|
|
g_mutex_unlock(&session->main_mutex);
|
|
|
|
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Idle handler; invoked when the number of registered event sources
|
|
|
|
* for a running session drops to zero.
|
|
|
|
*/
|
|
|
|
static gboolean delayed_stop_check(void *data)
|
|
|
|
{
|
|
|
|
struct sr_session *session;
|
|
|
|
|
|
|
|
session = data;
|
|
|
|
session->stop_check_id = 0;
|
|
|
|
|
|
|
|
/* Session already ended? */
|
|
|
|
if (!session->running)
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
|
|
|
|
/* New event sources may have been installed in the meantime. */
|
|
|
|
if (g_hash_table_size(session->event_sources) != 0)
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
|
|
|
|
session->running = FALSE;
|
|
|
|
unset_main_context(session);
|
|
|
|
|
|
|
|
sr_info("Stopped.");
|
|
|
|
|
|
|
|
/* This indicates a bug in user code, since it is not valid to
|
|
|
|
* restart or destroy a session while it may still be running.
|
|
|
|
*/
|
|
|
|
if (!session->main_loop && !session->stopped_callback) {
|
|
|
|
sr_err("BUG: Session stop left unhandled.");
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
}
|
|
|
|
if (session->main_loop)
|
|
|
|
g_main_loop_quit(session->main_loop);
|
|
|
|
|
|
|
|
if (session->stopped_callback)
|
|
|
|
(*session->stopped_callback)(session->stopped_cb_data);
|
|
|
|
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int stop_check_later(struct sr_session *session)
|
|
|
|
{
|
|
|
|
GSource *source;
|
|
|
|
unsigned int source_id;
|
|
|
|
|
|
|
|
if (session->stop_check_id != 0)
|
|
|
|
return SR_OK; /* idle handler already installed */
|
|
|
|
|
|
|
|
source = g_idle_source_new();
|
|
|
|
g_source_set_callback(source, &delayed_stop_check, session, NULL);
|
|
|
|
|
|
|
|
source_id = session_source_attach(session, source);
|
|
|
|
session->stop_check_id = source_id;
|
|
|
|
|
|
|
|
g_source_unref(source);
|
|
|
|
|
|
|
|
return (source_id != 0) ? SR_OK : SR_ERR;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Start a session.
|
|
|
|
*
|
2015-10-09 00:35:47 +00:00
|
|
|
* When this function returns with a status code indicating success, the
|
|
|
|
* session is running. Use sr_session_stopped_callback_set() to receive
|
|
|
|
* notification upon completion, or call sr_session_run() to block until
|
|
|
|
* the session stops.
|
|
|
|
*
|
|
|
|
* Session events will be processed in the context of the current thread.
|
|
|
|
* If a thread-default GLib main context has been set, and is not owned by
|
|
|
|
* any other thread, it will be used. Otherwise, libsigrok will create its
|
|
|
|
* own main context for the current thread.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
2015-10-09 00:35:47 +00:00
|
|
|
* @retval SR_ERR Other error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_start(struct sr_session *session)
|
2011-01-31 21:34:14 +00:00
|
|
|
{
|
2012-07-22 13:31:56 +00:00
|
|
|
struct sr_dev_inst *sdi;
|
2014-09-10 16:21:51 +00:00
|
|
|
struct sr_channel *ch;
|
2015-10-09 00:35:47 +00:00
|
|
|
GSList *l, *c, *lend;
|
|
|
|
int ret;
|
2011-01-31 21:34:14 +00:00
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2014-05-04 22:07:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-02-17 21:25:01 +00:00
|
|
|
if (!session->devs) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session->devs was NULL; a session "
|
2012-01-02 13:15:25 +00:00
|
|
|
"cannot be started without devices.", __func__);
|
2014-05-04 22:07:00 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
if (session->running) {
|
|
|
|
sr_err("Cannot (re-)start session while it is still running.");
|
2014-05-22 23:21:58 +00:00
|
|
|
return SR_ERR;
|
2015-10-09 00:35:47 +00:00
|
|
|
}
|
2014-05-22 23:21:58 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
if (session->trigger) {
|
|
|
|
ret = verify_trigger(session->trigger);
|
|
|
|
if (ret != SR_OK)
|
|
|
|
return ret;
|
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
/* Check enabled channels and commit settings of all devices. */
|
2012-02-17 21:25:01 +00:00
|
|
|
for (l = session->devs; l; l = l->next) {
|
2012-07-22 13:31:56 +00:00
|
|
|
sdi = l->data;
|
2014-09-10 16:21:51 +00:00
|
|
|
for (c = sdi->channels; c; c = c->next) {
|
|
|
|
ch = c->data;
|
2015-10-09 00:35:47 +00:00
|
|
|
if (ch->enabled)
|
2014-09-10 16:21:51 +00:00
|
|
|
break;
|
|
|
|
}
|
2015-10-09 00:35:47 +00:00
|
|
|
if (!c) {
|
|
|
|
sr_err("%s device %s has no enabled channels.",
|
|
|
|
sdi->driver->name, sdi->connection_id);
|
|
|
|
return SR_ERR;
|
2014-09-10 16:21:51 +00:00
|
|
|
}
|
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
ret = sr_config_commit(sdi);
|
|
|
|
if (ret != SR_OK) {
|
|
|
|
sr_err("Failed to commit %s device %s settings "
|
|
|
|
"before starting acquisition.",
|
|
|
|
sdi->driver->name, sdi->connection_id);
|
|
|
|
return ret;
|
2014-01-20 22:04:49 +00:00
|
|
|
}
|
2015-10-09 00:35:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = set_main_context(session);
|
|
|
|
if (ret != SR_OK)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
sr_info("Starting.");
|
|
|
|
|
|
|
|
session->running = TRUE;
|
|
|
|
|
|
|
|
/* Have all devices start acquisition. */
|
|
|
|
for (l = session->devs; l; l = l->next) {
|
2016-04-15 14:26:43 +00:00
|
|
|
if (!(sdi = l->data)) {
|
|
|
|
sr_err("Device sdi was NULL, can't start session.");
|
|
|
|
ret = SR_ERR;
|
|
|
|
break;
|
|
|
|
}
|
2016-03-27 22:40:16 +00:00
|
|
|
ret = sdi->driver->dev_acquisition_start(sdi);
|
2015-10-09 00:35:47 +00:00
|
|
|
if (ret != SR_OK) {
|
|
|
|
sr_err("Could not start %s device %s acquisition.",
|
|
|
|
sdi->driver->name, sdi->connection_id);
|
2011-01-31 21:34:14 +00:00
|
|
|
break;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2011-01-31 21:34:14 +00:00
|
|
|
}
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
if (ret != SR_OK) {
|
2015-10-09 00:35:47 +00:00
|
|
|
/* If there are multiple devices, some of them may already have
|
|
|
|
* started successfully. Stop them now before returning. */
|
|
|
|
lend = l->next;
|
|
|
|
for (l = session->devs; l != lend; l = l->next) {
|
|
|
|
sdi = l->data;
|
2016-07-03 14:41:16 +00:00
|
|
|
sdi->driver->dev_acquisition_stop(sdi);
|
2015-10-09 00:35:47 +00:00
|
|
|
}
|
|
|
|
/* TODO: Handle delayed stops. Need to iterate the event
|
|
|
|
* sources... */
|
2015-09-10 07:46:45 +00:00
|
|
|
session->running = FALSE;
|
2015-10-09 00:35:47 +00:00
|
|
|
|
|
|
|
unset_main_context(session);
|
|
|
|
return ret;
|
2015-09-10 07:46:45 +00:00
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
if (g_hash_table_size(session->event_sources) == 0)
|
|
|
|
stop_check_later(session);
|
|
|
|
|
|
|
|
return SR_OK;
|
2011-01-31 21:34:14 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2015-10-09 00:35:47 +00:00
|
|
|
* Block until the running session stops.
|
|
|
|
*
|
|
|
|
* This is a convenience function which creates a GLib main loop and runs
|
|
|
|
* it to process session events until the session stops.
|
|
|
|
*
|
|
|
|
* Instead of using this function, applications may run their own GLib main
|
|
|
|
* loop, and use sr_session_stopped_callback_set() to receive notification
|
|
|
|
* when the session finished running.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
2015-10-09 00:35:47 +00:00
|
|
|
* @retval SR_ERR Other error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_run(struct sr_session *session)
|
2011-01-31 21:34:14 +00:00
|
|
|
{
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2014-05-04 22:07:00 +00:00
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2015-10-09 00:35:47 +00:00
|
|
|
if (!session->running) {
|
|
|
|
sr_err("No session running.");
|
|
|
|
return SR_ERR;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2015-09-10 07:46:45 +00:00
|
|
|
if (session->main_loop) {
|
|
|
|
sr_err("Main loop already created.");
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_mutex_lock(&session->main_mutex);
|
2015-10-09 00:35:47 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
if (!session->main_context) {
|
|
|
|
sr_err("Cannot run without main context.");
|
|
|
|
g_mutex_unlock(&session->main_mutex);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
session->main_loop = g_main_loop_new(session->main_context, FALSE);
|
2015-10-09 00:35:47 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_mutex_unlock(&session->main_mutex);
|
|
|
|
|
|
|
|
g_main_loop_run(session->main_loop);
|
|
|
|
|
|
|
|
g_main_loop_unref(session->main_loop);
|
|
|
|
session->main_loop = NULL;
|
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
2011-01-31 21:34:14 +00:00
|
|
|
}
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
static gboolean session_stop_sync(void *user_data)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
struct sr_session *session;
|
2012-07-22 13:31:56 +00:00
|
|
|
struct sr_dev_inst *sdi;
|
2015-09-10 07:46:45 +00:00
|
|
|
GSList *node;
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
session = user_data;
|
|
|
|
|
|
|
|
if (!session->running)
|
|
|
|
return G_SOURCE_REMOVE;
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_info("Stopping.");
|
2012-01-07 16:08:54 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
for (node = session->devs; node; node = node->next) {
|
|
|
|
sdi = node->data;
|
|
|
|
if (sdi->driver && sdi->driver->dev_acquisition_stop)
|
2016-03-27 22:40:16 +00:00
|
|
|
sdi->driver->dev_acquisition_stop(sdi);
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
return G_SOURCE_REMOVE;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2013-02-02 06:50:00 +00:00
|
|
|
/**
|
2014-05-04 22:07:00 +00:00
|
|
|
* Stop a session.
|
2013-02-02 06:50:00 +00:00
|
|
|
*
|
2015-10-09 00:35:47 +00:00
|
|
|
* This requests the drivers of each device participating in the session to
|
|
|
|
* abort the acquisition as soon as possible. Even after this function returns,
|
|
|
|
* event processing still continues until all devices have actually stopped.
|
|
|
|
*
|
|
|
|
* Use sr_session_stopped_callback_set() to receive notification when the event
|
|
|
|
* processing finished.
|
2013-02-02 06:50:00 +00:00
|
|
|
*
|
2015-10-09 00:35:47 +00:00
|
|
|
* This function is reentrant. That is, it may be called from a different
|
|
|
|
* thread than the one executing the session, as long as it can be ensured
|
|
|
|
* that the session object is valid.
|
|
|
|
*
|
|
|
|
* If the session is not running, sr_session_stop() silently does nothing.
|
2013-02-02 06:50:00 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
2014-05-04 22:07:00 +00:00
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
2014-05-04 22:07:00 +00:00
|
|
|
* @since 0.4.0
|
2013-02-02 06:50:00 +00:00
|
|
|
*/
|
2014-05-04 22:07:00 +00:00
|
|
|
SR_API int sr_session_stop(struct sr_session *session)
|
2013-02-02 06:50:00 +00:00
|
|
|
{
|
2015-10-09 00:35:47 +00:00
|
|
|
GMainContext *main_context;
|
|
|
|
|
2013-02-02 06:50:00 +00:00
|
|
|
if (!session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
2015-09-10 07:46:45 +00:00
|
|
|
return SR_ERR_ARG;
|
2013-02-02 06:50:00 +00:00
|
|
|
}
|
2015-10-09 00:35:47 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_mutex_lock(&session->main_mutex);
|
2013-02-02 06:50:00 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
main_context = (session->main_context)
|
|
|
|
? g_main_context_ref(session->main_context)
|
|
|
|
: NULL;
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_mutex_unlock(&session->main_mutex);
|
2013-02-02 06:50:00 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
if (!main_context) {
|
|
|
|
sr_dbg("No main context set; already stopped?");
|
|
|
|
/* Not an error; as it would be racy. */
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
g_main_context_invoke(main_context, &session_stop_sync, session);
|
|
|
|
g_main_context_unref(main_context);
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Return whether the session is currently running.
|
|
|
|
*
|
|
|
|
* Note that this function should be called from the same thread
|
|
|
|
* the session was started in.
|
|
|
|
*
|
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
*
|
|
|
|
* @retval TRUE Session is running.
|
|
|
|
* @retval FALSE Session is not running.
|
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
|
|
|
*
|
|
|
|
* @since 0.4.0
|
|
|
|
*/
|
|
|
|
SR_API int sr_session_is_running(struct sr_session *session)
|
|
|
|
{
|
|
|
|
if (!session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
return session->running;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Set the callback to be invoked after a session stopped running.
|
|
|
|
*
|
|
|
|
* Install a callback to receive notification when a session run stopped.
|
|
|
|
* This can be used to integrate session execution with an existing main
|
|
|
|
* loop, without having to block in sr_session_run().
|
|
|
|
*
|
|
|
|
* Note that the callback will be invoked in the context of the thread
|
|
|
|
* that calls sr_session_start().
|
|
|
|
*
|
|
|
|
* @param session The session to use. Must not be NULL.
|
|
|
|
* @param cb The callback to invoke on session stop. May be NULL to unset.
|
|
|
|
* @param cb_data User data pointer to be passed to the callback.
|
|
|
|
*
|
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid session passed.
|
|
|
|
*
|
|
|
|
* @since 0.4.0
|
|
|
|
*/
|
|
|
|
SR_API int sr_session_stopped_callback_set(struct sr_session *session,
|
|
|
|
sr_session_stopped_callback cb, void *cb_data)
|
|
|
|
{
|
|
|
|
if (!session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
|
|
|
session->stopped_callback = cb;
|
|
|
|
session->stopped_cb_data = cb_data;
|
|
|
|
|
|
|
|
return SR_OK;
|
2013-02-02 06:50:00 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2012-02-13 02:36:32 +00:00
|
|
|
* Debug helper.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2012-02-13 01:13:51 +00:00
|
|
|
* @param packet The packet to show debugging information for.
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-12-13 21:07:53 +00:00
|
|
|
static void datafeed_dump(const struct sr_datafeed_packet *packet)
|
2011-06-20 09:42:43 +00:00
|
|
|
{
|
2012-12-13 21:07:53 +00:00
|
|
|
const struct sr_datafeed_logic *logic;
|
2015-09-29 16:34:55 +00:00
|
|
|
const struct sr_datafeed_analog *analog;
|
2011-06-20 09:42:43 +00:00
|
|
|
|
2015-08-28 14:26:07 +00:00
|
|
|
/* Please use the same order as in libsigrok.h. */
|
2011-06-20 09:42:43 +00:00
|
|
|
switch (packet->type) {
|
|
|
|
case SR_DF_HEADER:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_HEADER packet.");
|
2011-06-20 09:42:43 +00:00
|
|
|
break;
|
2015-08-28 14:10:15 +00:00
|
|
|
case SR_DF_END:
|
|
|
|
sr_dbg("bus: Received SR_DF_END packet.");
|
2011-06-20 09:42:43 +00:00
|
|
|
break;
|
2013-01-20 15:37:23 +00:00
|
|
|
case SR_DF_META:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_META packet.");
|
2012-04-22 16:11:31 +00:00
|
|
|
break;
|
2015-08-28 14:10:15 +00:00
|
|
|
case SR_DF_TRIGGER:
|
|
|
|
sr_dbg("bus: Received SR_DF_TRIGGER packet.");
|
|
|
|
break;
|
2011-06-20 09:42:43 +00:00
|
|
|
case SR_DF_LOGIC:
|
|
|
|
logic = packet->payload;
|
2014-04-25 17:34:41 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
|
|
|
|
"unitsize = %d).", logic->length, logic->unitsize);
|
2011-06-20 09:42:43 +00:00
|
|
|
break;
|
2012-04-30 17:55:06 +00:00
|
|
|
case SR_DF_FRAME_BEGIN:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
|
2012-04-30 17:55:06 +00:00
|
|
|
break;
|
|
|
|
case SR_DF_FRAME_END:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_FRAME_END packet.");
|
2012-04-30 17:55:06 +00:00
|
|
|
break;
|
2015-09-29 16:34:55 +00:00
|
|
|
case SR_DF_ANALOG:
|
|
|
|
analog = packet->payload;
|
|
|
|
sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
|
|
|
|
analog->num_samples);
|
2015-08-28 14:10:15 +00:00
|
|
|
break;
|
2011-06-20 09:42:43 +00:00
|
|
|
default:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received unknown packet type: %d.", packet->type);
|
2012-01-02 13:15:25 +00:00
|
|
|
break;
|
2011-06-20 09:42:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2012-02-13 02:36:32 +00:00
|
|
|
* Send a packet to whatever is listening on the datafeed bus.
|
|
|
|
*
|
|
|
|
* Hardware drivers use this to send a data packet to the frontend.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2012-10-21 21:24:42 +00:00
|
|
|
* @param sdi TODO.
|
2012-02-29 21:08:45 +00:00
|
|
|
* @param packet The datafeed packet to send to the session bus.
|
2012-02-17 19:44:19 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2012-10-19 08:07:22 +00:00
|
|
|
*
|
|
|
|
* @private
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-07-22 13:31:56 +00:00
|
|
|
SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
|
2014-09-25 23:33:15 +00:00
|
|
|
const struct sr_datafeed_packet *packet)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
|
|
|
GSList *l;
|
2013-04-15 20:08:55 +00:00
|
|
|
struct datafeed_callback *cb_struct;
|
2015-02-10 20:24:23 +00:00
|
|
|
struct sr_datafeed_packet *packet_in, *packet_out;
|
|
|
|
struct sr_transform *t;
|
|
|
|
int ret;
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
if (!sdi) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: sdi was NULL", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
if (!packet) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: packet was NULL", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2014-09-18 22:21:30 +00:00
|
|
|
if (!sdi->session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_BUG;
|
|
|
|
}
|
|
|
|
|
2015-02-10 20:24:23 +00:00
|
|
|
/*
|
|
|
|
* Pass the packet to the first transform module. If that returns
|
|
|
|
* another packet (instead of NULL), pass that packet to the next
|
|
|
|
* transform module in the list, and so on.
|
|
|
|
*/
|
|
|
|
packet_in = (struct sr_datafeed_packet *)packet;
|
|
|
|
for (l = sdi->session->transforms; l; l = l->next) {
|
|
|
|
t = l->data;
|
|
|
|
sr_spew("Running transform module '%s'.", t->module->id);
|
|
|
|
ret = t->module->receive(t, packet_in, &packet_out);
|
|
|
|
if (ret < 0) {
|
|
|
|
sr_err("Error while running transform module: %d.", ret);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
if (!packet_out) {
|
|
|
|
/*
|
|
|
|
* If any of the transforms don't return an output
|
|
|
|
* packet, abort.
|
|
|
|
*/
|
|
|
|
sr_spew("Transform module didn't return a packet, aborting.");
|
|
|
|
return SR_OK;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Use this transform module's output packet as input
|
|
|
|
* for the next transform module.
|
|
|
|
*/
|
|
|
|
packet_in = packet_out;
|
|
|
|
}
|
|
|
|
}
|
2015-08-22 15:39:39 +00:00
|
|
|
packet = packet_in;
|
2015-02-10 20:24:23 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the last transform did output a packet, pass it to all datafeed
|
|
|
|
* callbacks.
|
|
|
|
*/
|
2014-07-21 13:08:17 +00:00
|
|
|
for (l = sdi->session->datafeed_callbacks; l; l = l->next) {
|
2012-02-12 23:08:23 +00:00
|
|
|
if (sr_log_loglevel_get() >= SR_LOG_DBG)
|
|
|
|
datafeed_dump(packet);
|
2013-04-15 20:08:55 +00:00
|
|
|
cb_struct = l->data;
|
|
|
|
cb_struct->cb(sdi, packet, cb_struct->cb_data);
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
|
|
|
* Add an event source for a file descriptor.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2015-09-10 07:46:45 +00:00
|
|
|
* @param key The key which identifies the event source.
|
|
|
|
* @param source An event source object. Must not be NULL.
|
2015-10-09 17:46:14 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2015-09-10 07:46:45 +00:00
|
|
|
* @retval SR_ERR_BUG Event source with @a key already installed.
|
|
|
|
* @retval SR_ERR Other error.
|
2015-10-09 17:46:14 +00:00
|
|
|
*
|
|
|
|
* @private
|
2012-10-21 21:24:42 +00:00
|
|
|
*/
|
2015-08-30 19:43:30 +00:00
|
|
|
SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
|
2015-09-10 07:46:45 +00:00
|
|
|
void *key, GSource *source)
|
2011-01-30 01:40:55 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
/*
|
|
|
|
* 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.)
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
*/
|
2015-09-10 07:46:45 +00:00
|
|
|
if (g_hash_table_contains(session->event_sources, key)) {
|
|
|
|
sr_err("Event source with key %p already exists.", key);
|
|
|
|
return SR_ERR_BUG;
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
}
|
2015-09-10 07:46:45 +00:00
|
|
|
g_hash_table_insert(session->event_sources, key, source);
|
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
if (session_source_attach(session, source) == 0)
|
|
|
|
return SR_ERR;
|
2015-08-31 00:35:57 +00:00
|
|
|
|
2015-10-09 00:35:47 +00:00
|
|
|
return SR_OK;
|
2015-09-07 10:41:29 +00:00
|
|
|
}
|
|
|
|
|
2015-09-11 21:08:10 +00:00
|
|
|
SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
|
|
|
|
void *key, gintptr fd, int events, int timeout,
|
2015-09-10 07:46:45 +00:00
|
|
|
sr_receive_data_callback cb, void *cb_data)
|
2015-09-07 10:41:29 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
GSource *source;
|
|
|
|
int ret;
|
2015-09-07 10:41:29 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
source = fd_source_new(session, key, fd, events, timeout);
|
|
|
|
if (!source)
|
2015-09-07 10:41:29 +00:00
|
|
|
return SR_ERR;
|
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
g_source_set_callback(source, (GSourceFunc)cb, cb_data, NULL);
|
2015-09-07 10:41:29 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
ret = sr_session_source_add_internal(session, key, source);
|
|
|
|
g_source_unref(source);
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
return ret;
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2012-10-21 21:24:42 +00:00
|
|
|
* Add an event source for a file descriptor.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2015-09-07 10:41:29 +00:00
|
|
|
* @param fd The file descriptor, or a negative value to create a timer source.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param events Events to check for.
|
2015-08-31 00:35:57 +00:00
|
|
|
* @param timeout Max time in ms to wait before the callback is called,
|
|
|
|
* or -1 to wait indefinitely.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param cb Callback function to add. Must not be NULL.
|
|
|
|
* @param cb_data Data for the callback function. Can be NULL.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_add(struct sr_session *session, int fd,
|
2014-05-04 22:07:00 +00:00
|
|
|
int events, int timeout, sr_receive_data_callback cb, void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-08-31 00:35:57 +00:00
|
|
|
if (fd < 0 && timeout < 0) {
|
2015-09-10 07:46:45 +00:00
|
|
|
sr_err("Cannot create timer source without timeout.");
|
2015-08-31 00:35:57 +00:00
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
2015-09-11 21:08:10 +00:00
|
|
|
return sr_session_fd_source_add(session, GINT_TO_POINTER(fd),
|
2015-09-10 07:46:45 +00:00
|
|
|
fd, events, timeout, cb, cb_data);
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-07-04 23:47:44 +00:00
|
|
|
* Add an event source for a GPollFD.
|
2012-06-30 18:54:44 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2015-08-31 00:35:57 +00:00
|
|
|
* @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.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param cb Callback function to add. Must not be NULL.
|
|
|
|
* @param cb_data Data for the callback function. Can be NULL.
|
2012-02-17 19:44:19 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_add_pollfd(struct sr_session *session,
|
2014-05-04 22:07:00 +00:00
|
|
|
GPollFD *pollfd, int timeout, sr_receive_data_callback cb,
|
|
|
|
void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-08-31 00:35:57 +00:00
|
|
|
if (!pollfd) {
|
|
|
|
sr_err("%s: pollfd was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
2015-09-11 21:08:10 +00:00
|
|
|
return sr_session_fd_source_add(session, pollfd, pollfd->fd,
|
2015-09-10 07:46:45 +00:00
|
|
|
pollfd->events, timeout, cb, cb_data);
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-07-04 23:47:44 +00:00
|
|
|
* Add an event source for a GIOChannel.
|
2012-06-30 18:54:44 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param channel The GIOChannel.
|
|
|
|
* @param events Events to poll on.
|
2015-08-31 00:35:57 +00:00
|
|
|
* @param timeout Max time in ms to wait before the callback is called,
|
|
|
|
* or -1 to wait indefinitely.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param cb Callback function to add. Must not be NULL.
|
|
|
|
* @param cb_data Data for the callback function. Can be NULL.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_add_channel(struct sr_session *session,
|
2014-05-04 22:07:00 +00:00
|
|
|
GIOChannel *channel, int events, int timeout,
|
|
|
|
sr_receive_data_callback cb, void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
GPollFD pollfd;
|
2012-06-30 18:54:44 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
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.
|
|
|
|
*/
|
2015-08-31 00:35:57 +00:00
|
|
|
#ifdef G_OS_WIN32
|
2015-09-10 07:46:45 +00:00
|
|
|
g_io_channel_win32_make_pollfd(channel, events, &pollfd);
|
2012-06-30 18:54:44 +00:00
|
|
|
#else
|
2015-09-10 07:46:45 +00:00
|
|
|
pollfd.fd = g_io_channel_unix_get_fd(channel);
|
|
|
|
pollfd.events = events;
|
2012-06-30 18:54:44 +00:00
|
|
|
#endif
|
2015-09-11 21:08:10 +00:00
|
|
|
return sr_session_fd_source_add(session, channel, pollfd.fd,
|
2015-09-10 07:46:45 +00:00
|
|
|
pollfd.events, timeout, cb, cb_data);
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
* Remove the source identified by the specified poll object.
|
2012-10-21 21:24:42 +00:00
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2015-09-10 07:46:45 +00:00
|
|
|
* @param key The key by which the source is identified.
|
2012-10-21 21:24:42 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
* @retval SR_ERR_BUG No event source for poll_object found.
|
2015-10-09 17:46:14 +00:00
|
|
|
*
|
|
|
|
* @private
|
2012-10-21 21:24:42 +00:00
|
|
|
*/
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
|
2015-09-10 07:46:45 +00:00
|
|
|
void *key)
|
2011-01-30 01:40:55 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
GSource *source;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
source = g_hash_table_lookup(session->event_sources, key);
|
|
|
|
/*
|
|
|
|
* Trying to remove an already removed event source is problematic
|
session: Allow multiple poll FDs per event source
Turns out that having one event source per libusb poll FD is
a bad idea. There is only a single callback for all poll FDs,
and libusb expects to be called only once per poll iteration,
no matter how many FDs triggered.
Also, they should all share the same timeout, which should get
reset on events from any polled FD. The new timeout handling made
this problem apparent, as it caused the callback to be invoked
multiple times on timeouts, once for each separate event source.
In order to fix this, change the implementation to allow for an
arbitrary number of poll FDs per event source. This number is
zero for timer FDs, one for normal I/O sources, and one or more
for libusb sources (Unix only).
Also, on Windows, do not get an additional timeout from libusb
in the event loop. This is only appropriate when polling the
libusb FDs directly, which we aren't doing on Windows.
2015-09-01 01:36:03 +00:00
|
|
|
* since the poll_object handle may have been reused in the meantime.
|
|
|
|
*/
|
2015-09-07 10:41:29 +00:00
|
|
|
if (!source) {
|
2015-09-10 07:46:45 +00:00
|
|
|
sr_warn("Cannot remove non-existing event source %p.", key);
|
|
|
|
return SR_ERR_BUG;
|
2015-09-07 10:41:29 +00:00
|
|
|
}
|
2015-09-10 07:46:45 +00:00
|
|
|
g_source_destroy(source);
|
2015-09-07 10:41:29 +00:00
|
|
|
|
2015-09-10 07:46:45 +00:00
|
|
|
return SR_OK;
|
2015-09-07 10:41:29 +00:00
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
2012-06-30 18:54:44 +00:00
|
|
|
* Remove the source belonging to the specified file descriptor.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2012-07-04 23:47:44 +00:00
|
|
|
* @param fd The file descriptor for which the source should be removed.
|
2012-06-30 18:54:44 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success
|
|
|
|
* @retval SR_ERR_ARG Invalid argument
|
|
|
|
* @retval SR_ERR_BUG Internal error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_remove(struct sr_session *session, int fd)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-09-10 07:46:45 +00:00
|
|
|
return sr_session_source_remove_internal(session, GINT_TO_POINTER(fd));
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Remove the source belonging to the specified poll descriptor.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @param pollfd The poll descriptor for which the source should be removed.
|
2015-08-31 00:35:57 +00:00
|
|
|
* Must not be NULL.
|
2012-06-30 18:54:44 +00:00
|
|
|
* @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.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.2.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_remove_pollfd(struct sr_session *session,
|
2014-05-04 22:07:00 +00:00
|
|
|
GPollFD *pollfd)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-08-31 00:35:57 +00:00
|
|
|
if (!pollfd) {
|
|
|
|
sr_err("%s: pollfd was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
2015-09-10 07:46:45 +00:00
|
|
|
return sr_session_source_remove_internal(session, pollfd);
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
2012-06-30 18:54:44 +00:00
|
|
|
* Remove the source belonging to the specified channel.
|
|
|
|
*
|
2014-08-10 15:27:43 +00:00
|
|
|
* @param session The session to use. Must not be NULL.
|
2012-07-04 23:47:44 +00:00
|
|
|
* @param channel The channel for which the source should be removed.
|
2015-08-31 00:35:57 +00:00
|
|
|
* Must not be NULL.
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
|
|
|
* @return SR_ERR_BUG Internal error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.2.0
|
2015-10-09 17:46:14 +00:00
|
|
|
* @private
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2015-10-09 17:46:14 +00:00
|
|
|
SR_PRIV int sr_session_source_remove_channel(struct sr_session *session,
|
2014-05-04 22:07:00 +00:00
|
|
|
GIOChannel *channel)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2015-08-31 00:35:57 +00:00
|
|
|
if (!channel) {
|
|
|
|
sr_err("%s: channel was NULL", __func__);
|
|
|
|
return SR_ERR_ARG;
|
|
|
|
}
|
2015-09-10 07:46:45 +00:00
|
|
|
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.
|
2015-10-09 00:35:47 +00:00
|
|
|
* @retval SR_ERR Other error.
|
2015-10-09 17:46:14 +00:00
|
|
|
*
|
|
|
|
* @private
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
|
|
|
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);
|
2015-10-09 00:35:47 +00:00
|
|
|
|
|
|
|
if (g_hash_table_size(session->event_sources) > 0)
|
|
|
|
return SR_OK;
|
|
|
|
|
|
|
|
/* If no event sources are left, consider the acquisition finished.
|
|
|
|
* This is pretty crude, as it requires all event sources to be
|
|
|
|
* registered via the libsigrok API.
|
2015-09-10 07:46:45 +00:00
|
|
|
*/
|
2015-10-09 00:35:47 +00:00
|
|
|
return stop_check_later(session);
|
2012-06-30 18:54:44 +00:00
|
|
|
}
|
2012-10-21 14:13:36 +00:00
|
|
|
|
Correctly copy sr_datafeed_meta in sr_packet_copy().
Commit 5801d558 replaced g_slist_copy_deep() by some incorrect code
that actually leaks the newly allocated memory, instead of doing
a deep copy.
This new version should be more correct, more concise, and it fixes
the following warning:
src/session.c: In function 'sr_packet_copy':
src/session.c:1025:38: warning: passing argument 2 of 'g_slist_foreach' from incompatible pointer type [-Wincompatible-pointer-types]
g_slist_foreach(meta_copy->config, (GCopyFunc)copy_src, NULL);
^
In file included from /usr/include/glib-2.0/glib/gmain.h:26:0,
from /usr/include/glib-2.0/glib/giochannel.h:33,
from /usr/include/glib-2.0/glib.h:54,
from src/session.c:24:
/usr/include/glib-2.0/glib/gslist.h:125:10: note: expected 'GFunc {aka void (*)(void *, void *)}' but argument is of type 'void * (*)(const void *, void *)'
void g_slist_foreach (GSList *list,
^
2015-02-12 10:14:37 +00:00
|
|
|
static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy)
|
2014-09-25 23:33:15 +00:00
|
|
|
{
|
|
|
|
g_variant_ref(src->data);
|
Correctly copy sr_datafeed_meta in sr_packet_copy().
Commit 5801d558 replaced g_slist_copy_deep() by some incorrect code
that actually leaks the newly allocated memory, instead of doing
a deep copy.
This new version should be more correct, more concise, and it fixes
the following warning:
src/session.c: In function 'sr_packet_copy':
src/session.c:1025:38: warning: passing argument 2 of 'g_slist_foreach' from incompatible pointer type [-Wincompatible-pointer-types]
g_slist_foreach(meta_copy->config, (GCopyFunc)copy_src, NULL);
^
In file included from /usr/include/glib-2.0/glib/gmain.h:26:0,
from /usr/include/glib-2.0/glib/giochannel.h:33,
from /usr/include/glib-2.0/glib.h:54,
from src/session.c:24:
/usr/include/glib-2.0/glib/gslist.h:125:10: note: expected 'GFunc {aka void (*)(void *, void *)}' but argument is of type 'void * (*)(const void *, void *)'
void g_slist_foreach (GSList *list,
^
2015-02-12 10:14:37 +00:00
|
|
|
meta_copy->config = g_slist_append(meta_copy->config,
|
|
|
|
g_memdup(src, sizeof(struct sr_config)));
|
2014-09-25 23:33:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
|
|
|
|
struct sr_datafeed_packet **copy)
|
|
|
|
{
|
|
|
|
const struct sr_datafeed_meta *meta;
|
|
|
|
struct sr_datafeed_meta *meta_copy;
|
|
|
|
const struct sr_datafeed_logic *logic;
|
|
|
|
struct sr_datafeed_logic *logic_copy;
|
2015-09-29 16:34:55 +00:00
|
|
|
const struct sr_datafeed_analog *analog;
|
|
|
|
struct sr_datafeed_analog *analog_copy;
|
2014-09-25 23:33:15 +00:00
|
|
|
uint8_t *payload;
|
|
|
|
|
|
|
|
*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
|
|
|
|
(*copy)->type = packet->type;
|
|
|
|
|
|
|
|
switch (packet->type) {
|
|
|
|
case SR_DF_TRIGGER:
|
|
|
|
case SR_DF_END:
|
|
|
|
/* No payload. */
|
|
|
|
break;
|
|
|
|
case SR_DF_HEADER:
|
|
|
|
payload = g_malloc(sizeof(struct sr_datafeed_header));
|
|
|
|
memcpy(payload, packet->payload, sizeof(struct sr_datafeed_header));
|
|
|
|
(*copy)->payload = payload;
|
|
|
|
break;
|
|
|
|
case SR_DF_META:
|
|
|
|
meta = packet->payload;
|
Correctly copy sr_datafeed_meta in sr_packet_copy().
Commit 5801d558 replaced g_slist_copy_deep() by some incorrect code
that actually leaks the newly allocated memory, instead of doing
a deep copy.
This new version should be more correct, more concise, and it fixes
the following warning:
src/session.c: In function 'sr_packet_copy':
src/session.c:1025:38: warning: passing argument 2 of 'g_slist_foreach' from incompatible pointer type [-Wincompatible-pointer-types]
g_slist_foreach(meta_copy->config, (GCopyFunc)copy_src, NULL);
^
In file included from /usr/include/glib-2.0/glib/gmain.h:26:0,
from /usr/include/glib-2.0/glib/giochannel.h:33,
from /usr/include/glib-2.0/glib.h:54,
from src/session.c:24:
/usr/include/glib-2.0/glib/gslist.h:125:10: note: expected 'GFunc {aka void (*)(void *, void *)}' but argument is of type 'void * (*)(const void *, void *)'
void g_slist_foreach (GSList *list,
^
2015-02-12 10:14:37 +00:00
|
|
|
meta_copy = g_malloc0(sizeof(struct sr_datafeed_meta));
|
|
|
|
g_slist_foreach(meta->config, (GFunc)copy_src, meta_copy->config);
|
2014-09-25 23:33:15 +00:00
|
|
|
(*copy)->payload = meta_copy;
|
|
|
|
break;
|
|
|
|
case SR_DF_LOGIC:
|
|
|
|
logic = packet->payload;
|
2016-02-21 09:06:10 +00:00
|
|
|
logic_copy = g_malloc(sizeof(*logic_copy));
|
2014-09-25 23:33:15 +00:00
|
|
|
logic_copy->length = logic->length;
|
|
|
|
logic_copy->unitsize = logic->unitsize;
|
|
|
|
memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
|
|
|
|
(*copy)->payload = logic_copy;
|
|
|
|
break;
|
2015-09-29 16:34:55 +00:00
|
|
|
case SR_DF_ANALOG:
|
|
|
|
analog = packet->payload;
|
2016-02-21 09:06:10 +00:00
|
|
|
analog_copy = g_malloc(sizeof(*analog_copy));
|
2015-09-29 16:34:55 +00:00
|
|
|
analog_copy->data = g_malloc(
|
|
|
|
analog->encoding->unitsize * analog->num_samples);
|
|
|
|
memcpy(analog_copy->data, analog->data,
|
|
|
|
analog->encoding->unitsize * analog->num_samples);
|
|
|
|
analog_copy->num_samples = analog->num_samples;
|
|
|
|
analog_copy->encoding = g_memdup(analog->encoding,
|
2015-09-05 17:22:33 +00:00
|
|
|
sizeof(struct sr_analog_encoding));
|
2015-09-29 16:34:55 +00:00
|
|
|
analog_copy->meaning = g_memdup(analog->meaning,
|
2015-09-05 17:22:33 +00:00
|
|
|
sizeof(struct sr_analog_meaning));
|
2015-09-29 16:34:55 +00:00
|
|
|
analog_copy->meaning->channels = g_slist_copy(
|
|
|
|
analog->meaning->channels);
|
|
|
|
analog_copy->spec = g_memdup(analog->spec,
|
2015-09-05 17:22:33 +00:00
|
|
|
sizeof(struct sr_analog_spec));
|
2015-09-29 16:34:55 +00:00
|
|
|
(*copy)->payload = analog_copy;
|
2015-09-05 17:22:33 +00:00
|
|
|
break;
|
2014-09-25 23:33:15 +00:00
|
|
|
default:
|
|
|
|
sr_err("Unknown packet type %d", packet->type);
|
|
|
|
return SR_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
void sr_packet_free(struct sr_datafeed_packet *packet)
|
|
|
|
{
|
|
|
|
const struct sr_datafeed_meta *meta;
|
|
|
|
const struct sr_datafeed_logic *logic;
|
2015-09-29 16:34:55 +00:00
|
|
|
const struct sr_datafeed_analog *analog;
|
2014-09-25 23:33:15 +00:00
|
|
|
struct sr_config *src;
|
|
|
|
GSList *l;
|
|
|
|
|
|
|
|
switch (packet->type) {
|
|
|
|
case SR_DF_TRIGGER:
|
|
|
|
case SR_DF_END:
|
|
|
|
/* No payload. */
|
|
|
|
break;
|
|
|
|
case SR_DF_HEADER:
|
|
|
|
/* Payload is a simple struct. */
|
|
|
|
g_free((void *)packet->payload);
|
|
|
|
break;
|
|
|
|
case SR_DF_META:
|
|
|
|
meta = packet->payload;
|
|
|
|
for (l = meta->config; l; l = l->next) {
|
|
|
|
src = l->data;
|
|
|
|
g_variant_unref(src->data);
|
|
|
|
g_free(src);
|
|
|
|
}
|
|
|
|
g_slist_free(meta->config);
|
|
|
|
g_free((void *)packet->payload);
|
|
|
|
break;
|
|
|
|
case SR_DF_LOGIC:
|
|
|
|
logic = packet->payload;
|
|
|
|
g_free(logic->data);
|
|
|
|
g_free((void *)packet->payload);
|
|
|
|
break;
|
2015-09-29 16:34:55 +00:00
|
|
|
case SR_DF_ANALOG:
|
|
|
|
analog = packet->payload;
|
|
|
|
g_free(analog->data);
|
|
|
|
g_free(analog->encoding);
|
|
|
|
g_slist_free(analog->meaning->channels);
|
|
|
|
g_free(analog->meaning);
|
|
|
|
g_free(analog->spec);
|
2015-09-05 17:26:30 +00:00
|
|
|
g_free((void *)packet->payload);
|
|
|
|
break;
|
2014-09-25 23:33:15 +00:00
|
|
|
default:
|
|
|
|
sr_err("Unknown packet type %d", packet->type);
|
|
|
|
}
|
|
|
|
g_free(packet);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2012-10-21 14:13:36 +00:00
|
|
|
/** @} */
|