blob: 720b5ae10819908b63018e1c8095cbfceed5bc49 [file] [log] [blame]
Uwe Hermanna1bb33a2010-04-02 20:18:27 +02001/*
Uwe Hermann50985c22013-04-23 22:24:30 +02002 * This file is part of the libsigrok project.
Uwe Hermanna1bb33a2010-04-02 20:18:27 +02003 *
Bert Vermeulenc73d2ea2012-02-13 14:31:51 +01004 * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
Uwe Hermanna1bb33a2010-04-02 20:18:27 +02005 *
6 * This program is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */
19
20#include <stdio.h>
21#include <stdlib.h>
22#include <unistd.h>
23#include <string.h>
Bert Vermeulen544a4582011-01-30 02:40:55 +010024#include <glib.h>
Bert Vermeulen45c59c82012-07-05 00:55:07 +020025#include "libsigrok.h"
26#include "libsigrok-internal.h"
Bert Vermeulenaa4b1102011-01-24 07:46:16 +010027
Uwe Hermann29a27192013-05-03 21:59:32 +020028/* Message logging helpers with subsystem-specific prefix string. */
29#define LOG_PREFIX "session: "
30#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
31#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
32#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
33#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
34#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
35#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
Uwe Hermanna421dc12013-01-29 12:55:00 +010036
Uwe Hermann7b870c32012-10-21 16:13:36 +020037/**
Uwe Hermann393fb9c2012-10-22 00:30:12 +020038 * @file
39 *
40 * Creating, using, or destroying libsigrok sessions.
41 */
42
43/**
Uwe Hermann7b870c32012-10-21 16:13:36 +020044 * @defgroup grp_session Session handling
45 *
46 * Creating, using, or destroying libsigrok sessions.
47 *
48 * @{
49 */
50
Bert Vermeulen544a4582011-01-30 02:40:55 +010051struct source {
Bert Vermeulen544a4582011-01-30 02:40:55 +010052 int timeout;
Uwe Hermannd08490a2012-02-29 21:56:24 +010053 sr_receive_data_callback_t cb;
Uwe Hermann1f9813e2012-02-29 22:32:34 +010054 void *cb_data;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +020055
56 /* This is used to keep track of the object (fd, pollfd or channel) which is
57 * being polled and will be used to match the source when removing it again.
58 */
59 gintptr poll_object;
Bert Vermeulen544a4582011-01-30 02:40:55 +010060};
61
Martin Ling27264742013-04-15 21:08:55 +010062struct datafeed_callback {
63 sr_datafeed_callback_t cb;
64 void *cb_data;
65};
66
Bert Vermeulen7d658872011-01-31 22:34:14 +010067/* There can only be one session at a time. */
Uwe Hermanna0ecd832011-12-28 22:55:21 +010068/* 'session' is not static, it's used elsewhere (via 'extern'). */
Uwe Hermann2872d212011-02-08 17:50:29 +010069struct sr_session *session;
Bert Vermeulen544a4582011-01-30 02:40:55 +010070
Uwe Hermann9f45fb32012-01-02 14:15:25 +010071/**
72 * Create a new session.
73 *
Uwe Hermann6b2d8d32012-10-21 23:24:42 +020074 * @todo Should it use the file-global "session" variable or take an argument?
Uwe Hermann9f45fb32012-01-02 14:15:25 +010075 * The same question applies to all the other session functions.
76 *
77 * @return A pointer to the newly allocated session, or NULL upon errors.
78 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +010079SR_API struct sr_session *sr_session_new(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020080{
Uwe Hermann133a37b2012-02-11 20:06:46 +010081 if (!(session = g_try_malloc0(sizeof(struct sr_session)))) {
Uwe Hermanna421dc12013-01-29 12:55:00 +010082 sr_err("Session malloc failed.");
83 return NULL;
Uwe Hermann9f45fb32012-01-02 14:15:25 +010084 }
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020085
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +020086 session->source_timeout = -1;
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -060087 session->abort_session = FALSE;
88 g_mutex_init(&session->stop_mutex);
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +020089
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020090 return session;
91}
92
Uwe Hermann9f45fb32012-01-02 14:15:25 +010093/**
94 * Destroy the current session.
95 *
96 * This frees up all memory used by the session.
97 *
Uwe Hermanne0508e62012-01-07 17:08:54 +010098 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +010099 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +0100100SR_API int sr_session_destroy(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200101{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100102 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100103 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100104 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100105 }
106
Lars-Peter Clausened229aa2012-07-05 21:15:07 +0200107 sr_session_dev_remove_all();
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200108
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100109 /* TODO: Error checks needed? */
110
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600111 g_mutex_clear(&session->stop_mutex);
112
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200113 g_free(session);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100114 session = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100115
116 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200117}
118
Uwe Hermann961009b2013-02-01 22:58:54 +0100119/**
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200120 * Remove all the devices from the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100121 *
122 * The session itself (i.e., the struct sr_session) is not free'd and still
123 * exists after this function returns.
124 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100125 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100126 */
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200127SR_API int sr_session_dev_remove_all(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200128{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100129 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100130 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100131 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100132 }
133
Bert Vermeulen681803d2013-04-28 22:35:42 +0200134 g_slist_free(session->devs);
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100135 session->devs = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100136
137 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200138}
139
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100140/**
Uwe Hermann9c5332d2012-10-21 16:52:56 +0200141 * Add a device instance to the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100142 *
Uwe Hermann9c5332d2012-10-21 16:52:56 +0200143 * @param sdi The device instance to add to the current session. Must not
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200144 * be NULL. Also, sdi->driver and sdi->driver->dev_open must
145 * not be NULL.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100146 *
147 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
148 */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200149SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200150{
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200151
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200152 if (!sdi) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100153 sr_err("%s: sdi was NULL", __func__);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100154 return SR_ERR_ARG;
155 }
156
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100157 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100158 sr_err("%s: session was NULL", __func__);
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100159 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100160 }
161
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200162 /* If sdi->driver is NULL, this is a virtual device. */
163 if (!sdi->driver) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100164 sr_dbg("%s: sdi->driver was NULL, this seems to be "
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100165 "a virtual device; continuing", __func__);
166 /* Just add the device, don't run dev_open(). */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200167 session->devs = g_slist_append(session->devs, (gpointer)sdi);
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100168 return SR_OK;
169 }
170
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200171 /* sdi->driver is non-NULL (i.e. we have a real device). */
172 if (!sdi->driver->dev_open) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100173 sr_err("%s: sdi->driver->dev_open was NULL", __func__);
Uwe Hermann8ec95d22012-03-21 19:28:43 +0100174 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100175 }
176
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200177 session->devs = g_slist_append(session->devs, (gpointer)sdi);
Bert Vermeulenaa4b1102011-01-24 07:46:16 +0100178
Uwe Hermanne46b8fb2011-01-29 16:23:12 +0100179 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200180}
181
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100182/**
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200183 * Remove all datafeed callbacks in the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100184 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100185 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100186 */
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200187SR_API int sr_session_datafeed_callback_remove_all(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200188{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100189 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100190 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100191 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100192 }
193
Martin Ling27264742013-04-15 21:08:55 +0100194 g_slist_free_full(session->datafeed_callbacks, g_free);
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200195 session->datafeed_callbacks = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100196
197 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200198}
199
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100200/**
201 * Add a datafeed callback to the current session.
202 *
Uwe Hermannd08490a2012-02-29 21:56:24 +0100203 * @param cb Function to call when a chunk of data is received.
Uwe Hermann0abee502012-03-04 15:08:11 +0100204 * Must not be NULL.
Uwe Hermann85222792013-04-16 12:48:58 +0200205 * @param cb_data Opaque pointer passed in by the caller.
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100206 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100207 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100208 */
Martin Ling27264742013-04-15 21:08:55 +0100209SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb, void *cb_data)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200210{
Martin Ling27264742013-04-15 21:08:55 +0100211 struct datafeed_callback *cb_struct;
212
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100213 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100214 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100215 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100216 }
217
Uwe Hermann0abee502012-03-04 15:08:11 +0100218 if (!cb) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100219 sr_err("%s: cb was NULL", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100220 return SR_ERR_ARG;
221 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100222
Martin Ling27264742013-04-15 21:08:55 +0100223 if (!(cb_struct = g_try_malloc0(sizeof(struct datafeed_callback))))
224 return SR_ERR_MALLOC;
225
226 cb_struct->cb = cb;
227 cb_struct->cb_data = cb_data;
228
Uwe Hermann62c82022010-04-15 20:16:53 +0200229 session->datafeed_callbacks =
Martin Ling27264742013-04-15 21:08:55 +0100230 g_slist_append(session->datafeed_callbacks, cb_struct);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100231
232 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200233}
234
Bert Vermeulenb483be72013-07-15 14:14:28 +0200235/**
236 * Call every device in the session's callback.
237 *
238 * For sessions not driven by select loops such as sr_session_run(),
239 * but driven by another scheduler, this can be used to poll the devices
240 * from within that scheduler.
241 *
242 * @return SR_OK upon success, SR_ERR on errors.
243 */
244SR_API int sr_session_iteration(gboolean block)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100245{
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200246 unsigned int i;
247 int ret;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100248
Bert Vermeulenb483be72013-07-15 14:14:28 +0200249 ret = g_poll(session->pollfds, session->num_sources,
250 block ? session->source_timeout : 0);
251 for (i = 0; i < session->num_sources; i++) {
252 if (session->pollfds[i].revents > 0 || (ret == 0
253 && session->source_timeout == session->sources[i].timeout)) {
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600254 /*
Bert Vermeulenb483be72013-07-15 14:14:28 +0200255 * Invoke the source's callback on an event,
256 * or if the poll timed out and this source
257 * asked for that timeout.
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600258 */
Bert Vermeulenb483be72013-07-15 14:14:28 +0200259 if (!session->sources[i].cb(session->pollfds[i].fd,
260 session->pollfds[i].revents,
261 session->sources[i].cb_data))
262 sr_session_source_remove(session->sources[i].poll_object);
Bert Vermeulen544a4582011-01-30 02:40:55 +0100263 }
Bert Vermeulenb483be72013-07-15 14:14:28 +0200264 /*
265 * We want to take as little time as possible to stop
266 * the session if we have been told to do so. Therefore,
267 * we check the flag after processing every source, not
268 * just once per main event loop.
269 */
270 g_mutex_lock(&session->stop_mutex);
271 if (session->abort_session) {
272 sr_session_stop_sync();
273 /* But once is enough. */
274 session->abort_session = FALSE;
275 }
276 g_mutex_unlock(&session->stop_mutex);
Bert Vermeulen544a4582011-01-30 02:40:55 +0100277 }
Uwe Hermanne0508e62012-01-07 17:08:54 +0100278
279 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100280}
281
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100282/**
283 * Start a session.
284 *
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100285 * There can only be one session at a time.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100286 *
287 * @return SR_OK upon success, SR_ERR upon errors.
288 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +0100289SR_API int sr_session_start(void)
Bert Vermeulen7d658872011-01-31 22:34:14 +0100290{
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200291 struct sr_dev_inst *sdi;
Bert Vermeulen7d658872011-01-31 22:34:14 +0100292 GSList *l;
293 int ret;
294
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100295 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100296 sr_err("%s: session was NULL; a session must be "
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200297 "created before starting it.", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100298 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100299 }
300
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100301 if (!session->devs) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100302 sr_err("%s: session->devs was NULL; a session "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100303 "cannot be started without devices.", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100304 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100305 }
306
Uwe Hermannc7142602013-02-07 09:16:28 +0100307 sr_info("Starting.");
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100308
Uwe Hermannb7c3e842012-12-31 21:05:11 +0100309 ret = SR_OK;
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100310 for (l = session->devs; l; l = l->next) {
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200311 sdi = l->data;
312 if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100313 sr_err("%s: could not start an acquisition "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100314 "(%d)", __func__, ret);
Bert Vermeulen7d658872011-01-31 22:34:14 +0100315 break;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100316 }
Bert Vermeulen7d658872011-01-31 22:34:14 +0100317 }
318
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100319 /* TODO: What if there are multiple devices? Which return code? */
320
Bert Vermeulen7d658872011-01-31 22:34:14 +0100321 return ret;
322}
323
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100324/**
325 * Run the session.
326 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100327 * @return SR_OK upon success, SR_ERR_BUG upon errors.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100328 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +0100329SR_API int sr_session_run(void)
Bert Vermeulen7d658872011-01-31 22:34:14 +0100330{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100331 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100332 sr_err("%s: session was NULL; a session must be "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100333 "created first, before running it.", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100334 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100335 }
336
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100337 if (!session->devs) {
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100338 /* TODO: Actually the case? */
Uwe Hermanna421dc12013-01-29 12:55:00 +0100339 sr_err("%s: session->devs was NULL; a session "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100340 "cannot be run without devices.", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100341 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100342 }
343
Uwe Hermanna421dc12013-01-29 12:55:00 +0100344 sr_info("Running.");
Bert Vermeulen7d658872011-01-31 22:34:14 +0100345
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100346 /* Do we have real sources? */
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200347 if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100348 /* Dummy source, freewheel over it. */
Bert Vermeulen2cbeb2b2012-08-03 01:04:05 +0200349 while (session->num_sources)
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200350 session->sources[0].cb(-1, 0, session->sources[0].cb_data);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100351 } else {
352 /* Real sources, use g_poll() main loop. */
Bert Vermeulenb483be72013-07-15 14:14:28 +0200353 while (session->num_sources)
354 sr_session_iteration(TRUE);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100355 }
356
Uwe Hermanne0508e62012-01-07 17:08:54 +0100357 return SR_OK;
Bert Vermeulen7d658872011-01-31 22:34:14 +0100358}
359
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100360/**
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100361 * Stop the current session.
362 *
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100363 * The current session is stopped immediately, with all acquisition sessions
Uwe Hermannc09f0b52012-02-28 23:52:30 +0100364 * being stopped and hardware drivers cleaned up.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100365 *
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600366 * This must be called from within the session thread, to prevent freeing
367 * resources that the session thread will try to use.
368 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100369 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100370 */
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600371SR_PRIV int sr_session_stop_sync(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200372{
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200373 struct sr_dev_inst *sdi;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200374 GSList *l;
375
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100376 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100377 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100378 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100379 }
380
Uwe Hermanna421dc12013-01-29 12:55:00 +0100381 sr_info("Stopping.");
Uwe Hermanne0508e62012-01-07 17:08:54 +0100382
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100383 for (l = session->devs; l; l = l->next) {
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200384 sdi = l->data;
385 if (sdi->driver) {
386 if (sdi->driver->dev_acquisition_stop)
387 sdi->driver->dev_acquisition_stop(sdi, sdi);
Bert Vermeulen8c76be52012-01-08 22:05:00 +0100388 }
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200389 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100390
Uwe Hermanne0508e62012-01-07 17:08:54 +0100391 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200392}
393
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100394/**
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600395 * Stop the current session.
396 *
397 * The current session is stopped immediately, with all acquisition sessions
398 * being stopped and hardware drivers cleaned up.
399 *
400 * If the session is run in a separate thread, this function will not block
401 * until the session is finished executing. It is the caller's responsibility
402 * to wait for the session thread to return before assuming that the session is
403 * completely decommissioned.
404 *
405 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
406 */
407SR_API int sr_session_stop(void)
408{
409 if (!session) {
410 sr_err("%s: session was NULL", __func__);
411 return SR_ERR_BUG;
412 }
413
414 g_mutex_lock(&session->stop_mutex);
415 session->abort_session = TRUE;
416 g_mutex_unlock(&session->stop_mutex);
417
418 return SR_OK;
419}
420
421/**
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100422 * Debug helper.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100423 *
Bert Vermeulen996b0c72012-02-13 02:13:51 +0100424 * @param packet The packet to show debugging information for.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100425 */
Joel Holdsworthbf534572012-12-13 21:07:53 +0000426static void datafeed_dump(const struct sr_datafeed_packet *packet)
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200427{
Joel Holdsworthbf534572012-12-13 21:07:53 +0000428 const struct sr_datafeed_logic *logic;
429 const struct sr_datafeed_analog *analog;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200430
431 switch (packet->type) {
432 case SR_DF_HEADER:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100433 sr_dbg("bus: Received SR_DF_HEADER packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200434 break;
435 case SR_DF_TRIGGER:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100436 sr_dbg("bus: Received SR_DF_TRIGGER packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200437 break;
Bert Vermeulenc71bac32013-01-20 16:37:23 +0100438 case SR_DF_META:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100439 sr_dbg("bus: Received SR_DF_META packet.");
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200440 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200441 case SR_DF_LOGIC:
442 logic = packet->payload;
Uwe Hermanna421dc12013-01-29 12:55:00 +0100443 sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes).",
444 logic->length);
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200445 break;
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200446 case SR_DF_ANALOG:
447 analog = packet->payload;
Uwe Hermanna421dc12013-01-29 12:55:00 +0100448 sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
449 analog->num_samples);
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200450 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200451 case SR_DF_END:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100452 sr_dbg("bus: Received SR_DF_END packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200453 break;
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200454 case SR_DF_FRAME_BEGIN:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100455 sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200456 break;
457 case SR_DF_FRAME_END:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100458 sr_dbg("bus: Received SR_DF_FRAME_END packet.");
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200459 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200460 default:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100461 sr_dbg("bus: Received unknown packet type: %d.", packet->type);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100462 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200463 }
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200464}
465
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100466/**
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100467 * Send a packet to whatever is listening on the datafeed bus.
468 *
469 * Hardware drivers use this to send a data packet to the frontend.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100470 *
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200471 * @param sdi TODO.
Uwe Hermann31ccebc2012-02-29 22:08:45 +0100472 * @param packet The datafeed packet to send to the session bus.
Uwe Hermann44dae532012-02-17 20:44:19 +0100473 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100474 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
Uwe Hermannb4bd7082012-10-19 10:07:22 +0200475 *
476 * @private
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100477 */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200478SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
Joel Holdsworthbf534572012-12-13 21:07:53 +0000479 const struct sr_datafeed_packet *packet)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200480{
481 GSList *l;
Martin Ling27264742013-04-15 21:08:55 +0100482 struct datafeed_callback *cb_struct;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200483
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200484 if (!sdi) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100485 sr_err("%s: sdi was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100486 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100487 }
488
Uwe Hermanne0508e62012-01-07 17:08:54 +0100489 if (!packet) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100490 sr_err("%s: packet was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100491 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100492 }
493
Uwe Hermann62c82022010-04-15 20:16:53 +0200494 for (l = session->datafeed_callbacks; l; l = l->next) {
Bert Vermeulen18beaef2012-02-13 00:08:23 +0100495 if (sr_log_loglevel_get() >= SR_LOG_DBG)
496 datafeed_dump(packet);
Martin Ling27264742013-04-15 21:08:55 +0100497 cb_struct = l->data;
498 cb_struct->cb(sdi, packet, cb_struct->cb_data);
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200499 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100500
Uwe Hermanne0508e62012-01-07 17:08:54 +0100501 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200502}
503
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200504/**
505 * Add an event source for a file descriptor.
506 *
507 * @param pollfd The GPollFD.
508 * @param timeout Max time to wait before the callback is called, ignored if 0.
509 * @param cb Callback function to add. Must not be NULL.
510 * @param cb_data Data for the callback function. Can be NULL.
511 * @param poll_object TODO.
512 *
513 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
514 * SR_ERR_MALLOC upon memory allocation errors.
515 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200516static int _sr_session_source_add(GPollFD *pollfd, int timeout,
Uwe Hermann1a895c62012-07-05 01:47:44 +0200517 sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100518{
519 struct source *new_sources, *s;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200520 GPollFD *new_pollfds;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100521
Uwe Hermannd08490a2012-02-29 21:56:24 +0100522 if (!cb) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100523 sr_err("%s: cb was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100524 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100525 }
526
Uwe Hermann1f9813e2012-02-29 22:32:34 +0100527 /* Note: cb_data can be NULL, that's not a bug. */
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100528
Bert Vermeulen2ac2e622012-07-22 15:32:35 +0200529 new_pollfds = g_try_realloc(session->pollfds,
530 sizeof(GPollFD) * (session->num_sources + 1));
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200531 if (!new_pollfds) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100532 sr_err("%s: new_pollfds malloc failed", __func__);
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200533 return SR_ERR_MALLOC;
534 }
535
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200536 new_sources = g_try_realloc(session->sources, sizeof(struct source) *
Bert Vermeulen2ac2e622012-07-22 15:32:35 +0200537 (session->num_sources + 1));
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100538 if (!new_sources) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100539 sr_err("%s: new_sources malloc failed", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100540 return SR_ERR_MALLOC;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100541 }
Bert Vermeulen544a4582011-01-30 02:40:55 +0100542
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200543 new_pollfds[session->num_sources] = *pollfd;
544 s = &new_sources[session->num_sources++];
Bert Vermeulen544a4582011-01-30 02:40:55 +0100545 s->timeout = timeout;
Uwe Hermannd08490a2012-02-29 21:56:24 +0100546 s->cb = cb;
Uwe Hermann1f9813e2012-02-29 22:32:34 +0100547 s->cb_data = cb_data;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200548 s->poll_object = poll_object;
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200549 session->pollfds = new_pollfds;
550 session->sources = new_sources;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100551
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200552 if (timeout != session->source_timeout && timeout > 0
553 && (session->source_timeout == -1 || timeout < session->source_timeout))
554 session->source_timeout = timeout;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100555
Uwe Hermanne0508e62012-01-07 17:08:54 +0100556 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100557}
558
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100559/**
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200560 * Add an event source for a file descriptor.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100561 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200562 * @param fd The file descriptor.
563 * @param events Events to check for.
564 * @param timeout Max time to wait before the callback is called, ignored if 0.
565 * @param cb Callback function to add. Must not be NULL.
566 * @param cb_data Data for the callback function. Can be NULL.
Uwe Hermann44dae532012-02-17 20:44:19 +0100567 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100568 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200569 * SR_ERR_MALLOC upon memory allocation errors.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100570 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200571SR_API int sr_session_source_add(int fd, int events, int timeout,
572 sr_receive_data_callback_t cb, void *cb_data)
573{
574 GPollFD p;
575
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200576 p.fd = fd;
577 p.events = events;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200578
579 return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd);
580}
581
582/**
Uwe Hermann1a895c62012-07-05 01:47:44 +0200583 * Add an event source for a GPollFD.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200584 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200585 * @param pollfd The GPollFD.
586 * @param timeout Max time to wait before the callback is called, ignored if 0.
587 * @param cb Callback function to add. Must not be NULL.
588 * @param cb_data Data for the callback function. Can be NULL.
589 *
590 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
591 * SR_ERR_MALLOC upon memory allocation errors.
592 */
593SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
594 sr_receive_data_callback_t cb, void *cb_data)
595{
Uwe Hermann1a895c62012-07-05 01:47:44 +0200596 return _sr_session_source_add(pollfd, timeout, cb,
597 cb_data, (gintptr)pollfd);
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200598}
599
600/**
Uwe Hermann1a895c62012-07-05 01:47:44 +0200601 * Add an event source for a GIOChannel.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200602 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200603 * @param channel The GIOChannel.
604 * @param events Events to poll on.
605 * @param timeout Max time to wait before the callback is called, ignored if 0.
606 * @param cb Callback function to add. Must not be NULL.
607 * @param cb_data Data for the callback function. Can be NULL.
608 *
609 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
610 * SR_ERR_MALLOC upon memory allocation errors.
611 */
Uwe Hermann1a895c62012-07-05 01:47:44 +0200612SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
613 int timeout, sr_receive_data_callback_t cb, void *cb_data)
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200614{
615 GPollFD p;
616
617#ifdef _WIN32
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200618 g_io_channel_win32_make_pollfd(channel, events, &p);
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200619#else
620 p.fd = g_io_channel_unix_get_fd(channel);
621 p.events = events;
622#endif
623
624 return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)channel);
625}
626
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200627/**
628 * Remove the source belonging to the specified channel.
629 *
630 * @todo Add more error checks and logging.
631 *
632 * @param channel The channel for which the source should be removed.
633 *
634 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
635 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
636 * internal errors.
637 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200638static int _sr_session_source_remove(gintptr poll_object)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100639{
640 struct source *new_sources;
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200641 GPollFD *new_pollfds;
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200642 unsigned int old;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100643
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200644 if (!session->sources || !session->num_sources) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100645 sr_err("%s: sources was NULL", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100646 return SR_ERR_BUG;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100647 }
648
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200649 for (old = 0; old < session->num_sources; old++) {
650 if (session->sources[old].poll_object == poll_object)
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200651 break;
652 }
Bert Vermeulen544a4582011-01-30 02:40:55 +0100653
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200654 /* fd not found, nothing to do */
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200655 if (old == session->num_sources)
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200656 return SR_OK;
657
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200658 session->num_sources -= 1;
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200659
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200660 if (old != session->num_sources) {
661 memmove(&session->pollfds[old], &session->pollfds[old+1],
662 (session->num_sources - old) * sizeof(GPollFD));
663 memmove(&session->sources[old], &session->sources[old+1],
664 (session->num_sources - old) * sizeof(struct source));
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200665 }
666
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200667 new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
668 if (!new_pollfds && session->num_sources > 0) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100669 sr_err("%s: new_pollfds malloc failed", __func__);
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200670 return SR_ERR_MALLOC;
671 }
672
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200673 new_sources = g_try_realloc(session->sources, sizeof(struct source) * session->num_sources);
674 if (!new_sources && session->num_sources > 0) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100675 sr_err("%s: new_sources malloc failed", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100676 return SR_ERR_MALLOC;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100677 }
678
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200679 session->pollfds = new_pollfds;
680 session->sources = new_sources;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100681
682 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100683}
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200684
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200685/**
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200686 * Remove the source belonging to the specified file descriptor.
687 *
Uwe Hermann1a895c62012-07-05 01:47:44 +0200688 * @param fd The file descriptor for which the source should be removed.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200689 *
690 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
691 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
692 * internal errors.
693 */
694SR_API int sr_session_source_remove(int fd)
695{
696 return _sr_session_source_remove((gintptr)fd);
697}
698
699/**
700 * Remove the source belonging to the specified poll descriptor.
701 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200702 * @param pollfd The poll descriptor for which the source should be removed.
703 *
704 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
705 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
706 * internal errors.
707 */
708SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
709{
710 return _sr_session_source_remove((gintptr)pollfd);
711}
712
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200713/**
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200714 * Remove the source belonging to the specified channel.
715 *
Uwe Hermann1a895c62012-07-05 01:47:44 +0200716 * @param channel The channel for which the source should be removed.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200717 *
718 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
719 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
720 * internal errors.
721 */
722SR_API int sr_session_source_remove_channel(GIOChannel *channel)
723{
724 return _sr_session_source_remove((gintptr)channel);
725}
Uwe Hermann7b870c32012-10-21 16:13:36 +0200726
727/** @} */