X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=a3f6a86d3ef8226659f67f5fc222ed44726bf14c;hb=a93086528e5b476812e42b423f7a8a53812af6f4;hp=11da1378b56508c67c804d66bbb3169f429ea7ad;hpb=1b9e567b086ebd854d2db4d74dddb6bbf0277a72;p=libsigrok.git diff --git a/src/session.c b/src/session.c index 11da1378..a3f6a86d 100644 --- a/src/session.c +++ b/src/session.c @@ -62,6 +62,7 @@ struct datafeed_callback { /** * Create a new session. * + * @param ctx The context in which to create the new session. * @param new_session This will contain a pointer to the newly created * session if the return value is SR_OK, otherwise the value * is undefined and should not be used. Must not be NULL. @@ -71,7 +72,8 @@ struct datafeed_callback { * * @since 0.4.0 */ -SR_API int sr_session_new(struct sr_session **new_session) +SR_API int sr_session_new(struct sr_context *ctx, + struct sr_session **new_session) { struct sr_session *session; @@ -80,6 +82,7 @@ SR_API int sr_session_new(struct sr_session **new_session) session = g_malloc0(sizeof(struct sr_session)); + session->ctx = ctx; session->source_timeout = -1; session->running = FALSE; session->abort_session = FALSE; @@ -113,6 +116,8 @@ SR_API int sr_session_destroy(struct sr_session *session) if (session->trigger) sr_trigger_free(session->trigger); + g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free); + g_free(session); return SR_OK; @@ -304,9 +309,7 @@ SR_API int sr_session_datafeed_callback_add(struct sr_session *session, return SR_ERR_ARG; } - if (!(cb_struct = g_try_malloc0(sizeof(struct datafeed_callback)))) - return SR_ERR_MALLOC; - + cb_struct = g_malloc0(sizeof(struct datafeed_callback)); cb_struct->cb = cb; cb_struct->cb_data = cb_data; @@ -316,13 +319,40 @@ SR_API int sr_session_datafeed_callback_add(struct sr_session *session, return SR_OK; } +/** + * Get the trigger assigned to this session. + * + * @param session The session to use. + * + * @retval NULL Invalid (NULL) session was passed to the function. + * @retval other The trigger assigned to this session (can be NULL). + * + * @since 0.4.0 + */ SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session) { + if (!session) + return NULL; + return session->trigger; } +/** + * Set the trigger of this session. + * + * @param session The session to use. Must not be NULL. + * @param trig The trigger to assign to this session. Can be NULL. + * + * @retval SR_OK Success. + * @retval SR_ERR_ARG Invalid argument. + * + * @since 0.4.0 + */ SR_API int sr_session_trigger_set(struct sr_session *session, struct sr_trigger *trig) { + if (!session) + return SR_ERR_ARG; + session->trigger = trig; return SR_OK; @@ -344,15 +374,35 @@ SR_API int sr_session_trigger_set(struct sr_session *session, struct sr_trigger * of file descriptor or timeout status. * * @retval SR_OK Success. - * @retval SR_ERR Error occured. + * @retval SR_ERR Error occurred. */ static int sr_session_iteration(struct sr_session *session, gboolean block) { unsigned int i; - int ret; + int ret, timeout; +#ifdef HAVE_LIBUSB_1_0 + int usb_timeout; + struct timeval tv; +#endif + + timeout = block ? session->source_timeout : 0; + +#ifdef HAVE_LIBUSB_1_0 + if (session->ctx->usb_source_present) { + timeout = block ? 0 : session->source_timeout; + ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv); + if (ret < 0) { + sr_err("Error getting libusb timeout: %s", + libusb_error_name(ret)); + return SR_ERR; + } else if (ret == 1) { + usb_timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; + timeout = MIN(timeout, usb_timeout); + } + } +#endif - ret = g_poll(session->pollfds, session->num_sources, - block ? session->source_timeout : 0); + ret = g_poll(session->pollfds, session->num_sources, timeout); for (i = 0; i < session->num_sources; i++) { if (session->pollfds[i].revents > 0 || (ret == 0 && session->source_timeout == session->sources[i].timeout)) { @@ -385,7 +435,6 @@ static int sr_session_iteration(struct sr_session *session, gboolean block) return SR_OK; } - static int verify_trigger(struct sr_trigger *trigger) { struct sr_trigger_stage *stage; @@ -421,6 +470,7 @@ static int verify_trigger(struct sr_trigger *trigger) return SR_OK; } + /** * Start a session. * @@ -611,6 +661,7 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet) { const struct sr_datafeed_logic *logic; const struct sr_datafeed_analog *analog; + const struct sr_datafeed_analog2 *analog2; switch (packet->type) { case SR_DF_HEADER: @@ -632,6 +683,11 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet) sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).", analog->num_samples); break; + case SR_DF_ANALOG2: + analog2 = packet->payload; + sr_dbg("bus: Received SR_DF_ANALOG2 packet (%d samples).", + analog2->num_samples); + break; case SR_DF_END: sr_dbg("bus: Received SR_DF_END packet."); break; @@ -665,6 +721,9 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, { GSList *l; struct datafeed_callback *cb_struct; + struct sr_datafeed_packet *packet_in, *packet_out; + struct sr_transform *t; + int ret; if (!sdi) { sr_err("%s: sdi was NULL", __func__); @@ -681,6 +740,40 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, return SR_ERR_BUG; } + /* + * Pass the packet to the first transform module. If that returns + * another packet (instead of NULL), pass that packet to the next + * transform module in the list, and so on. + */ + packet_in = (struct sr_datafeed_packet *)packet; + for (l = sdi->session->transforms; l; l = l->next) { + t = l->data; + sr_spew("Running transform module '%s'.", t->module->id); + ret = t->module->receive(t, packet_in, &packet_out); + if (ret < 0) { + sr_err("Error while running transform module: %d.", ret); + return SR_ERR; + } + if (!packet_out) { + /* + * If any of the transforms don't return an output + * packet, abort. + */ + sr_spew("Transform module didn't return a packet, aborting."); + return SR_OK; + } else { + /* + * Use this transform module's output packet as input + * for the next transform module. + */ + packet_in = packet_out; + } + } + + /* + * If the last transform did output a packet, pass it to all datafeed + * callbacks. + */ for (l = sdi->session->datafeed_callbacks; l; l = l->next) { if (sr_log_loglevel_get() >= SR_LOG_DBG) datafeed_dump(packet); @@ -704,7 +797,6 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid argument. - * @retval SR_ERR_MALLOC Memory allocation error. */ static int _sr_session_source_add(struct sr_session *session, GPollFD *pollfd, int timeout, sr_receive_data_callback cb, void *cb_data, gintptr poll_object) @@ -719,19 +811,10 @@ static int _sr_session_source_add(struct sr_session *session, GPollFD *pollfd, /* Note: cb_data can be NULL, that's not a bug. */ - new_pollfds = g_try_realloc(session->pollfds, + new_pollfds = g_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) * + new_sources = g_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++]; @@ -761,7 +844,6 @@ static int _sr_session_source_add(struct sr_session *session, GPollFD *pollfd, * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid argument. - * @retval SR_ERR_MALLOC Memory allocation error. * * @since 0.3.0 */ @@ -787,7 +869,6 @@ SR_API int sr_session_source_add(struct sr_session *session, int fd, * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid argument. - * @retval SR_ERR_MALLOC Memory allocation error. * * @since 0.3.0 */ @@ -811,7 +892,6 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session, * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid argument. - * @retval SR_ERR_MALLOC Memory allocation error. * * @since 0.3.0 */ @@ -834,20 +914,15 @@ SR_API int sr_session_source_add_channel(struct sr_session *session, /** * Remove the source belonging to the specified channel. * - * @todo Add more error checks and logging. - * * @param session The session to use. Must not be NULL. * @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(struct sr_session *session, gintptr poll_object) { - struct source *new_sources; - GPollFD *new_pollfds; unsigned int old; if (!session->sources || !session->num_sources) { @@ -864,29 +939,17 @@ static int _sr_session_source_remove(struct sr_session *session, gintptr poll_ob if (old == session->num_sources) return SR_OK; - session->num_sources -= 1; + session->num_sources--; if (old != session->num_sources) { - memmove(&session->pollfds[old], &session->pollfds[old+1], + memmove(&session->pollfds[old], &session->pollfds[old + 1], (session->num_sources - old) * sizeof(GPollFD)); - memmove(&session->sources[old], &session->sources[old+1], + memmove(&session->sources[old], &session->sources[old + 1], (session->num_sources - old) * sizeof(struct source)); } - new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources); - if (!new_pollfds && session->num_sources > 0) { - 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); - if (!new_sources && session->num_sources > 0) { - sr_err("%s: new_sources malloc failed", __func__); - return SR_ERR_MALLOC; - } - - session->pollfds = new_pollfds; - session->sources = new_sources; + session->pollfds = g_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources); + session->sources = g_realloc(session->sources, sizeof(struct source) * session->num_sources); return SR_OK; } @@ -899,7 +962,6 @@ static int _sr_session_source_remove(struct sr_session *session, gintptr poll_ob * * @retval SR_OK Success * @retval SR_ERR_ARG Invalid argument - * @retval SR_ERR_MALLOC Memory allocation error. * @retval SR_ERR_BUG Internal error. * * @since 0.3.0 @@ -935,7 +997,6 @@ SR_API int sr_session_source_remove_pollfd(struct sr_session *session, * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid argument. - * @retval SR_ERR_MALLOC Memory allocation error. * @return SR_ERR_BUG Internal error. * * @since 0.2.0 @@ -946,15 +1007,11 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session, return _sr_session_source_remove(session, (gintptr)channel); } -static void *copy_src(struct sr_config *src) +static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy) { - struct sr_config *new_src; - - new_src = g_malloc(sizeof(struct sr_config)); - memcpy(new_src, src, sizeof(struct sr_config)); g_variant_ref(src->data); - - return new_src; + meta_copy->config = g_slist_append(meta_copy->config, + g_memdup(src, sizeof(struct sr_config))); } SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet, @@ -983,9 +1040,8 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet, break; case SR_DF_META: meta = packet->payload; - meta_copy = g_malloc(sizeof(struct sr_datafeed_meta)); - meta_copy->config = g_slist_copy_deep(meta->config, - (GCopyFunc)copy_src, NULL); + meta_copy = g_malloc0(sizeof(struct sr_datafeed_meta)); + g_slist_foreach(meta->config, (GFunc)copy_src, meta_copy->config); (*copy)->payload = meta_copy; break; case SR_DF_LOGIC: