X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=0e3c56bec13be086a4cf7ce10f725c17363773a2;hb=a76983fd207554de93adabfd33d2abf8d0f3662a;hp=015927d2a2d00c6289276ae427f8f0d5faa2a14b;hpb=7d6588743503514c9de5c4fc8a511e9b0bdad7e6;p=libsigrok.git
diff --git a/session_file.c b/session_file.c
index 015927d2..0e3c56be 100644
--- a/session_file.c
+++ b/session_file.c
@@ -17,67 +17,72 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
#include
#include
+#include
#include
-#include
+#include
-
-extern struct session *session;
+extern struct sr_session *session;
extern struct sr_device_plugin session_driver;
-
-int session_load(const char *filename)
+int sr_session_load(const char *filename)
{
GKeyFile *kf;
GPtrArray *capturefiles;
struct zip *archive;
struct zip_file *zf;
struct zip_stat zs;
- struct session *session;
+ struct sr_session *session;
struct sr_device *device;
- struct probe *probe;
+ struct sr_probe *probe;
int ret, err, probenum, devcnt, i, j;
uint64_t tmp_u64, total_probes, enabled_probes, p;
char **sections, **keys, *metafile, *val, c;
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);
@@ -94,11 +99,11 @@ int 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 = device_new(&session_driver, devcnt, 0);
+ device = sr_device_new(&session_driver, devcnt, 0);
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")) {
@@ -111,16 +116,16 @@ int session_load(const char *filename)
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);
+ sr_device_probe_add(device, NULL);
} 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_device_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_device_trigger_set(device, probenum, val);
}
}
g_strfreev(keys);
@@ -136,37 +141,31 @@ int session_load(const char *filename)
return SR_OK;
}
-int session_save(char *filename)
+int sr_session_save(const char *filename)
{
GSList *l, *p, *d;
FILE *meta;
struct sr_device *device;
- struct probe *probe;
- struct datastore *ds;
+ 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;
- char version[1], rawname[16], metafile[32], *newfn, *buf, *s;
-
- newfn = g_malloc(strlen(filename) + 10);
- strcpy(newfn, filename);
- if (strstr(filename, ".sigrok") != filename+strlen(filename)-7)
- strcat(newfn, ".sigrok");
+ char version[1], rawname[16], metafile[32], *buf, *s;
/* Quietly delete it first, libzip wants replace ops otherwise. */
- unlink(newfn);
- if (!(zipfile = zip_open(newfn, ZIP_CREATE, &error)))
+ unlink(filename);
+ if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
return SR_ERR;
- g_free(newfn);
/* "version" */
version[0] = '1';
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;
}
@@ -175,7 +174,7 @@ int session_save(char *filename)
if ((tmpfile = g_mkstemp(metafile)) == -1)
return SR_ERR;
close(tmpfile);
- meta = fopen(metafile, "wb");
+ meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n");
fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
/* TODO: save protocol decoders used */
@@ -195,7 +194,7 @@ int session_save(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 (device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+ if (sr_device_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);
@@ -240,7 +239,7 @@ int session_save(char *filename)
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;
}
@@ -248,4 +247,3 @@ int session_save(char *filename)
return SR_OK;
}
-