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

sr: sr_session_save() now takes sdi and datastore parameters 

This means it's restricted to saving one device's capture per file, for
now.
This commit is contained in:
Bert Vermeulen 2012-07-23 15:06:49 +02:00
parent fb381e4d71
commit 056be0719f
2 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proto.h
View File

@ -94,7 +94,8 @@ SR_API int sr_session_start(void);
SR_API int sr_session_run(void); SR_API int sr_session_run(void);
SR_API int sr_session_halt(void); SR_API int sr_session_halt(void);
SR_API int sr_session_stop(void); SR_API int sr_session_stop(void);
SR_API int sr_session_save(const char *filename); SR_API int sr_session_save(const char *filename,
const struct sr_dev_inst *sdi, struct sr_datastore *ds);
SR_API int sr_session_source_add(int fd, int events, int timeout, SR_API int sr_session_source_add(int fd, int events, int timeout,
sr_receive_data_callback_t cb, void *cb_data); sr_receive_data_callback_t cb, void *cb_data);
SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout, SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,

116
session_file.c
View File

@ -169,21 +169,22 @@ SR_API int sr_session_load(const char *filename)
* *
* @param filename The name of the file where to save the current session. * @param filename The name of the file where to save the current session.
* Must not be NULL. * Must not be NULL.
* @param sdi The device instance from which the data was captured.
* @param ds The datastore where the session's captured data was stored.
* *
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
* upon other errors. * upon other errors.
*/ */
int sr_session_save(const char *filename) SR_API int sr_session_save(const char *filename,
const struct sr_dev_inst *sdi, struct sr_datastore *ds)
{ {
GSList *l, *p, *d; GSList *l, *d;
FILE *meta; FILE *meta;
struct sr_dev_inst *sdi;
struct sr_probe *probe; struct sr_probe *probe;
struct sr_datastore *ds;
struct zip *zipfile; struct zip *zipfile;
struct zip_source *versrc, *metasrc, *logicsrc; struct zip_source *versrc, *metasrc, *logicsrc;
int bufcnt, devcnt, tmpfile, ret, probecnt; int bufcnt, tmpfile, ret, probecnt;
uint64_t samplerate; uint64_t *samplerate;
char version[1], rawname[16], metafile[32], *buf, *s; char version[1], rawname[16], metafile[32], *buf, *s;
if (!filename) { if (!filename) {
@ -214,66 +215,57 @@ int sr_session_save(const char *filename)
meta = g_fopen(metafile, "wb"); meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n"); fprintf(meta, "[global]\n");
fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION); fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
/* TODO: save protocol decoders used */
/* all datastores in all devices */ /* metadata */
devcnt = 1; fprintf(meta, "[device 1]\n");
for (l = session->devs; l; l = l->next) { if (sdi->driver)
dev = l->data; fprintf(meta, "driver = %s\n", sdi->driver->name);
/* metadata */
fprintf(meta, "[device %d]\n", devcnt);
if (dev->driver)
fprintf(meta, "driver = %s\n", dev->driver->name);
ds = dev->datastore; /* metadata */
if (ds) { fprintf(meta, "capturefile = logic-1\n");
/* metadata */ fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
fprintf(meta, "capturefile = logic-%d\n", devcnt); fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes));
fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); if (sr_dev_has_hwcap(sdi, SR_HWCAP_SAMPLERATE)) {
fprintf(meta, "total probes = %d\n", g_slist_length(dev->probes)); if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) { (const void **)&samplerate, sdi) == SR_OK) {
samplerate = *((uint64_t *) dev->driver->dev_info_get( s = sr_samplerate_string(*samplerate);
dev->driver_index, SR_DI_CUR_SAMPLERATE)); fprintf(meta, "samplerate = %s\n", s);
s = sr_samplerate_string(samplerate); g_free(s);
fprintf(meta, "samplerate = %s\n", s);
g_free(s);
}
probecnt = 1;
for (p = dev->probes; p; p = p->next) {
probe = p->data;
if (probe->enabled) {
if (probe->name)
fprintf(meta, "probe%d = %s\n", probecnt, probe->name);
if (probe->trigger)
fprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger);
probecnt++;
}
}
/* dump datastore into logic-n */
buf = g_try_malloc(ds->num_units * ds->ds_unitsize +
DATASTORE_CHUNKSIZE);
if (!buf) {
sr_err("session file: %s: buf malloc failed",
__func__);
return SR_ERR_MALLOC;
}
bufcnt = 0;
for (d = ds->chunklist; d; d = d->next) {
memcpy(buf + bufcnt, d->data,
DATASTORE_CHUNKSIZE);
bufcnt += DATASTORE_CHUNKSIZE;
}
if (!(logicsrc = zip_source_buffer(zipfile, buf,
ds->num_units * ds->ds_unitsize, TRUE)))
return SR_ERR;
snprintf(rawname, 15, "logic-%d", devcnt);
if (zip_add(zipfile, rawname, logicsrc) == -1)
return SR_ERR;
} }
devcnt++;
} }
probecnt = 1;
for (l = sdi->probes; l; l = l->next) {
probe = l->data;
if (probe->enabled) {
if (probe->name)
fprintf(meta, "probe%d = %s\n", probecnt, probe->name);
if (probe->trigger)
fprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger);
probecnt++;
}
}
/* dump datastore into logic-n */
buf = g_try_malloc(ds->num_units * ds->ds_unitsize +
DATASTORE_CHUNKSIZE);
if (!buf) {
sr_err("session file: %s: buf malloc failed",
__func__);
return SR_ERR_MALLOC;
}
bufcnt = 0;
for (d = ds->chunklist; d; d = d->next) {
memcpy(buf + bufcnt, d->data,
DATASTORE_CHUNKSIZE);
bufcnt += DATASTORE_CHUNKSIZE;
}
if (!(logicsrc = zip_source_buffer(zipfile, buf,
ds->num_units * ds->ds_unitsize, TRUE)))
return SR_ERR;
snprintf(rawname, 15, "logic-1");
if (zip_add(zipfile, rawname, logicsrc) == -1)
return SR_ERR;
fclose(meta); fclose(meta);
if (!(metasrc = zip_source_file(zipfile, metafile, 0, -1))) if (!(metasrc = zip_source_file(zipfile, metafile, 0, -1)))