#include "libsigrok.h"
#include "libsigrok-internal.h"
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "virtual-session: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "virtual-session"
/* size of payloads sent across the session bus */
/** @cond PRIVATE */
uint64_t samplerate;
int unitsize;
int num_probes;
+ int cur_chunk;
};
static GSList *dev_insts = NULL;
struct session_vdev *vdev;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
+ struct zip_stat zs;
GSList *l;
- void *buf;
int ret, got_data;
+ char capturefile[16];
+ void *buf;
(void)fd;
(void)revents;
- sr_dbg("Feed chunk.");
-
got_data = FALSE;
for (l = dev_insts; l; l = l->next) {
sdi = l->data;
- vdev = sdi->priv;
- if (!vdev)
- /* already done with this instance */
+ if (!(vdev = sdi->priv))
+ /* Already done with this instance. */
continue;
+ if (!vdev->capfile) {
+ /* No capture file opened yet, or finished with the last
+ * chunked one. */
+ if (vdev->cur_chunk == 0) {
+ /* capturefile is always the unchunked base name. */
+ if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
+ /* No chunks, just a single capture file. */
+ vdev->cur_chunk = 0;
+ if (!(vdev->capfile = zip_fopen(vdev->archive,
+ vdev->capturefile, 0)))
+ return FALSE;
+ 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 {
+ /* Capture data is chunked, advance to the next chunk. */
+ vdev->cur_chunk++;
+ snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
+ vdev->cur_chunk);
+ if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
+ if (!(vdev->capfile = zip_fopen(vdev->archive,
+ capturefile, 0)))
+ return FALSE;
+ sr_dbg("Opened %s.", capturefile);
+ } else {
+ /* We got all the chunks, finish up. */
+ g_free(vdev->capturefile);
+ g_free(vdev);
+ sdi->priv = NULL;
+ continue;
+ }
+ }
+ }
+
if (!(buf = g_try_malloc(CHUNKSIZE))) {
sr_err("%s: buf malloc failed", __func__);
return FALSE;
} else {
/* done with this capture file */
zip_fclose(vdev->capfile);
- g_free(vdev->capturefile);
- g_free(vdev);
- sdi->priv = NULL;
+ vdev->capfile = NULL;
+ if (vdev->cur_chunk == 0) {
+ /* It was the only file. */
+ g_free(vdev->capturefile);
+ g_free(vdev);
+ sdi->priv = NULL;
+ } else {
+ /* There might be more chunks, so don't fall through
+ * to the SR_DF_END here. */
+ g_free(buf);
+ return TRUE;
+ }
}
+ g_free(buf);
}
if (!got_data) {
}
/* driver callbacks */
-static int cleanup(void);
static int init(struct sr_context *sr_ctx)
{
return SR_OK;
}
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct session_vdev *vdev;
+ (void)probe_group;
+
switch (id) {
case SR_CONF_SAMPLERATE:
if (sdi) {
return SR_OK;
}
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct session_vdev *vdev;
+ (void)probe_group;
+
vdev = sdi->priv;
switch (id) {
case SR_CONF_CAPTURE_UNITSIZE:
vdev->unitsize = g_variant_get_uint64(data);
break;
- case SR_CONF_CAPTURE_NUM_PROBES:
+ case SR_CONF_NUM_LOGIC_PROBES:
vdev->num_probes = g_variant_get_uint64(data);
break;
default:
return SR_OK;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
-
(void)sdi;
+ (void)probe_group;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
- struct zip_stat zs;
struct session_vdev *vdev;
int ret;
if (!(vdev->archive = zip_open(vdev->sessionfile, 0, &ret))) {
sr_err("Failed to open session file '%s': "
- "zip error %d\n", vdev->sessionfile, ret);
- return SR_ERR;
- }
-
- if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) == -1) {
- sr_err("Failed to check capture file '%s' in "
- "session file '%s'.", vdev->capturefile, vdev->sessionfile);
- return SR_ERR;
- }
-
- if (!(vdev->capfile = zip_fopen(vdev->archive, vdev->capturefile, 0))) {
- sr_err("Failed to open capture file '%s' in "
- "session file '%s'.", vdev->capturefile, vdev->sessionfile);
+ "zip error %d.", vdev->sessionfile, ret);
return SR_ERR;
}