/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <zip.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <sigrok.h>
+#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
extern struct sr_session *session;
extern struct sr_device_plugin session_driver;
-
-int 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;
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))) {
- g_debug("Failed to open session file: zip error %d", err);
+ sr_dbg("Failed to open session file: zip error %d", err);
return SR_ERR;
}
/* check "version" */
if (!(zf = zip_fopen(archive, "version", 0))) {
- g_debug("Not a sigrok session file.");
+ sr_dbg("Not a sigrok session file.");
return SR_ERR;
}
ret = zip_fread(zf, &c, 1);
if (ret != 1 || c != '1') {
- g_debug("Not a valid sigrok session file.");
+ sr_dbg("Not a valid sigrok session file.");
return SR_ERR;
}
zip_fclose(zf);
/* read "metadata" */
if (zip_stat(archive, "metadata", 0, &zs) == -1) {
- g_debug("Not a valid sigrok session file.");
+ sr_dbg("Not a valid sigrok session file.");
return SR_ERR;
}
- metafile = g_malloc(zs.size);
+
+ if (!(metafile = g_try_malloc(zs.size))) {
+ sr_err("session file: %s: metafile malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
+
zf = zip_fopen_index(archive, zs.index, 0);
zip_fread(zf, metafile, zs.size);
zip_fclose(zf);
kf = g_key_file_new();
if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) {
- g_debug("Failed to parse metadata.");
+ sr_dbg("Failed to parse metadata.");
return SR_ERR;
}
- session = session_new();
+ session = sr_session_new();
devcnt = 0;
capturefiles = g_ptr_array_new_with_free_func(g_free);
for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
if (!strcmp(keys[j], "capturefile")) {
- device = 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);
- session_device_add(device);
+ sr_session_device_add(device);
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);
} 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++)
- 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);
- 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);
- device_trigger_set(device, probenum, val);
+ sr_dev_trigger_set(device, probenum, val);
}
}
g_strfreev(keys);
return SR_OK;
}
-int session_save(char *filename)
+/**
+ * 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;
FILE *meta;
struct sr_device *device;
struct sr_probe *probe;
- struct datastore *ds;
+ struct sr_datastore *ds;
struct zip *zipfile;
struct zip_source *versrc, *metasrc, *logicsrc;
int bufcnt, devcnt, tmpfile, ret, error, probecnt;
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)))
if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
return SR_ERR;
if (zip_add(zipfile, "version", versrc) == -1) {
- g_message("error saving version into zipfile: %s",
- zip_strerror(zipfile));
+ sr_info("error saving version into zipfile: %s",
+ zip_strerror(zipfile));
return SR_ERR;
}
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 (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) {
}
/* 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,
return SR_ERR;
if ((ret = zip_close(zipfile)) == -1) {
- g_message("error saving zipfile: %s", zip_strerror(zipfile));
+ sr_info("error saving zipfile: %s", zip_strerror(zipfile));
return SR_ERR;
}
return SR_OK;
}
-
projects / libsigrok.git / blobdiff