- cb = l->data;
- cb(device, packet);
- }
-}
-
-int session_save(char *filename)
-{
- GSList *l, *p, *d;
- FILE *meta;
- struct device *device;
- struct probe *probe;
- struct datastore *ds;
- struct zip *zipfile;
- struct zip_source *versrc, *metasrc, *logicsrc;
- int bufcnt, devcnt, tmpfile, ret, error;
- char version[1], rawname[16], metafile[32], *newfn, *buf;
-
- newfn = g_malloc(strlen(filename) + 10);
- strcpy(newfn, filename);
- if (strstr(filename, ".sigrok") != filename+strlen(filename)-7)
- strcat(newfn, ".sigrok");
-
- /* Quietly delete it first, libzip wants replace ops otherwise. */
- unlink(newfn);
- if (!(zipfile = zip_open(newfn, ZIP_CREATE, &error)))
- return SIGROK_ERR;
- g_free(newfn);
-
- /* "version" */
- version[0] = '1';
- if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
- return SIGROK_ERR;
- if (zip_add(zipfile, "version", versrc) == -1) {
- g_message("error saving version into zipfile: %s",
- zip_strerror(zipfile));
- return SIGROK_ERR;
- }
-
- /* init "metadata" */
- strcpy(metafile, "sigrok-meta-XXXXXX");
- if ((tmpfile = g_mkstemp(metafile)) == -1)
- return SIGROK_ERR;
- close(tmpfile);
- meta = fopen(metafile, "wb");
- fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
- /* TODO: save protocol decoders used */
-
- /* all datastores in all devices */
- devcnt = 1;
- for (l = session->devices; l; l = l->next) {
- device = l->data;
- /* metadata */
- fprintf(meta, "[device]\n");
- if (device->plugin)
- fprintf(meta, "driver = %s\n", device->plugin->name);
-
- ds = device->datastore;
- if (ds) {
- /* metadata */
- fprintf(meta, "capturefile = logic-%d\n", devcnt);
- for (p = device->probes; p; p = p->next) {
- probe = p->data;
- if (probe->enabled) {
- fprintf(meta, "probe %d", probe->index);
- if (probe->name)
- fprintf(meta, " name \"%s\"", probe->name);
- if (probe->trigger)
- fprintf(meta, " trigger \"%s\"",
- probe->trigger);
- fprintf(meta, "\n");
- }
- }
-
- /* dump datastore into logic-n */
- buf = malloc(ds->num_units * ds->ds_unitsize +
- DATASTORE_CHUNKSIZE);
- bufcnt = 0;
- for (d = ds->chunklist; d; d = d->next) {
- memcpy(buf + bufcnt, d->data,
- DATASTORE_CHUNKSIZE);
- bufcnt += DATASTORE_CHUNKSIZE;
- }
- if (!(logicsrc = zip_source_buffer(zipfile, buf,
- ds->num_units * ds->ds_unitsize, TRUE)))
- return SIGROK_ERR;
- snprintf(rawname, 15, "logic-%d", devcnt);
- if (zip_add(zipfile, rawname, logicsrc) == -1)
- return SIGROK_ERR;
- }
- devcnt++;
+ if (sr_log_loglevel_get() >= SR_LOG_DBG)
+ datafeed_dump(packet);
+ cb_struct = l->data;
+ cb_struct->cb(sdi, packet, cb_struct->cb_data);
+ }
+
+ return SR_OK;
+}
+
+/**
+ * Add an event source for a file descriptor.
+ *
+ * @param pollfd The GPollFD.
+ * @param[in] 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.
+ * @param poll_object TODO.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval SR_ERR_MALLOC Memory allocation error.
+ */
+static int _sr_session_source_add(GPollFD *pollfd, int timeout,
+ sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object)
+{
+ struct source *new_sources, *s;
+ GPollFD *new_pollfds;
+
+ if (!cb) {
+ sr_err("%s: cb was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
+ /* Note: cb_data can be NULL, that's not a bug. */
+
+ new_pollfds = g_try_realloc(session->pollfds,
+ sizeof(GPollFD) * (session->num_sources + 1));
+ if (!new_pollfds) {
+ sr_err("%s: new_pollfds malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
+
+ new_sources = g_try_realloc(session->sources, sizeof(struct source) *
+ (session->num_sources + 1));
+ if (!new_sources) {
+ sr_err("%s: new_sources malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
+
+ new_pollfds[session->num_sources] = *pollfd;
+ s = &new_sources[session->num_sources++];
+ s->timeout = timeout;
+ s->cb = cb;
+ s->cb_data = cb_data;
+ s->poll_object = poll_object;
+ session->pollfds = new_pollfds;
+ session->sources = new_sources;
+
+ if (timeout != session->source_timeout && timeout > 0
+ && (session->source_timeout == -1 || timeout < session->source_timeout))
+ session->source_timeout = timeout;
+
+ return SR_OK;
+}
+
+/**
+ * Add an event source for a file descriptor.
+ *
+ * @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.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval SR_ERR_MALLOC Memory allocation error.
+ */
+SR_API int sr_session_source_add(int fd, int events, int timeout,
+ sr_receive_data_callback_t cb, void *cb_data)
+{
+ GPollFD p;
+
+ p.fd = fd;
+ p.events = events;
+
+ return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd);
+}
+
+/**
+ * Add an event source for a GPollFD.
+ *
+ * @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.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval SR_ERR_MALLOC Memory allocation error.
+ */
+SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
+ sr_receive_data_callback_t cb, void *cb_data)
+{
+ return _sr_session_source_add(pollfd, timeout, cb,
+ cb_data, (gintptr)pollfd);
+}
+
+/**
+ * Add an event source for a GIOChannel.
+ *
+ * @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.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval SR_ERR_MALLOC Memory allocation error.
+ */
+SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
+ int timeout, sr_receive_data_callback_t cb, void *cb_data)
+{
+ GPollFD p;
+
+#ifdef _WIN32
+ g_io_channel_win32_make_pollfd(channel, events, &p);
+#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);
+}
+
+/**
+ * Remove the source belonging to the specified channel.
+ *
+ * @todo Add more error checks and logging.
+ *
+ * @param poll_object The channel for which the source should be removed.
+ *
+ * @retval SR_OK Success
+ * @retval SR_ERR_ARG Invalid arguments
+ * @retval SR_ERR_MALLOC Memory allocation error
+ * @retval SR_ERR_BUG Internal error
+ */
+static int _sr_session_source_remove(gintptr poll_object)
+{
+ struct source *new_sources;
+ GPollFD *new_pollfds;
+ unsigned int old;
+
+ if (!session->sources || !session->num_sources) {
+ sr_err("%s: sources was NULL", __func__);
+ return SR_ERR_BUG;