X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=fe9765edee82039ed397fec330dae94963f57281;hb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;hp=56740fa54a551bcab53c89868d8dd6639362710b;hpb=8a2efef2d5900cb3dd935af92a0e22528660c4be;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index 56740fa5..fe9765ed 100644 --- a/session_driver.c +++ b/session_driver.c @@ -23,7 +23,8 @@ #include #include #include -#include +#include "sigrok.h" +#include "sigrok-internal.h" /* size of payloads sent across the session bus */ #define CHUNKSIZE 4096 @@ -32,6 +33,7 @@ struct session_vdevice { char *capturefile; struct zip *archive; struct zip_file *capfile; + int bytes_read; uint64_t samplerate; int unitsize; int num_probes; @@ -45,7 +47,6 @@ static int capabilities[] = { 0, }; - static struct session_vdevice *get_vdevice_by_index(int device_index) { struct sr_device_instance *sdi; @@ -59,20 +60,22 @@ static struct session_vdevice *get_vdevice_by_index(int device_index) return vdevice; } -static int feed_chunk(int fd, int revents, void *user_data) +static int feed_chunk(int fd, int revents, void *session_data) { struct sr_device_instance *sdi; struct session_vdevice *vdevice; struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; + uint64_t sample_period_ps; GSList *l; void *buf; int ret, got_data; - /* avoid compiler warning */ - fd = fd; - revents = revents; + /* Avoid compiler warnings. */ + (void)fd; + (void)revents; - g_debug("session_driver: feed chunk"); + sr_dbg("session_driver: feed chunk"); got_data = FALSE; for (l = device_instances; l; l = l->next) { @@ -82,15 +85,25 @@ static int feed_chunk(int fd, int revents, void *user_data) /* already done with this instance */ continue; - buf = g_malloc(CHUNKSIZE); + if (!(buf = g_try_malloc(CHUNKSIZE))) { + sr_err("session: %s: buf malloc failed", __func__); + // return SR_ERR_MALLOC; + return FALSE; + } + ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE); if (ret > 0) { got_data = TRUE; packet.type = SR_DF_LOGIC; - packet.length = ret; - packet.unitsize = vdevice->unitsize; - packet.payload = buf; - sr_session_bus(user_data, &packet); + sample_period_ps = 1000000000000 / vdevice->samplerate; + packet.timeoffset = sample_period_ps * (vdevice->bytes_read / vdevice->unitsize); + packet.duration = sample_period_ps * (ret / vdevice->unitsize); + packet.payload = &logic; + logic.length = ret; + logic.unitsize = vdevice->unitsize; + logic.data = buf; + vdevice->bytes_read += ret; + sr_session_bus(session_data, &packet); } else { /* done with this capture file */ zip_fclose(vdevice->capfile); @@ -102,17 +115,18 @@ static int feed_chunk(int fd, int revents, void *user_data) if (!got_data) { packet.type = SR_DF_END; - packet.length = 0; - sr_session_bus(user_data, &packet); + sr_session_bus(session_data, &packet); } return TRUE; } /* driver callbacks */ +static void hw_cleanup(void); -static int hw_init(char *deviceinfo) +static int hw_init(const char *deviceinfo) { + hw_cleanup(); sessionfile = g_strdup(deviceinfo); @@ -126,8 +140,12 @@ static void hw_cleanup(void) for (l = device_instances; l; l = l->next) sr_device_instance_free(l->data); - g_free(sessionfile); + g_slist_free(device_instances); + device_instances = NULL; + + sr_session_source_remove(-1); + g_free(sessionfile); } static int hw_opendev(int device_index) @@ -138,9 +156,12 @@ static int hw_opendev(int device_index) NULL, NULL, NULL); if (!sdi) return SR_ERR; - sdi->priv = g_malloc0(sizeof(struct session_vdevice)); - if (!sdi->priv) - return SR_ERR; + + if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) { + sr_err("session: %s: sdi->priv malloc failed", __func__); + return SR_ERR_MALLOC; + } + device_instances = g_slist_append(device_instances, sdi); return SR_OK; @@ -164,11 +185,10 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { + /* Avoid compiler warnings. */ + (void)device_index; - /* avoid compiler warning */ - device_index = device_index; - - if (devices) + if (sr_device_list() != NULL) return SR_OK; else return SR_ERR; @@ -176,7 +196,6 @@ static int hw_get_status(int device_index) static int *hw_get_capabilities(void) { - return capabilities; } @@ -219,48 +238,52 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) struct sr_datafeed_packet *packet; int err; - /* avoid compiler warning */ - session_device_id = session_device_id; + /* Avoid compiler warnings. */ + (void)session_device_id; if (!(vdevice = get_vdevice_by_index(device_index))) return SR_ERR; - g_message("session_driver: opening archive %s file %s", - sessionfile, vdevice->capturefile); + sr_info("session_driver: opening archive %s file %s", sessionfile, + vdevice->capturefile); if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) { - g_warning("Failed to open session file '%s': zip error %d\n", - sessionfile, err); + sr_warn("Failed to open session file '%s': zip error %d\n", + sessionfile, err); return SR_ERR; } if (zip_stat(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) { - g_warning("Failed to check capture file '%s' in session file '%s'.", - vdevice->capturefile, sessionfile); + sr_warn("Failed to check capture file '%s' in session file '%s'.", + vdevice->capturefile, sessionfile); return SR_ERR; } if (!(vdevice->capfile = zip_fopen(vdevice->archive, vdevice->capturefile, 0))) { - g_warning("Failed to open capture file '%s' in session file '%s'.", - vdevice->capturefile, sessionfile); + sr_warn("Failed to open capture file '%s' in session file '%s'.", + vdevice->capturefile, sessionfile); return SR_ERR; } /* freewheeling source */ sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id); + if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { + sr_err("session: %s: packet malloc failed", __func__); + return SR_ERR_MALLOC; + } + + if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { + sr_err("session: %s: header malloc failed", __func__); + return SR_ERR_MALLOC; + } + /* Send header packet to the session bus. */ - packet = g_malloc(sizeof(struct sr_datafeed_packet)); - header = g_malloc(sizeof(struct sr_datafeed_header)); - if (!packet || !header) - return SR_ERR; packet->type = SR_DF_HEADER; - packet->length = sizeof(struct sr_datafeed_header); packet->payload = (unsigned char *)header; header->feed_version = 1; gettimeofday(&header->starttime, NULL); - header->samplerate = 0; - header->protocol_id = SR_PROTO_RAW; + header->samplerate = vdevice->samplerate; header->num_logic_probes = vdevice->num_probes; header->num_analog_probes = 0; sr_session_bus(session_device_id, packet); @@ -270,7 +293,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return SR_OK; } - +/* Not static, it's used elsewhere (via 'extern'). */ struct sr_device_plugin session_driver = { "session", "Session-emulating driver",