X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=f325e78b4e6b6ee9c504f66c0433e2f0d4dfc6a0;hb=2f004b4bc15c891b474adcba59a2224f009828af;hp=f81aa3329afbbf76a8d59b82bfa25d70282de44e;hpb=79f92686c620cfd06e3ed9fd1a20087343e4778a;p=libsigrok.git diff --git a/src/session.c b/src/session.c index f81aa332..f325e78b 100644 --- a/src/session.c +++ b/src/session.c @@ -113,6 +113,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 +306,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; @@ -467,8 +467,8 @@ SR_API int sr_session_start(struct sr_session *session) } if (enabled_channels == 0) { ret = SR_ERR; - sr_err("%s instance %d has no enabled channels!", - sdi->driver->name, sdi->index); + sr_err("%s using connection %s has no enabled channels!", + sdi->driver->name, sdi->connection_id); break; } @@ -611,6 +611,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 +633,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; @@ -661,7 +667,7 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet) * @private */ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet) + const struct sr_datafeed_packet *packet) { GSList *l; struct datafeed_callback *cb_struct; @@ -704,7 +710,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 +724,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 +757,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 +782,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 */ @@ -796,7 +790,7 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session, void *cb_data) { return _sr_session_source_add(session, pollfd, timeout, cb, - cb_data, (gintptr)pollfd); + cb_data, (gintptr)pollfd); } /** @@ -811,7 +805,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 +827,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 +852,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 +875,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 +910,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,4 +920,119 @@ 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) +{ + 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; +} + +SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet, + struct sr_datafeed_packet **copy) +{ + const struct sr_datafeed_meta *meta; + struct sr_datafeed_meta *meta_copy; + const struct sr_datafeed_logic *logic; + struct sr_datafeed_logic *logic_copy; + const struct sr_datafeed_analog *analog; + struct sr_datafeed_analog *analog_copy; + uint8_t *payload; + + *copy = g_malloc0(sizeof(struct sr_datafeed_packet)); + (*copy)->type = packet->type; + + switch (packet->type) { + case SR_DF_TRIGGER: + case SR_DF_END: + /* No payload. */ + break; + case SR_DF_HEADER: + payload = g_malloc(sizeof(struct sr_datafeed_header)); + memcpy(payload, packet->payload, sizeof(struct sr_datafeed_header)); + (*copy)->payload = payload; + 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); + (*copy)->payload = meta_copy; + break; + case SR_DF_LOGIC: + logic = packet->payload; + logic_copy = g_malloc(sizeof(logic)); + logic_copy->length = logic->length; + logic_copy->unitsize = logic->unitsize; + memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize); + (*copy)->payload = logic_copy; + break; + case SR_DF_ANALOG: + analog = packet->payload; + analog_copy = g_malloc(sizeof(analog)); + analog_copy->channels = g_slist_copy(analog->channels); + analog_copy->num_samples = analog->num_samples; + analog_copy->mq = analog->mq; + analog_copy->unit = analog->unit; + analog_copy->mqflags = analog->mqflags; + memcpy(analog_copy->data, analog->data, + analog->num_samples * sizeof(float)); + (*copy)->payload = analog_copy; + break; + default: + sr_err("Unknown packet type %d", packet->type); + return SR_ERR; + } + + return SR_OK; +} + +void sr_packet_free(struct sr_datafeed_packet *packet) +{ + const struct sr_datafeed_meta *meta; + const struct sr_datafeed_logic *logic; + const struct sr_datafeed_analog *analog; + struct sr_config *src; + GSList *l; + + switch (packet->type) { + case SR_DF_TRIGGER: + case SR_DF_END: + /* No payload. */ + break; + case SR_DF_HEADER: + /* Payload is a simple struct. */ + g_free((void *)packet->payload); + break; + case SR_DF_META: + meta = packet->payload; + for (l = meta->config; l; l = l->next) { + src = l->data; + g_variant_unref(src->data); + g_free(src); + } + g_slist_free(meta->config); + g_free((void *)packet->payload); + break; + case SR_DF_LOGIC: + logic = packet->payload; + g_free(logic->data); + g_free((void *)packet->payload); + break; + case SR_DF_ANALOG: + analog = packet->payload; + g_slist_free(analog->channels); + g_free(analog->data); + g_free((void *)packet->payload); + break; + default: + sr_err("Unknown packet type %d", packet->type); + } + g_free(packet); + +} + /** @} */