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>
|
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/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <string.h>
|
2011-01-30 01:40:55 +00:00
|
|
|
#include <glib.h>
|
2012-07-04 22:55:07 +00:00
|
|
|
#include "libsigrok.h"
|
|
|
|
#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.
|
|
|
|
*
|
|
|
|
* @{
|
|
|
|
*/
|
|
|
|
|
2011-01-30 01:40:55 +00:00
|
|
|
struct source {
|
|
|
|
int timeout;
|
2014-05-03 20:14:01 +00:00
|
|
|
sr_receive_data_callback cb;
|
2012-02-29 21:32:34 +00:00
|
|
|
void *cb_data;
|
2012-06-30 18:54:44 +00:00
|
|
|
|
|
|
|
/* This is used to keep track of the object (fd, pollfd or channel) which is
|
|
|
|
* being polled and will be used to match the source when removing it again.
|
|
|
|
*/
|
|
|
|
gintptr poll_object;
|
2011-01-30 01:40:55 +00:00
|
|
|
};
|
|
|
|
|
2013-04-15 20:08:55 +00:00
|
|
|
struct datafeed_callback {
|
2014-05-03 20:14:01 +00:00
|
|
|
sr_datafeed_callback cb;
|
2013-04-15 20:08:55 +00:00
|
|
|
void *cb_data;
|
|
|
|
};
|
|
|
|
|
2011-01-31 21:34:14 +00:00
|
|
|
/* There can only be one session at a time. */
|
2011-12-28 21:55:21 +00:00
|
|
|
/* 'session' is not static, it's used elsewhere (via 'extern'). */
|
2011-02-08 16:50:29 +00:00
|
|
|
struct sr_session *session;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Create a new session.
|
|
|
|
*
|
2012-10-21 21:24:42 +00:00
|
|
|
* @todo Should it use the file-global "session" variable or take an argument?
|
2012-01-02 13:15:25 +00:00
|
|
|
* The same question applies to all the other session functions.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval NULL Error.
|
2013-12-09 21:49:12 +00:00
|
|
|
* @retval other A pointer to the newly allocated session.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-02-01 22:40:35 +00:00
|
|
|
SR_API struct sr_session *sr_session_new(void)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2012-02-11 19:06:46 +00:00
|
|
|
if (!(session = g_try_malloc0(sizeof(struct sr_session)))) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("Session malloc failed.");
|
|
|
|
return NULL;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
session->source_timeout = -1;
|
2013-09-21 15:44:49 +00:00
|
|
|
session->running = FALSE;
|
2013-02-02 06:50:00 +00:00
|
|
|
session->abort_session = FALSE;
|
|
|
|
g_mutex_init(&session->stop_mutex);
|
2012-07-06 21:23:31 +00:00
|
|
|
|
2010-04-02 18:18:27 +00:00
|
|
|
return session;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Destroy the current session.
|
|
|
|
* This frees up all memory used by the session.
|
|
|
|
*
|
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.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-02-01 22:40:35 +00:00
|
|
|
SR_API int sr_session_destroy(void)
|
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__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-07-05 19:15:07 +00:00
|
|
|
sr_session_dev_remove_all();
|
2010-04-02 18:18:27 +00:00
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/* TODO: Error checks needed? */
|
|
|
|
|
2013-02-02 06:50:00 +00:00
|
|
|
g_mutex_clear(&session->stop_mutex);
|
|
|
|
|
2010-04-02 18:18:27 +00:00
|
|
|
g_free(session);
|
2012-01-02 13:15:25 +00:00
|
|
|
session = 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
|
|
|
/**
|
2012-10-21 21:24:42 +00:00
|
|
|
* Remove all the devices from the current 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.
|
|
|
|
*
|
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.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-03-28 19:55:48 +00:00
|
|
|
SR_API int sr_session_dev_remove_all(void)
|
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__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
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
|
|
|
/**
|
2012-10-21 14:52:56 +00:00
|
|
|
* Add a device instance to the current session.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2012-10-21 14:52:56 +00:00
|
|
|
* @param sdi The device instance to add to the current 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.
|
|
|
|
* @retval SR_ERR_BUG No session exists.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.2.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-07-22 13:31:56 +00:00
|
|
|
SR_API int sr_session_dev_add(const 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__);
|
2012-03-18 11:57:34 +00:00
|
|
|
return SR_ERR_BUG;
|
|
|
|
}
|
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
/* If sdi->driver is NULL, this is a virtual device. */
|
|
|
|
if (!sdi->driver) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("%s: sdi->driver was NULL, this seems to be "
|
2012-03-18 11:57:34 +00:00
|
|
|
"a virtual device; continuing", __func__);
|
|
|
|
/* Just add the device, don't run dev_open(). */
|
2012-07-22 13:31:56 +00:00
|
|
|
session->devs = g_slist_append(session->devs, (gpointer)sdi);
|
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
|
|
|
}
|
|
|
|
|
2012-07-22 13:31:56 +00:00
|
|
|
session->devs = g_slist_append(session->devs, (gpointer)sdi);
|
2011-01-24 06:46:16 +00:00
|
|
|
|
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;
|
|
|
|
}
|
2013-09-21 15:44:49 +00:00
|
|
|
if ((ret = sdi->driver->dev_acquisition_start(sdi,
|
2014-01-20 22:04:49 +00:00
|
|
|
(void *)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
|
|
|
/**
|
|
|
|
* List all device instances attached to the current session.
|
|
|
|
*
|
|
|
|
* @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.
|
|
|
|
* @retval SR_ERR Invalid argument.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2013-09-02 12:24:32 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_dev_list(GSList **devlist)
|
|
|
|
{
|
|
|
|
|
|
|
|
*devlist = NULL;
|
|
|
|
|
|
|
|
if (!session)
|
|
|
|
return SR_ERR;
|
|
|
|
|
|
|
|
*devlist = g_slist_copy(session->devs);
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
2012-03-28 19:55:48 +00:00
|
|
|
* Remove all datafeed callbacks in the current session.
|
2012-01-02 13:15:25 +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.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-03-28 19:55:48 +00:00
|
|
|
SR_API int sr_session_datafeed_callback_remove_all(void)
|
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__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
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
|
|
|
/**
|
|
|
|
* Add a datafeed callback to the current session.
|
|
|
|
*
|
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-03 20:14:01 +00:00
|
|
|
SR_API int sr_session_datafeed_callback_add(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
|
|
|
|
2013-04-15 20:08:55 +00:00
|
|
|
if (!(cb_struct = g_try_malloc0(sizeof(struct datafeed_callback))))
|
|
|
|
return SR_ERR_MALLOC;
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2013-07-15 12:14:28 +00:00
|
|
|
/**
|
|
|
|
* Call every device in the 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.
|
|
|
|
*
|
2013-07-18 13:06:06 +00:00
|
|
|
* @param block If TRUE, this call will wait for any of the session's
|
|
|
|
* sources to fire an event on the file descriptors, or
|
|
|
|
* any of their timeouts to activate. In other words, this
|
|
|
|
* can be used as a select loop.
|
|
|
|
* If FALSE, all sources have their callback run, regardless
|
|
|
|
* of file descriptor or timeout status.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR Error occured.
|
2013-07-15 12:14:28 +00:00
|
|
|
*/
|
2013-08-06 22:34:06 +00:00
|
|
|
static int sr_session_iteration(gboolean block)
|
2011-01-30 01:40:55 +00:00
|
|
|
{
|
2012-07-06 21:23:31 +00:00
|
|
|
unsigned int i;
|
|
|
|
int ret;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2013-07-15 12:14:28 +00:00
|
|
|
ret = g_poll(session->pollfds, session->num_sources,
|
|
|
|
block ? session->source_timeout : 0);
|
|
|
|
for (i = 0; i < session->num_sources; i++) {
|
|
|
|
if (session->pollfds[i].revents > 0 || (ret == 0
|
|
|
|
&& session->source_timeout == session->sources[i].timeout)) {
|
2013-02-02 06:50:00 +00:00
|
|
|
/*
|
2013-07-15 12:14:28 +00:00
|
|
|
* Invoke the source's callback on an event,
|
|
|
|
* or if the poll timed out and this source
|
|
|
|
* asked for that timeout.
|
2013-02-02 06:50:00 +00:00
|
|
|
*/
|
2013-07-15 12:14:28 +00:00
|
|
|
if (!session->sources[i].cb(session->pollfds[i].fd,
|
|
|
|
session->pollfds[i].revents,
|
|
|
|
session->sources[i].cb_data))
|
|
|
|
sr_session_source_remove(session->sources[i].poll_object);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* We want to take as little time as possible to stop
|
|
|
|
* the session if we have been told to do so. Therefore,
|
|
|
|
* we check the flag after processing every source, not
|
|
|
|
* just once per main event loop.
|
|
|
|
*/
|
|
|
|
g_mutex_lock(&session->stop_mutex);
|
|
|
|
if (session->abort_session) {
|
|
|
|
sr_session_stop_sync();
|
|
|
|
/* But once is enough. */
|
|
|
|
session->abort_session = FALSE;
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
2013-07-15 12:14:28 +00:00
|
|
|
g_mutex_unlock(&session->stop_mutex);
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
2012-01-07 16:08:54 +00:00
|
|
|
|
|
|
|
return SR_OK;
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Start a session.
|
|
|
|
*
|
2012-02-13 02:36:32 +00:00
|
|
|
* There can only be one session at a time.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR Error occured.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-02-01 22:40:35 +00:00
|
|
|
SR_API int sr_session_start(void)
|
2011-01-31 21:34:14 +00:00
|
|
|
{
|
2012-07-22 13:31:56 +00:00
|
|
|
struct sr_dev_inst *sdi;
|
2011-01-31 21:34:14 +00:00
|
|
|
GSList *l;
|
|
|
|
int ret;
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!session) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: session was NULL; a session must be "
|
2012-07-22 13:31:56 +00:00
|
|
|
"created before starting it.", __func__);
|
2012-03-04 14:08:11 +00:00
|
|
|
return SR_ERR_BUG;
|
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__);
|
2012-03-04 14:08:11 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2013-02-07 08:16:28 +00:00
|
|
|
sr_info("Starting.");
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2012-12-31 20:05:11 +00:00
|
|
|
ret = SR_OK;
|
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-01-20 22:04:49 +00:00
|
|
|
if ((ret = sr_config_commit(sdi)) != SR_OK) {
|
|
|
|
sr_err("Failed to commit device settings before "
|
|
|
|
"starting acquisition (%s)", sr_strerror(ret));
|
|
|
|
break;
|
|
|
|
}
|
2012-07-22 13:31:56 +00:00
|
|
|
if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: could not start an acquisition "
|
2013-10-16 08:40:38 +00:00
|
|
|
"(%s)", __func__, sr_strerror(ret));
|
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
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/* TODO: What if there are multiple devices? Which return code? */
|
|
|
|
|
2011-01-31 21:34:14 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Run the session.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_BUG Error occured.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.1.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-02-01 22:40:35 +00:00
|
|
|
SR_API int sr_session_run(void)
|
2011-01-31 21:34:14 +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; a session must be "
|
2012-01-02 13:15:25 +00:00
|
|
|
"created first, before running it.", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-02-17 21:25:01 +00:00
|
|
|
if (!session->devs) {
|
2012-01-02 13:15:25 +00:00
|
|
|
/* TODO: Actually the case? */
|
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 run without devices.", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2013-09-21 15:44:49 +00:00
|
|
|
session->running = TRUE;
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_info("Running.");
|
2011-01-31 21:34:14 +00:00
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/* Do we have real sources? */
|
2012-07-06 21:23:31 +00:00
|
|
|
if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
|
2012-01-02 13:15:25 +00:00
|
|
|
/* Dummy source, freewheel over it. */
|
2012-08-02 23:04:05 +00:00
|
|
|
while (session->num_sources)
|
2012-07-06 21:23:31 +00:00
|
|
|
session->sources[0].cb(-1, 0, session->sources[0].cb_data);
|
2012-01-02 13:15:25 +00:00
|
|
|
} else {
|
|
|
|
/* Real sources, use g_poll() main loop. */
|
2013-07-15 12:14:28 +00:00
|
|
|
while (session->num_sources)
|
|
|
|
sr_session_iteration(TRUE);
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
2011-01-31 21:34:14 +00:00
|
|
|
}
|
|
|
|
|
2012-01-02 13:15:25 +00:00
|
|
|
/**
|
|
|
|
* Stop the current session.
|
|
|
|
*
|
2012-02-13 02:36:32 +00:00
|
|
|
* The current session is stopped immediately, with all acquisition sessions
|
2012-02-28 22:52:30 +00:00
|
|
|
* being stopped and hardware drivers cleaned up.
|
2012-01-02 13:15:25 +00:00
|
|
|
*
|
2013-02-02 06:50:00 +00:00
|
|
|
* This must be called from within the session thread, to prevent freeing
|
|
|
|
* resources that the session thread will try to use.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_BUG No session exists.
|
2013-09-25 09:51:38 +00:00
|
|
|
*
|
|
|
|
* @private
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2013-02-02 06:50:00 +00:00
|
|
|
SR_PRIV int sr_session_stop_sync(void)
|
2010-04-02 18:18:27 +00:00
|
|
|
{
|
2012-07-22 13:31:56 +00:00
|
|
|
struct sr_dev_inst *sdi;
|
2010-04-02 18:18:27 +00:00
|
|
|
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__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_BUG;
|
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
|
|
|
|
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;
|
|
|
|
if (sdi->driver) {
|
|
|
|
if (sdi->driver->dev_acquisition_stop)
|
|
|
|
sdi->driver->dev_acquisition_stop(sdi, sdi);
|
2012-01-08 21:05:00 +00:00
|
|
|
}
|
2010-04-02 18:18:27 +00:00
|
|
|
}
|
2013-09-21 15:44:49 +00:00
|
|
|
session->running = FALSE;
|
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
|
|
|
}
|
|
|
|
|
2013-02-02 06:50:00 +00:00
|
|
|
/**
|
|
|
|
* Stop the current session.
|
|
|
|
*
|
|
|
|
* The current session is stopped immediately, with all acquisition sessions
|
|
|
|
* being stopped and hardware drivers cleaned up.
|
|
|
|
*
|
|
|
|
* If the session is run in a separate thread, this function will not block
|
|
|
|
* until the session is finished executing. It is the caller's responsibility
|
|
|
|
* to wait for the session thread to return before assuming that the session is
|
|
|
|
* completely decommissioned.
|
|
|
|
*
|
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.1.0
|
2013-02-02 06:50:00 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_stop(void)
|
|
|
|
{
|
|
|
|
if (!session) {
|
|
|
|
sr_err("%s: session was NULL", __func__);
|
|
|
|
return SR_ERR_BUG;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_mutex_lock(&session->stop_mutex);
|
|
|
|
session->abort_session = TRUE;
|
|
|
|
g_mutex_unlock(&session->stop_mutex);
|
|
|
|
|
|
|
|
return SR_OK;
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
const struct sr_datafeed_analog *analog;
|
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;
|
|
|
|
case SR_DF_TRIGGER:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_TRIGGER 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;
|
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-22 16:11:31 +00:00
|
|
|
case SR_DF_ANALOG:
|
|
|
|
analog = packet->payload;
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
|
|
|
|
analog->num_samples);
|
2012-04-22 16:11:31 +00:00
|
|
|
break;
|
2011-06-20 09:42:43 +00:00
|
|
|
case SR_DF_END:
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_dbg("bus: Received SR_DF_END packet.");
|
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;
|
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,
|
2012-12-13 21:07:53 +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;
|
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
|
|
|
}
|
|
|
|
|
2010-04-15 18:16:53 +00:00
|
|
|
for (l = 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.
|
|
|
|
*
|
|
|
|
* @param pollfd The GPollFD.
|
2013-11-22 19:40:52 +00:00
|
|
|
* @param[in] timeout Max time to wait before the callback is called,
|
|
|
|
* ignored if 0.
|
2012-10-21 21:24:42 +00:00
|
|
|
* @param cb Callback function to add. Must not be NULL.
|
|
|
|
* @param cb_data Data for the callback function. Can be NULL.
|
|
|
|
* @param poll_object TODO.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success.
|
|
|
|
* @retval SR_ERR_ARG Invalid argument.
|
|
|
|
* @retval SR_ERR_MALLOC Memory allocation error.
|
2012-10-21 21:24:42 +00:00
|
|
|
*/
|
2012-06-30 18:54:44 +00:00
|
|
|
static int _sr_session_source_add(GPollFD *pollfd, int timeout,
|
2014-05-03 20:14:01 +00:00
|
|
|
sr_receive_data_callback cb, void *cb_data, gintptr poll_object)
|
2011-01-30 01:40:55 +00:00
|
|
|
{
|
|
|
|
struct source *new_sources, *s;
|
2012-06-30 18:54:44 +00:00
|
|
|
GPollFD *new_pollfds;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-02-29 20:56:24 +00:00
|
|
|
if (!cb) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: cb was NULL", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_ARG;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-02-29 21:32:34 +00:00
|
|
|
/* Note: cb_data can be NULL, that's not a bug. */
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2012-07-22 13:32:35 +00:00
|
|
|
new_pollfds = g_try_realloc(session->pollfds,
|
|
|
|
sizeof(GPollFD) * (session->num_sources + 1));
|
2012-06-30 18:54:43 +00:00
|
|
|
if (!new_pollfds) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: new_pollfds malloc failed", __func__);
|
2012-06-30 18:54:43 +00:00
|
|
|
return SR_ERR_MALLOC;
|
|
|
|
}
|
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
new_sources = g_try_realloc(session->sources, sizeof(struct source) *
|
2012-07-22 13:32:35 +00:00
|
|
|
(session->num_sources + 1));
|
2012-01-02 13:15:25 +00:00
|
|
|
if (!new_sources) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: new_sources malloc failed", __func__);
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_ERR_MALLOC;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
new_pollfds[session->num_sources] = *pollfd;
|
|
|
|
s = &new_sources[session->num_sources++];
|
2011-01-30 01:40:55 +00:00
|
|
|
s->timeout = timeout;
|
2012-02-29 20:56:24 +00:00
|
|
|
s->cb = cb;
|
2012-02-29 21:32:34 +00:00
|
|
|
s->cb_data = cb_data;
|
2012-06-30 18:54:44 +00:00
|
|
|
s->poll_object = poll_object;
|
2012-07-06 21:23:31 +00:00
|
|
|
session->pollfds = new_pollfds;
|
|
|
|
session->sources = new_sources;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
if (timeout != session->source_timeout && timeout > 0
|
|
|
|
&& (session->source_timeout == -1 || timeout < session->source_timeout))
|
|
|
|
session->source_timeout = timeout;
|
2012-01-02 13:15:25 +00:00
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
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
|
|
|
*
|
2012-06-30 18:54:44 +00:00
|
|
|
* @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 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.
|
|
|
|
* @retval SR_ERR_MALLOC Memory allocation error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_source_add(int fd, int events, int timeout,
|
2014-05-03 20:14:01 +00:00
|
|
|
sr_receive_data_callback cb, void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
|
|
|
GPollFD p;
|
|
|
|
|
|
|
|
p.fd = fd;
|
|
|
|
p.events = events;
|
|
|
|
|
|
|
|
return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-07-04 23:47:44 +00:00
|
|
|
* Add an event source for a GPollFD.
|
2012-06-30 18:54:44 +00:00
|
|
|
*
|
|
|
|
* @param pollfd The GPollFD.
|
|
|
|
* @param timeout Max time to wait before the callback is called, ignored if 0.
|
|
|
|
* @param cb Callback function to add. Must not be NULL.
|
|
|
|
* @param cb_data Data for the callback function. Can be NULL.
|
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.
|
|
|
|
* @retval SR_ERR_MALLOC Memory allocation error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2012-01-02 13:15:25 +00:00
|
|
|
*/
|
2012-06-30 18:54:44 +00:00
|
|
|
SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
|
2014-05-03 20:14:01 +00:00
|
|
|
sr_receive_data_callback cb, void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
2012-07-04 23:47:44 +00:00
|
|
|
return _sr_session_source_add(pollfd, timeout, cb,
|
|
|
|
cb_data, (gintptr)pollfd);
|
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
|
|
|
*
|
|
|
|
* @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 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.
|
|
|
|
* @retval SR_ERR_MALLOC Memory allocation error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
2012-07-04 23:47:44 +00:00
|
|
|
SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
|
2014-05-03 20:14:01 +00:00
|
|
|
int timeout, sr_receive_data_callback cb, void *cb_data)
|
2012-06-30 18:54:44 +00:00
|
|
|
{
|
|
|
|
GPollFD p;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
2012-10-21 21:24:42 +00:00
|
|
|
g_io_channel_win32_make_pollfd(channel, events, &p);
|
2012-06-30 18:54:44 +00:00
|
|
|
#else
|
|
|
|
p.fd = g_io_channel_unix_get_fd(channel);
|
|
|
|
p.events = events;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)channel);
|
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
|
|
|
* Remove the source belonging to the specified channel.
|
|
|
|
*
|
|
|
|
* @todo Add more error checks and logging.
|
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @param poll_object The channel for which the source should be removed.
|
2012-10-21 21:24:42 +00:00
|
|
|
*
|
2013-11-22 19:40:52 +00:00
|
|
|
* @retval SR_OK Success
|
|
|
|
* @retval SR_ERR_ARG Invalid arguments
|
|
|
|
* @retval SR_ERR_MALLOC Memory allocation error
|
|
|
|
* @retval SR_ERR_BUG Internal error
|
2012-10-21 21:24:42 +00:00
|
|
|
*/
|
2012-06-30 18:54:44 +00:00
|
|
|
static int _sr_session_source_remove(gintptr poll_object)
|
2011-01-30 01:40:55 +00:00
|
|
|
{
|
|
|
|
struct source *new_sources;
|
2012-06-30 18:54:43 +00:00
|
|
|
GPollFD *new_pollfds;
|
2012-07-06 21:23:31 +00:00
|
|
|
unsigned int old;
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
if (!session->sources || !session->num_sources) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: sources was NULL", __func__);
|
2012-03-04 14:08:11 +00:00
|
|
|
return SR_ERR_BUG;
|
2012-01-07 16:08:54 +00:00
|
|
|
}
|
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
for (old = 0; old < session->num_sources; old++) {
|
|
|
|
if (session->sources[old].poll_object == poll_object)
|
2012-06-30 18:54:42 +00:00
|
|
|
break;
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
|
|
|
|
2012-06-30 18:54:42 +00:00
|
|
|
/* fd not found, nothing to do */
|
2012-07-06 21:23:31 +00:00
|
|
|
if (old == session->num_sources)
|
2012-06-30 18:54:42 +00:00
|
|
|
return SR_OK;
|
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
session->num_sources -= 1;
|
2012-06-30 18:54:42 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
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));
|
2012-01-02 13:15:25 +00:00
|
|
|
}
|
2011-01-30 01:40:55 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
|
|
|
|
if (!new_pollfds && session->num_sources > 0) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: new_pollfds malloc failed", __func__);
|
2012-06-30 18:54:43 +00:00
|
|
|
return SR_ERR_MALLOC;
|
|
|
|
}
|
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
new_sources = g_try_realloc(session->sources, sizeof(struct source) * session->num_sources);
|
|
|
|
if (!new_sources && session->num_sources > 0) {
|
2013-01-29 11:55:00 +00:00
|
|
|
sr_err("%s: new_sources malloc failed", __func__);
|
2012-06-30 18:54:42 +00:00
|
|
|
return SR_ERR_MALLOC;
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
2012-01-07 16:08:54 +00:00
|
|
|
|
2012-07-06 21:23:31 +00:00
|
|
|
session->pollfds = new_pollfds;
|
|
|
|
session->sources = new_sources;
|
2012-06-30 18:54:42 +00:00
|
|
|
|
2012-01-07 16:08:54 +00:00
|
|
|
return SR_OK;
|
2011-01-30 01:40:55 +00:00
|
|
|
}
|
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 file descriptor.
|
|
|
|
*
|
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_MALLOC Memory allocation error.
|
|
|
|
* @retval SR_ERR_BUG Internal error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.3.0
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_source_remove(int fd)
|
|
|
|
{
|
|
|
|
return _sr_session_source_remove((gintptr)fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Remove the source belonging to the specified poll descriptor.
|
|
|
|
*
|
|
|
|
* @param pollfd The poll descriptor for which the source should be removed.
|
|
|
|
*
|
|
|
|
* @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
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
|
|
|
|
{
|
|
|
|
return _sr_session_source_remove((gintptr)pollfd);
|
|
|
|
}
|
|
|
|
|
2012-10-21 21:24:42 +00:00
|
|
|
/**
|
2012-06-30 18:54:44 +00:00
|
|
|
* Remove the source belonging to the specified channel.
|
|
|
|
*
|
2012-07-04 23:47:44 +00:00
|
|
|
* @param channel The channel 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_MALLOC Memory allocation error.
|
|
|
|
* @return SR_ERR_BUG Internal error.
|
2014-05-04 18:51:05 +00:00
|
|
|
*
|
|
|
|
* @since 0.2.0
|
2012-06-30 18:54:44 +00:00
|
|
|
*/
|
|
|
|
SR_API int sr_session_source_remove_channel(GIOChannel *channel)
|
|
|
|
{
|
|
|
|
return _sr_session_source_remove((gintptr)channel);
|
|
|
|
}
|
2012-10-21 14:13:36 +00:00
|
|
|
|
|
|
|
/** @} */
|