X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=d983d7a0e65f91902d5b8202a0e93d684c8473ca;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=0e3c56bec13be086a4cf7ce10f725c17363773a2;hpb=b53738baf76219237e0a6629905981d7a1f2508e;p=libsigrok.git diff --git a/session_file.c b/session_file.c index 0e3c56be..d983d7a0 100644 --- a/session_file.c +++ b/session_file.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,20 +17,29 @@ * along with this program. If not, see . */ -#include "config.h" #include #include #include #include #include #include -#include -#include +#include "config.h" +#include "sigrok.h" +#include "sigrok-internal.h" extern struct sr_session *session; extern struct sr_device_plugin session_driver; -int sr_session_load(const char *filename) +/** + * Load the session from the specified filename. + * + * @param filename The name of the session file to load. Must not be NULL. + * + * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, + * SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon + * other errors. + */ +SR_API int sr_session_load(const char *filename) { GKeyFile *kf; GPtrArray *capturefiles; @@ -43,6 +52,12 @@ int sr_session_load(const char *filename) int ret, err, probenum, devcnt, i, j; uint64_t tmp_u64, total_probes, enabled_probes, p; char **sections, **keys, *metafile, *val, c; + char probename[SR_MAX_PROBENAME_LEN + 1]; + + if (!filename) { + sr_err("session file: %s: filename was NULL", __func__); + return SR_ERR_ARG; + } if (!(archive = zip_open(filename, 0, &err))) { sr_dbg("Failed to open session file: zip error %d", err); @@ -99,7 +114,7 @@ int sr_session_load(const char *filename) 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_device_new(&session_driver, devcnt, 0); + device = sr_dev_new(&session_driver, devcnt); if (devcnt == 0) /* first device, init the plugin */ device->plugin->init((char *)filename); @@ -107,7 +122,7 @@ int sr_session_load(const char *filename) device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val); g_ptr_array_add(capturefiles, val); } else if (!strcmp(keys[j], "samplerate")) { - tmp_u64 = sr_parse_sizestring(val); + sr_parse_sizestring(val, &tmp_u64); device->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); } else if (!strcmp(keys[j], "unitsize")) { tmp_u64 = strtoull(val, NULL, 10); @@ -115,17 +130,19 @@ int sr_session_load(const char *filename) } 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); - for (p = 1; p <= total_probes; p++) - sr_device_probe_add(device, NULL); + for (p = 0; p < total_probes; p++) { + snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); + sr_dev_probe_add(device, probename); + } } else if (!strncmp(keys[j], "probe", 5)) { if (!device) continue; enabled_probes++; tmp_u64 = strtoul(keys[j]+5, NULL, 10); - sr_device_probe_name(device, tmp_u64, val); + sr_dev_probe_name(device, tmp_u64, val); } else if (!strncmp(keys[j], "trigger", 7)) { probenum = strtoul(keys[j]+7, NULL, 10); - sr_device_trigger_set(device, probenum, val); + sr_dev_trigger_set(device, probenum, val); } } g_strfreev(keys); @@ -141,6 +158,15 @@ int sr_session_load(const char *filename) return SR_OK; } +/** + * Save the current session to the specified file. + * + * @param filename The name of the file where to save the current session. + * Must not be NULL. + * + * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR + * upon other errors. + */ int sr_session_save(const char *filename) { GSList *l, *p, *d; @@ -154,6 +180,11 @@ int sr_session_save(const char *filename) uint64_t samplerate; char version[1], rawname[16], metafile[32], *buf, *s; + if (!filename) { + sr_err("session file: %s: filename was NULL", __func__); + return SR_ERR_ARG; + } + /* Quietly delete it first, libzip wants replace ops otherwise. */ unlink(filename); if (!(zipfile = zip_open(filename, ZIP_CREATE, &error))) @@ -194,12 +225,12 @@ int sr_session_save(const char *filename) 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_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) { + 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); - free(s); + g_free(s); } probecnt = 1; for (p = device->probes; p; p = p->next) { @@ -214,8 +245,14 @@ int sr_session_save(const char *filename) } /* dump datastore into logic-n */ - buf = malloc(ds->num_units * ds->ds_unitsize + + 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,