BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtual-session: Plug ZIP archive leak 

Refactor a bit to keep the code manageable. Also allow
stopping of a running acquisition.
This commit is contained in:
Daniel Elstner 2015-09-20 14:07:01 +02:00
parent 02e49ae5d2
commit 8d4097ffa6
1 changed files with 101 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/session_driver.c
View File

@ -57,9 +57,8 @@ static const uint32_t devopts[] = {
SR_CONF_SESSIONFILE | SR_CONF_SET, SR_CONF_SESSIONFILE | SR_CONF_SET,
}; };
static int receive_data(int fd, int revents, void *cb_data) static gboolean stream_session_data(struct sr_dev_inst *sdi)
{ {
struct sr_dev_inst *sdi;
struct session_vdev *vdev; struct session_vdev *vdev;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic; struct sr_datafeed_logic logic;
@ -68,98 +67,113 @@ static int receive_data(int fd, int revents, void *cb_data)
char capturefile[16]; char capturefile[16];
void *buf; void *buf;
(void)fd;
(void)revents;
sdi = cb_data;
got_data = FALSE; got_data = FALSE;
vdev = sdi->priv; vdev = sdi->priv;
if (!vdev->finished) { if (!vdev->capfile) {
if (!vdev->capfile) { /* No capture file opened yet, or finished with the last
/* No capture file opened yet, or finished with the last * chunked one. */
* chunked one. */ if (vdev->cur_chunk == 0) {
if (vdev->cur_chunk == 0) { /* capturefile is always the unchunked base name. */
/* capturefile is always the unchunked base name. */ if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) { /* No chunks, just a single capture file. */
/* No chunks, just a single capture file. */ vdev->cur_chunk = 0;
vdev->cur_chunk = 0; if (!(vdev->capfile = zip_fopen(vdev->archive,
if (!(vdev->capfile = zip_fopen(vdev->archive, vdev->capturefile, 0)))
vdev->capturefile, 0))) return FALSE;
return FALSE; sr_dbg("Opened %s.", vdev->capturefile);
sr_dbg("Opened %s.", vdev->capturefile);
} else {
/* Try as first chunk filename. */
snprintf(capturefile, 15, "%s-1", vdev->capturefile);
if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
vdev->cur_chunk = 1;
if (!(vdev->capfile = zip_fopen(vdev->archive,
capturefile, 0)))
return FALSE;
sr_dbg("Opened %s.", capturefile);
} else {
sr_err("No capture file '%s' in " "session file '%s'.",
vdev->capturefile, vdev->sessionfile);
return FALSE;
}
}
} else { } else {
/* Capture data is chunked, advance to the next chunk. */ /* Try as first chunk filename. */
vdev->cur_chunk++; snprintf(capturefile, 15, "%s-1", vdev->capturefile);
snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
vdev->cur_chunk);
if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) { if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
vdev->cur_chunk = 1;
if (!(vdev->capfile = zip_fopen(vdev->archive, if (!(vdev->capfile = zip_fopen(vdev->archive,
capturefile, 0))) capturefile, 0)))
return FALSE; return FALSE;
sr_dbg("Opened %s.", capturefile); sr_dbg("Opened %s.", capturefile);
} else { } else {
/* We got all the chunks, finish up. */ sr_err("No capture file '%s' in " "session file '%s'.",
vdev->finished = TRUE; vdev->capturefile, vdev->sessionfile);
return TRUE; return FALSE;
} }
} }
}
buf = g_malloc(CHUNKSIZE);
ret = zip_fread(vdev->capfile, buf,
CHUNKSIZE / vdev->unitsize * vdev->unitsize);
if (ret > 0) {
if (ret % vdev->unitsize != 0)
sr_warn("Read size %d not a multiple of the"
" unit size %d.", ret, vdev->unitsize);
got_data = TRUE;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = ret;
logic.unitsize = vdev->unitsize;
logic.data = buf;
vdev->bytes_read += ret;
sr_session_send(sdi, &packet);
} else { } else {
/* done with this capture file */ /* Capture data is chunked, advance to the next chunk. */
zip_fclose(vdev->capfile); vdev->cur_chunk++;
vdev->capfile = NULL; snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
if (vdev->cur_chunk == 0) { vdev->cur_chunk);
/* It was the only file. */ if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
vdev->finished = TRUE; if (!(vdev->capfile = zip_fopen(vdev->archive,
capturefile, 0)))
return FALSE;
sr_dbg("Opened %s.", capturefile);
} else { } else {
/* There might be more chunks, so don't fall through /* We got all the chunks, finish up. */
* to the SR_DF_END here. */ return FALSE;
g_free(buf);
return TRUE;
} }
} }
g_free(buf);
} }
if (!got_data) { buf = g_malloc(CHUNKSIZE);
packet.type = SR_DF_END;
ret = zip_fread(vdev->capfile, buf,
CHUNKSIZE / vdev->unitsize * vdev->unitsize);
if (ret > 0) {
if (ret % vdev->unitsize != 0)
sr_warn("Read size %d not a multiple of the"
" unit size %d.", ret, vdev->unitsize);
got_data = TRUE;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = ret;
logic.unitsize = vdev->unitsize;
logic.data = buf;
vdev->bytes_read += ret;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
sr_session_source_remove(sdi->session, -1); } else {
/* done with this capture file */
zip_fclose(vdev->capfile);
vdev->capfile = NULL;
if (vdev->cur_chunk != 0) {
/* There might be more chunks, so don't fall through
* to the SR_DF_END here. */
got_data = TRUE;
}
} }
g_free(buf);
return TRUE; return got_data;
}
static int receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct session_vdev *vdev;
struct sr_datafeed_packet packet;
(void)fd;
(void)revents;
sdi = cb_data;
vdev = sdi->priv;
if (!vdev->finished && !stream_session_data(sdi))
vdev->finished = TRUE;
if (!vdev->finished)
return G_SOURCE_CONTINUE;
if (vdev->capfile) {
zip_fclose(vdev->capfile);
vdev->capfile = NULL;
}
if (vdev->archive) {
zip_discard(vdev->archive);
vdev->archive = NULL;
}
packet.type = SR_DF_END;
packet.payload = NULL;
sr_session_send(sdi, &packet);
return G_SOURCE_REMOVE;
} }
/* driver callbacks */ /* driver callbacks */
@ -321,6 +335,18 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_OK; return SR_OK;
} }
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
struct session_vdev *vdev;
(void)cb_data;
vdev = sdi->priv;
vdev->finished = TRUE;
return SR_OK;
}
/** @private */ /** @private */
SR_PRIV struct sr_dev_driver session_driver = { SR_PRIV struct sr_dev_driver session_driver = {
.name = "virtual-session", .name = "virtual-session",
@ -337,6 +363,6 @@ SR_PRIV struct sr_dev_driver session_driver = {
.dev_open = dev_open, .dev_open = dev_open,
.dev_close = dev_close, .dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = NULL, .dev_acquisition_stop = dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };