X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=41ca36c5fbd04e7a0f3920d9b97cfed80eaa9ab1;hb=393fb9cb18c5746d8567c9cf74b872804043345a;hp=c40e54fa1a4ffc97be9c88481a19ac00fd2d73ff;hpb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;p=libsigrok.git diff --git a/session_file.c b/session_file.c index c40e54fa..41ca36c5 100644 --- a/session_file.c +++ b/session_file.c @@ -24,11 +24,23 @@ #include #include #include "config.h" -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/** + * @file + * + * Loading and saving libsigrok session files. + */ + +/** + * @addtogroup grp_session + * + * @{ + */ extern struct sr_session *session; -extern struct sr_device_plugin session_driver; +extern SR_PRIV struct sr_dev_driver session_driver; /** * Load the session from the specified filename. @@ -46,12 +58,11 @@ SR_API int sr_session_load(const char *filename) struct zip *archive; struct zip_file *zf; struct zip_stat zs; - struct sr_session *session; - struct sr_device *device; + struct sr_dev_inst *sdi; struct sr_probe *probe; - int ret, err, probenum, devcnt, i, j; + int ret, probenum, devcnt, version, i, j; uint64_t tmp_u64, total_probes, enabled_probes, p; - char **sections, **keys, *metafile, *val, c; + char **sections, **keys, *metafile, *val, s[11]; char probename[SR_MAX_PROBENAME_LEN + 1]; if (!filename) { @@ -59,23 +70,29 @@ SR_API int sr_session_load(const char *filename) return SR_ERR_ARG; } - if (!(archive = zip_open(filename, 0, &err))) { + if (!(archive = zip_open(filename, 0, &ret))) { sr_dbg("session file: Failed to open session file: zip " - "error %d", err); + "error %d", ret); return SR_ERR; } /* check "version" */ + version = 0; if (!(zf = zip_fopen(archive, "version", 0))) { sr_dbg("session file: Not a sigrok session file."); return SR_ERR; } - ret = zip_fread(zf, &c, 1); - if (ret != 1 || c != '1') { + if ((ret = zip_fread(zf, s, 10)) == -1) { sr_dbg("session file: Not a valid sigrok session file."); return SR_ERR; } zip_fclose(zf); + s[ret] = 0; + version = strtoull(s, NULL, 10); + if (version != 1) { + sr_dbg("session file: Not a valid sigrok session file version."); + return SR_ERR; + } /* read "metadata" */ if (zip_stat(archive, "metadata", 0, &zs) == -1) { @@ -98,7 +115,7 @@ SR_API int sr_session_load(const char *filename) return SR_ERR; } - session = sr_session_new(); + sr_session_new(); devcnt = 0; capturefiles = g_ptr_array_new_with_free_func(g_free); @@ -109,49 +126,55 @@ SR_API int sr_session_load(const char *filename) continue; if (!strncmp(sections[i], "device ", 7)) { /* device section */ - device = NULL; + sdi = NULL; enabled_probes = 0; keys = g_key_file_get_keys(kf, sections[i], NULL, NULL); for (j = 0; keys[j]; j++) { val = g_key_file_get_string(kf, sections[i], keys[j], NULL); if (!strcmp(keys[j], "capturefile")) { - device = sr_dev_new(&session_driver, devcnt); + sdi = sr_dev_inst_new(devcnt, SR_ST_ACTIVE, NULL, NULL, NULL); + sdi->driver = &session_driver; if (devcnt == 0) - /* first device, init the plugin */ - device->plugin->init((char *)filename); - sr_session_device_add(device); - device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val); + /* first device, init the driver */ + sdi->driver->init(); + sr_session_dev_add(sdi); + sdi->driver->dev_config_set(sdi, SR_HWCAP_SESSIONFILE, filename); + sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTUREFILE, val); g_ptr_array_add(capturefiles, val); } else if (!strcmp(keys[j], "samplerate")) { sr_parse_sizestring(val, &tmp_u64); - device->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); + sdi->driver->dev_config_set(sdi, SR_HWCAP_SAMPLERATE, &tmp_u64); } else if (!strcmp(keys[j], "unitsize")) { tmp_u64 = strtoull(val, NULL, 10); - device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); + sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); } else if (!strcmp(keys[j], "total probes")) { total_probes = strtoull(val, NULL, 10); - device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); + sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); for (p = 0; p < total_probes; p++) { snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); - sr_dev_probe_add(device, probename); + if (!(probe = sr_probe_new(p, SR_PROBE_LOGIC, TRUE, + probename))) + return SR_ERR; + sdi->probes = g_slist_append(sdi->probes, probe); } } else if (!strncmp(keys[j], "probe", 5)) { - if (!device) + if (!sdi) continue; enabled_probes++; tmp_u64 = strtoul(keys[j]+5, NULL, 10); - sr_dev_probe_name(device, tmp_u64, val); + /* sr_session_save() */ + sr_dev_probe_name_set(sdi, tmp_u64 - 1, val); } else if (!strncmp(keys[j], "trigger", 7)) { probenum = strtoul(keys[j]+7, NULL, 10); - sr_dev_trigger_set(device, probenum, val); + sr_dev_trigger_set(sdi, probenum, val); } } g_strfreev(keys); - for (p = enabled_probes; p < total_probes; p++) { - probe = g_slist_nth_data(device->probes, p); - probe->enabled = FALSE; - } + /* Disable probes not specifically listed. */ + for (p = enabled_probes; p < total_probes; p++) + sr_dev_probe_enable(sdi, p, FALSE); } + devcnt++; } g_strfreev(sections); g_key_file_free(kf); @@ -164,21 +187,22 @@ SR_API int sr_session_load(const char *filename) * * @param filename The name of the file where to save the current session. * 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 * 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; - struct sr_device *device; struct sr_probe *probe; - struct sr_datastore *ds; struct zip *zipfile; struct zip_source *versrc, *metasrc, *logicsrc; - int bufcnt, devcnt, tmpfile, ret, error, probecnt; - uint64_t samplerate; + int bufcnt, tmpfile, ret, probecnt; + uint64_t *samplerate; char version[1], rawname[16], metafile[32], *buf, *s; if (!filename) { @@ -188,7 +212,7 @@ int sr_session_save(const char *filename) /* Quietly delete it first, libzip wants replace ops otherwise. */ unlink(filename); - if (!(zipfile = zip_open(filename, ZIP_CREATE, &error))) + if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret))) return SR_ERR; /* "version" */ @@ -209,66 +233,57 @@ int sr_session_save(const char *filename) meta = g_fopen(metafile, "wb"); fprintf(meta, "[global]\n"); fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION); - /* TODO: save protocol decoders used */ - /* all datastores in all devices */ - devcnt = 1; - for (l = session->devices; l; l = l->next) { - device = l->data; - /* metadata */ - fprintf(meta, "[device %d]\n", devcnt); - if (device->plugin) - fprintf(meta, "driver = %s\n", device->plugin->name); + /* metadata */ + fprintf(meta, "[device 1]\n"); + if (sdi->driver) + fprintf(meta, "driver = %s\n", sdi->driver->name); - ds = device->datastore; - if (ds) { - /* metadata */ - fprintf(meta, "capturefile = logic-%d\n", devcnt); - fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); - fprintf(meta, "total probes = %d\n", g_slist_length(device->probes)); - if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) device->plugin->get_device_info( - device->plugin_index, SR_DI_CUR_SAMPLERATE)); - s = sr_samplerate_string(samplerate); - fprintf(meta, "samplerate = %s\n", s); - g_free(s); - } - probecnt = 1; - for (p = device->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++; - } - } + /* metadata */ + fprintf(meta, "capturefile = logic-1\n"); + fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); + fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes)); + if (sr_dev_has_hwcap(sdi, SR_HWCAP_SAMPLERATE)) { + if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE, + (const void **)&samplerate, sdi) == SR_OK) { + s = sr_samplerate_string(*samplerate); + fprintf(meta, "samplerate = %s\n", s); + g_free(s); + } + } + 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; - } + /* 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++; + 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); if (!(metasrc = zip_source_file(zipfile, metafile, 0, -1))) @@ -286,3 +301,5 @@ int sr_session_save(const char *filename) return SR_OK; } + +/** @} */