blob: acf1158b4e3ad0e75061c4aa9ab831f5c5aadbd1 [file] [log] [blame]
Uwe Hermanna1bb33a2010-04-02 20:18:27 +02001/*
2 * This file is part of the sigrok project.
3 *
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 Hermanna421dc12013-01-29 12:55:00 +010028/* Message logging helpers with driver-specific prefix string. */
29#define DRIVER_LOG_DOMAIN "session: "
30#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
31#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
32#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
33#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
34#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
35#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
36
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
Bert Vermeulen7d658872011-01-31 22:34:14 +010062/* There can only be one session at a time. */
Uwe Hermanna0ecd832011-12-28 22:55:21 +010063/* 'session' is not static, it's used elsewhere (via 'extern'). */
Uwe Hermann2872d212011-02-08 17:50:29 +010064struct sr_session *session;
Bert Vermeulen544a4582011-01-30 02:40:55 +010065
Uwe Hermann9f45fb32012-01-02 14:15:25 +010066/**
67 * Create a new session.
68 *
Uwe Hermann6b2d8d32012-10-21 23:24:42 +020069 * @todo Should it use the file-global "session" variable or take an argument?
Uwe Hermann9f45fb32012-01-02 14:15:25 +010070 * The same question applies to all the other session functions.
71 *
72 * @return A pointer to the newly allocated session, or NULL upon errors.
73 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +010074SR_API struct sr_session *sr_session_new(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020075{
Uwe Hermann133a37b2012-02-11 20:06:46 +010076 if (!(session = g_try_malloc0(sizeof(struct sr_session)))) {
Uwe Hermanna421dc12013-01-29 12:55:00 +010077 sr_err("Session malloc failed.");
78 return NULL;
Uwe Hermann9f45fb32012-01-02 14:15:25 +010079 }
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020080
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +020081 session->source_timeout = -1;
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -060082 session->abort_session = FALSE;
83 g_mutex_init(&session->stop_mutex);
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +020084
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020085 return session;
86}
87
Uwe Hermann9f45fb32012-01-02 14:15:25 +010088/**
89 * Destroy the current session.
90 *
91 * This frees up all memory used by the session.
92 *
Uwe Hermanne0508e62012-01-07 17:08:54 +010093 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +010094 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +010095SR_API int sr_session_destroy(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +020096{
Uwe Hermann9f45fb32012-01-02 14:15:25 +010097 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +010098 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +010099 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100100 }
101
Lars-Peter Clausened229aa2012-07-05 21:15:07 +0200102 sr_session_dev_remove_all();
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200103
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100104 /* TODO: Error checks needed? */
105
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600106 g_mutex_clear(&session->stop_mutex);
107
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200108 g_free(session);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100109 session = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100110
111 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200112}
113
Uwe Hermann961009b2013-02-01 22:58:54 +0100114/**
115 * Close a device instance.
116 *
117 * @param sdi The device instance to close. Must not be NULL. Also,
118 * sdi->driver, sdi->driver->priv, and sdi->priv must not be NULL.
119 */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200120static void sr_dev_close(struct sr_dev_inst *sdi)
Lars-Peter Clausened229aa2012-07-05 21:15:07 +0200121{
Uwe Hermann961009b2013-02-01 22:58:54 +0100122 int ret;
123
124 if (!sdi) {
125 sr_err("Invalid device instance, can't close device.");
126 return;
127 }
128
129 /* In the drivers sdi->priv is a 'struct dev_context *devc'. */
130 if (!sdi->priv) {
131 /*
132 * Should be sr_err() in theory, but the 'demo' driver has
133 * NULL for sdi->priv, so we use sr_dbg() until that's fixed.
134 */
135 sr_dbg("Invalid device context, can't close device.");
136 return;
137 }
138
139 if (!sdi->driver) {
140 sr_err("Invalid driver, can't close device.");
141 return;
142 }
143
144 if (!sdi->driver->priv) {
145 sr_err("Driver not initialized, can't close device.");
146 return;
147 }
148
149 sr_spew("Closing '%s' device instance %d.", sdi->driver->name,
150 sdi->index);
151
152 if ((ret = sdi->driver->dev_close(sdi)) < 0)
153 sr_err("Failed to close device instance: %d.", ret);
Lars-Peter Clausened229aa2012-07-05 21:15:07 +0200154}
155
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100156/**
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200157 * Remove all the devices from the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100158 *
159 * The session itself (i.e., the struct sr_session) is not free'd and still
160 * exists after this function returns.
161 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100162 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100163 */
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200164SR_API int sr_session_dev_remove_all(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200165{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100166 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100167 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100168 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100169 }
170
Lars-Peter Clausened229aa2012-07-05 21:15:07 +0200171 g_slist_free_full(session->devs, (GDestroyNotify)sr_dev_close);
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100172 session->devs = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100173
174 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200175}
176
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100177/**
Uwe Hermann9c5332d2012-10-21 16:52:56 +0200178 * Add a device instance to the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100179 *
Uwe Hermann9c5332d2012-10-21 16:52:56 +0200180 * @param sdi The device instance to add to the current session. Must not
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200181 * be NULL. Also, sdi->driver and sdi->driver->dev_open must
182 * not be NULL.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100183 *
184 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
185 */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200186SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200187{
188 int ret;
189
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200190 if (!sdi) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100191 sr_err("%s: sdi was NULL", __func__);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100192 return SR_ERR_ARG;
193 }
194
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100195 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100196 sr_err("%s: session was NULL", __func__);
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100197 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100198 }
199
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200200 /* If sdi->driver is NULL, this is a virtual device. */
201 if (!sdi->driver) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100202 sr_dbg("%s: sdi->driver was NULL, this seems to be "
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100203 "a virtual device; continuing", __func__);
204 /* Just add the device, don't run dev_open(). */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200205 session->devs = g_slist_append(session->devs, (gpointer)sdi);
Uwe Hermannd6eb0c32012-03-18 12:57:34 +0100206 return SR_OK;
207 }
208
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200209 /* sdi->driver is non-NULL (i.e. we have a real device). */
210 if (!sdi->driver->dev_open) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100211 sr_err("%s: sdi->driver->dev_open was NULL", __func__);
Uwe Hermann8ec95d22012-03-21 19:28:43 +0100212 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100213 }
214
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200215 if ((ret = sdi->driver->dev_open((struct sr_dev_inst *)sdi)) != SR_OK) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100216 sr_err("%s: dev_open failed (%d)", __func__, ret);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100217 return ret;
Bert Vermeulenaa4b1102011-01-24 07:46:16 +0100218 }
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200219
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200220 session->devs = g_slist_append(session->devs, (gpointer)sdi);
Bert Vermeulenaa4b1102011-01-24 07:46:16 +0100221
Uwe Hermanne46b8fb2011-01-29 16:23:12 +0100222 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200223}
224
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100225/**
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200226 * Remove all datafeed callbacks in the current session.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100227 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100228 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100229 */
Uwe Hermann01c3e9d2012-03-28 21:55:48 +0200230SR_API int sr_session_datafeed_callback_remove_all(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200231{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100232 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100233 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100234 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100235 }
236
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200237 g_slist_free(session->datafeed_callbacks);
238 session->datafeed_callbacks = NULL;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100239
240 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200241}
242
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100243/**
244 * Add a datafeed callback to the current session.
245 *
Uwe Hermannd08490a2012-02-29 21:56:24 +0100246 * @param cb Function to call when a chunk of data is received.
Uwe Hermann0abee502012-03-04 15:08:11 +0100247 * Must not be NULL.
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100248 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100249 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100250 */
Uwe Hermannd08490a2012-02-29 21:56:24 +0100251SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200252{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100253 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100254 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100255 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100256 }
257
Uwe Hermann0abee502012-03-04 15:08:11 +0100258 if (!cb) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100259 sr_err("%s: cb was NULL", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100260 return SR_ERR_ARG;
261 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100262
Uwe Hermann62c82022010-04-15 20:16:53 +0200263 session->datafeed_callbacks =
Uwe Hermannd08490a2012-02-29 21:56:24 +0100264 g_slist_append(session->datafeed_callbacks, cb);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100265
266 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200267}
268
Uwe Hermanne0508e62012-01-07 17:08:54 +0100269static int sr_session_run_poll(void)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100270{
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200271 unsigned int i;
272 int ret;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100273
Bert Vermeulen2cbeb2b2012-08-03 01:04:05 +0200274 while (session->num_sources > 0) {
275 ret = g_poll(session->pollfds, session->num_sources,
276 session->source_timeout);
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200277 for (i = 0; i < session->num_sources; i++) {
278 if (session->pollfds[i].revents > 0 || (ret == 0
279 && session->source_timeout == session->sources[i].timeout)) {
Bert Vermeulen544a4582011-01-30 02:40:55 +0100280 /*
281 * Invoke the source's callback on an event,
Bert Vermeulen2cbeb2b2012-08-03 01:04:05 +0200282 * or if the poll timed out and this source
Bert Vermeulen544a4582011-01-30 02:40:55 +0100283 * asked for that timeout.
284 */
Bert Vermeulen2cbeb2b2012-08-03 01:04:05 +0200285 if (!session->sources[i].cb(session->pollfds[i].fd,
286 session->pollfds[i].revents,
287 session->sources[i].cb_data))
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200288 sr_session_source_remove(session->sources[i].poll_object);
Bert Vermeulen544a4582011-01-30 02:40:55 +0100289 }
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600290 /*
291 * We want to take as little time as possible to stop
292 * the session if we have been told to do so. Therefore,
293 * we check the flag after processing every source, not
294 * just once per main event loop.
295 */
296 g_mutex_lock(&session->stop_mutex);
297 if (session->abort_session)
298 sr_session_stop_sync();
299 g_mutex_unlock(&session->stop_mutex);
Bert Vermeulen544a4582011-01-30 02:40:55 +0100300 }
301 }
Uwe Hermanne0508e62012-01-07 17:08:54 +0100302
303 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100304}
305
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100306/**
307 * Start a session.
308 *
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100309 * There can only be one session at a time.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100310 *
311 * @return SR_OK upon success, SR_ERR upon errors.
312 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +0100313SR_API int sr_session_start(void)
Bert Vermeulen7d658872011-01-31 22:34:14 +0100314{
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200315 struct sr_dev_inst *sdi;
Bert Vermeulen7d658872011-01-31 22:34:14 +0100316 GSList *l;
317 int ret;
318
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100319 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100320 sr_err("%s: session was NULL; a session must be "
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200321 "created before starting it.", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100322 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100323 }
324
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100325 if (!session->devs) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100326 sr_err("%s: session->devs was NULL; a session "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100327 "cannot be started without devices.", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100328 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100329 }
330
Uwe Hermannc7142602013-02-07 09:16:28 +0100331 sr_info("Starting.");
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100332
Uwe Hermannb7c3e842012-12-31 21:05:11 +0100333 ret = SR_OK;
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100334 for (l = session->devs; l; l = l->next) {
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200335 sdi = l->data;
336 if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100337 sr_err("%s: could not start an acquisition "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100338 "(%d)", __func__, ret);
Bert Vermeulen7d658872011-01-31 22:34:14 +0100339 break;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100340 }
Bert Vermeulen7d658872011-01-31 22:34:14 +0100341 }
342
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100343 /* TODO: What if there are multiple devices? Which return code? */
344
Bert Vermeulen7d658872011-01-31 22:34:14 +0100345 return ret;
346}
347
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100348/**
349 * Run the session.
350 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100351 * @return SR_OK upon success, SR_ERR_BUG upon errors.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100352 */
Uwe Hermann1a081ca2012-02-01 23:40:35 +0100353SR_API int sr_session_run(void)
Bert Vermeulen7d658872011-01-31 22:34:14 +0100354{
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100355 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100356 sr_err("%s: session was NULL; a session must be "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100357 "created first, before running it.", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100358 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100359 }
360
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100361 if (!session->devs) {
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100362 /* TODO: Actually the case? */
Uwe Hermanna421dc12013-01-29 12:55:00 +0100363 sr_err("%s: session->devs was NULL; a session "
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100364 "cannot be run without devices.", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100365 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100366 }
367
Uwe Hermanna421dc12013-01-29 12:55:00 +0100368 sr_info("Running.");
Bert Vermeulen7d658872011-01-31 22:34:14 +0100369
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100370 /* Do we have real sources? */
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200371 if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100372 /* Dummy source, freewheel over it. */
Bert Vermeulen2cbeb2b2012-08-03 01:04:05 +0200373 while (session->num_sources)
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200374 session->sources[0].cb(-1, 0, session->sources[0].cb_data);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100375 } else {
376 /* Real sources, use g_poll() main loop. */
Uwe Hermann8a2efef2011-02-08 18:00:49 +0100377 sr_session_run_poll();
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100378 }
379
Uwe Hermanne0508e62012-01-07 17:08:54 +0100380 return SR_OK;
Bert Vermeulen7d658872011-01-31 22:34:14 +0100381}
382
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100383/**
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100384 * Stop the current session.
385 *
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100386 * The current session is stopped immediately, with all acquisition sessions
Uwe Hermannc09f0b52012-02-28 23:52:30 +0100387 * being stopped and hardware drivers cleaned up.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100388 *
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600389 * This must be called from within the session thread, to prevent freeing
390 * resources that the session thread will try to use.
391 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100392 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100393 */
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600394SR_PRIV int sr_session_stop_sync(void)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200395{
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200396 struct sr_dev_inst *sdi;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200397 GSList *l;
398
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100399 if (!session) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100400 sr_err("%s: session was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100401 return SR_ERR_BUG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100402 }
403
Uwe Hermanna421dc12013-01-29 12:55:00 +0100404 sr_info("Stopping.");
Uwe Hermanne0508e62012-01-07 17:08:54 +0100405
Uwe Hermannbb7ef792012-02-17 22:25:01 +0100406 for (l = session->devs; l; l = l->next) {
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200407 sdi = l->data;
408 if (sdi->driver) {
409 if (sdi->driver->dev_acquisition_stop)
410 sdi->driver->dev_acquisition_stop(sdi, sdi);
Bert Vermeulen8c76be52012-01-08 22:05:00 +0100411 }
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200412 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100413
Alexandru Gagniucf1f7e622012-12-19 04:15:18 -0600414 /*
415 * Some sources may not be necessarily associated with a device.
416 * Those sources may still be present even after stopping all devices.
417 * We need to make sure all sources are removed, or we risk running the
418 * session in an infinite loop.
419 */
420 while (session->num_sources)
421 sr_session_source_remove(session->sources[0].poll_object);
422
Uwe Hermanne0508e62012-01-07 17:08:54 +0100423 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200424}
425
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100426/**
Alexandru Gagniuc33c6e4c2013-02-02 00:50:00 -0600427 * Stop the current session.
428 *
429 * The current session is stopped immediately, with all acquisition sessions
430 * being stopped and hardware drivers cleaned up.
431 *
432 * If the session is run in a separate thread, this function will not block
433 * until the session is finished executing. It is the caller's responsibility
434 * to wait for the session thread to return before assuming that the session is
435 * completely decommissioned.
436 *
437 * @return SR_OK upon success, SR_ERR_BUG if no session exists.
438 */
439SR_API int sr_session_stop(void)
440{
441 if (!session) {
442 sr_err("%s: session was NULL", __func__);
443 return SR_ERR_BUG;
444 }
445
446 g_mutex_lock(&session->stop_mutex);
447 session->abort_session = TRUE;
448 g_mutex_unlock(&session->stop_mutex);
449
450 return SR_OK;
451}
452
453/**
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100454 * Debug helper.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100455 *
Bert Vermeulen996b0c72012-02-13 02:13:51 +0100456 * @param packet The packet to show debugging information for.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100457 */
Joel Holdsworthbf534572012-12-13 21:07:53 +0000458static void datafeed_dump(const struct sr_datafeed_packet *packet)
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200459{
Joel Holdsworthbf534572012-12-13 21:07:53 +0000460 const struct sr_datafeed_logic *logic;
461 const struct sr_datafeed_analog *analog;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200462
463 switch (packet->type) {
464 case SR_DF_HEADER:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100465 sr_dbg("bus: Received SR_DF_HEADER packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200466 break;
467 case SR_DF_TRIGGER:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100468 sr_dbg("bus: Received SR_DF_TRIGGER packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200469 break;
Bert Vermeulenc71bac32013-01-20 16:37:23 +0100470 case SR_DF_META:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100471 sr_dbg("bus: Received SR_DF_META packet.");
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200472 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200473 case SR_DF_LOGIC:
474 logic = packet->payload;
Uwe Hermanna421dc12013-01-29 12:55:00 +0100475 sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes).",
476 logic->length);
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200477 break;
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200478 case SR_DF_ANALOG:
479 analog = packet->payload;
Uwe Hermanna421dc12013-01-29 12:55:00 +0100480 sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
481 analog->num_samples);
Bert Vermeulenee7489d2012-04-22 18:11:31 +0200482 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200483 case SR_DF_END:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100484 sr_dbg("bus: Received SR_DF_END packet.");
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200485 break;
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200486 case SR_DF_FRAME_BEGIN:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100487 sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200488 break;
489 case SR_DF_FRAME_END:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100490 sr_dbg("bus: Received SR_DF_FRAME_END packet.");
Bert Vermeulen6ea76692012-04-30 19:55:06 +0200491 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200492 default:
Uwe Hermanna421dc12013-01-29 12:55:00 +0100493 sr_dbg("bus: Received unknown packet type: %d.", packet->type);
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100494 break;
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200495 }
Bert Vermeulen7d2afd62011-06-20 11:42:43 +0200496}
497
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100498/**
Bert Vermeulena1645fc2012-02-13 03:36:32 +0100499 * Send a packet to whatever is listening on the datafeed bus.
500 *
501 * Hardware drivers use this to send a data packet to the frontend.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100502 *
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200503 * @param sdi TODO.
Uwe Hermann31ccebc2012-02-29 22:08:45 +0100504 * @param packet The datafeed packet to send to the session bus.
Uwe Hermann44dae532012-02-17 20:44:19 +0100505 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100506 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
Uwe Hermannb4bd7082012-10-19 10:07:22 +0200507 *
508 * @private
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100509 */
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200510SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
Joel Holdsworthbf534572012-12-13 21:07:53 +0000511 const struct sr_datafeed_packet *packet)
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200512{
513 GSList *l;
Uwe Hermannd08490a2012-02-29 21:56:24 +0100514 sr_datafeed_callback_t cb;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200515
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200516 if (!sdi) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100517 sr_err("%s: sdi was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100518 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100519 }
520
Uwe Hermanne0508e62012-01-07 17:08:54 +0100521 if (!packet) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100522 sr_err("%s: packet was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100523 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100524 }
525
Uwe Hermann62c82022010-04-15 20:16:53 +0200526 for (l = session->datafeed_callbacks; l; l = l->next) {
Bert Vermeulen18beaef2012-02-13 00:08:23 +0100527 if (sr_log_loglevel_get() >= SR_LOG_DBG)
528 datafeed_dump(packet);
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200529 cb = l->data;
Bert Vermeulende4d3f92012-07-22 15:31:56 +0200530 cb(sdi, packet);
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200531 }
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100532
Uwe Hermanne0508e62012-01-07 17:08:54 +0100533 return SR_OK;
Uwe Hermanna1bb33a2010-04-02 20:18:27 +0200534}
535
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200536/**
537 * Add an event source for a file descriptor.
538 *
539 * @param pollfd The GPollFD.
540 * @param timeout Max time to wait before the callback is called, ignored if 0.
541 * @param cb Callback function to add. Must not be NULL.
542 * @param cb_data Data for the callback function. Can be NULL.
543 * @param poll_object TODO.
544 *
545 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
546 * SR_ERR_MALLOC upon memory allocation errors.
547 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200548static int _sr_session_source_add(GPollFD *pollfd, int timeout,
Uwe Hermann1a895c62012-07-05 01:47:44 +0200549 sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100550{
551 struct source *new_sources, *s;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200552 GPollFD *new_pollfds;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100553
Uwe Hermannd08490a2012-02-29 21:56:24 +0100554 if (!cb) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100555 sr_err("%s: cb was NULL", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100556 return SR_ERR_ARG;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100557 }
558
Uwe Hermann1f9813e2012-02-29 22:32:34 +0100559 /* Note: cb_data can be NULL, that's not a bug. */
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100560
Bert Vermeulen2ac2e622012-07-22 15:32:35 +0200561 new_pollfds = g_try_realloc(session->pollfds,
562 sizeof(GPollFD) * (session->num_sources + 1));
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200563 if (!new_pollfds) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100564 sr_err("%s: new_pollfds malloc failed", __func__);
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200565 return SR_ERR_MALLOC;
566 }
567
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200568 new_sources = g_try_realloc(session->sources, sizeof(struct source) *
Bert Vermeulen2ac2e622012-07-22 15:32:35 +0200569 (session->num_sources + 1));
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100570 if (!new_sources) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100571 sr_err("%s: new_sources malloc failed", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100572 return SR_ERR_MALLOC;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100573 }
Bert Vermeulen544a4582011-01-30 02:40:55 +0100574
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200575 new_pollfds[session->num_sources] = *pollfd;
576 s = &new_sources[session->num_sources++];
Bert Vermeulen544a4582011-01-30 02:40:55 +0100577 s->timeout = timeout;
Uwe Hermannd08490a2012-02-29 21:56:24 +0100578 s->cb = cb;
Uwe Hermann1f9813e2012-02-29 22:32:34 +0100579 s->cb_data = cb_data;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200580 s->poll_object = poll_object;
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200581 session->pollfds = new_pollfds;
582 session->sources = new_sources;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100583
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200584 if (timeout != session->source_timeout && timeout > 0
585 && (session->source_timeout == -1 || timeout < session->source_timeout))
586 session->source_timeout = timeout;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100587
Uwe Hermanne0508e62012-01-07 17:08:54 +0100588 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100589}
590
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100591/**
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200592 * Add an event source for a file descriptor.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100593 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200594 * @param fd The file descriptor.
595 * @param events Events to check for.
596 * @param timeout Max time to wait before the callback is called, ignored if 0.
597 * @param cb Callback function to add. Must not be NULL.
598 * @param cb_data Data for the callback function. Can be NULL.
Uwe Hermann44dae532012-02-17 20:44:19 +0100599 *
Uwe Hermanne0508e62012-01-07 17:08:54 +0100600 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200601 * SR_ERR_MALLOC upon memory allocation errors.
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100602 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200603SR_API int sr_session_source_add(int fd, int events, int timeout,
604 sr_receive_data_callback_t cb, void *cb_data)
605{
606 GPollFD p;
607
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200608 p.fd = fd;
609 p.events = events;
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200610
611 return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd);
612}
613
614/**
Uwe Hermann1a895c62012-07-05 01:47:44 +0200615 * Add an event source for a GPollFD.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200616 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200617 * @param pollfd The GPollFD.
618 * @param timeout Max time to wait before the callback is called, ignored if 0.
619 * @param cb Callback function to add. Must not be NULL.
620 * @param cb_data Data for the callback function. Can be NULL.
621 *
622 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
623 * SR_ERR_MALLOC upon memory allocation errors.
624 */
625SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
626 sr_receive_data_callback_t cb, void *cb_data)
627{
Uwe Hermann1a895c62012-07-05 01:47:44 +0200628 return _sr_session_source_add(pollfd, timeout, cb,
629 cb_data, (gintptr)pollfd);
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200630}
631
632/**
Uwe Hermann1a895c62012-07-05 01:47:44 +0200633 * Add an event source for a GIOChannel.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200634 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200635 * @param channel The GIOChannel.
636 * @param events Events to poll on.
637 * @param timeout Max time to wait before the callback is called, ignored if 0.
638 * @param cb Callback function to add. Must not be NULL.
639 * @param cb_data Data for the callback function. Can be NULL.
640 *
641 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
642 * SR_ERR_MALLOC upon memory allocation errors.
643 */
Uwe Hermann1a895c62012-07-05 01:47:44 +0200644SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
645 int timeout, sr_receive_data_callback_t cb, void *cb_data)
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200646{
647 GPollFD p;
648
649#ifdef _WIN32
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200650 g_io_channel_win32_make_pollfd(channel, events, &p);
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200651#else
652 p.fd = g_io_channel_unix_get_fd(channel);
653 p.events = events;
654#endif
655
656 return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)channel);
657}
658
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200659/**
660 * Remove the source belonging to the specified channel.
661 *
662 * @todo Add more error checks and logging.
663 *
664 * @param channel The channel for which the source should be removed.
665 *
666 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
667 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
668 * internal errors.
669 */
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200670static int _sr_session_source_remove(gintptr poll_object)
Bert Vermeulen544a4582011-01-30 02:40:55 +0100671{
672 struct source *new_sources;
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200673 GPollFD *new_pollfds;
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200674 unsigned int old;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100675
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200676 if (!session->sources || !session->num_sources) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100677 sr_err("%s: sources was NULL", __func__);
Uwe Hermann0abee502012-03-04 15:08:11 +0100678 return SR_ERR_BUG;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100679 }
680
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200681 for (old = 0; old < session->num_sources; old++) {
682 if (session->sources[old].poll_object == poll_object)
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200683 break;
684 }
Bert Vermeulen544a4582011-01-30 02:40:55 +0100685
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200686 /* fd not found, nothing to do */
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200687 if (old == session->num_sources)
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200688 return SR_OK;
689
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200690 session->num_sources -= 1;
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200691
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200692 if (old != session->num_sources) {
693 memmove(&session->pollfds[old], &session->pollfds[old+1],
694 (session->num_sources - old) * sizeof(GPollFD));
695 memmove(&session->sources[old], &session->sources[old+1],
696 (session->num_sources - old) * sizeof(struct source));
Lars-Peter Clausen2bccd322012-06-30 20:54:42 +0200697 }
698
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200699 new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources);
700 if (!new_pollfds && session->num_sources > 0) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100701 sr_err("%s: new_pollfds malloc failed", __func__);
Lars-Peter Clausen0687dfc2012-06-30 20:54:43 +0200702 return SR_ERR_MALLOC;
703 }
704
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200705 new_sources = g_try_realloc(session->sources, sizeof(struct source) * session->num_sources);
706 if (!new_sources && session->num_sources > 0) {
Uwe Hermanna421dc12013-01-29 12:55:00 +0100707 sr_err("%s: new_sources malloc failed", __func__);
Uwe Hermanne0508e62012-01-07 17:08:54 +0100708 return SR_ERR_MALLOC;
Uwe Hermann9f45fb32012-01-02 14:15:25 +0100709 }
710
Lars-Peter Clausenb7e94112012-07-06 23:23:31 +0200711 session->pollfds = new_pollfds;
712 session->sources = new_sources;
Uwe Hermanne0508e62012-01-07 17:08:54 +0100713
714 return SR_OK;
Bert Vermeulen544a4582011-01-30 02:40:55 +0100715}
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200716
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200717/**
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200718 * Remove the source belonging to the specified file descriptor.
719 *
Uwe Hermann1a895c62012-07-05 01:47:44 +0200720 * @param fd The file descriptor for which the source should be removed.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200721 *
722 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
723 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
724 * internal errors.
725 */
726SR_API int sr_session_source_remove(int fd)
727{
728 return _sr_session_source_remove((gintptr)fd);
729}
730
731/**
732 * Remove the source belonging to the specified poll descriptor.
733 *
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200734 * @param pollfd The poll descriptor for which the source should be removed.
735 *
736 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
737 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
738 * internal errors.
739 */
740SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
741{
742 return _sr_session_source_remove((gintptr)pollfd);
743}
744
Uwe Hermann6b2d8d32012-10-21 23:24:42 +0200745/**
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200746 * Remove the source belonging to the specified channel.
747 *
Uwe Hermann1a895c62012-07-05 01:47:44 +0200748 * @param channel The channel for which the source should be removed.
Lars-Peter Clausenaac0ea22012-06-30 20:54:44 +0200749 *
750 * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
751 * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
752 * internal errors.
753 */
754SR_API int sr_session_source_remove_channel(GIOChannel *channel)
755{
756 return _sr_session_source_remove((gintptr)channel);
757}
Uwe Hermann7b870c32012-10-21 16:13:36 +0200758
759/** @} */