X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=7fb939948ba2b265078ecfce75bb7f267bb39516;hp=2c2f478365469effabd1c3513c2ef76de606127c;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=27d310f019395f2e4d5615b3f88b7255655a8039
diff --git a/session.c b/session.c
index 2c2f478..7fb9399 100644
--- a/session.c
+++ b/session.c
@@ -17,15 +17,14 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#include
#include
#include
+#include "sigrok-cli.h"
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
-static char *srzip_and_filename = NULL;
#ifdef HAVE_SRD
extern struct srd_session *srd_sess;
@@ -53,7 +52,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
}
} else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
SR_CONF_GET | SR_CONF_SET)) {
- /* Convert to samples based on the samplerate. */
+ /* Convert to samples based on the samplerate. */
sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
@@ -81,17 +80,13 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
const struct sr_option **options;
const struct sr_output *o;
GHashTable *fmtargs, *fmtopts;
- int size;
char *fmtspec;
if (!opt_output_format) {
if (opt_output_file) {
- size = strlen(opt_output_file) + 32;
- srzip_and_filename = g_malloc(size);
- snprintf(srzip_and_filename, size, "srzip:filename=%s", opt_output_file);
- opt_output_format = srzip_and_filename;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
} else {
- opt_output_format = DEFAULT_OUTPUT_FORMAT;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
}
}
@@ -107,7 +102,8 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
sr_output_options_free(options);
} else
fmtopts = NULL;
- o = sr_output_new(omod, fmtopts, sdi);
+ o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
+
if (fmtopts)
g_hash_table_destroy(fmtopts);
g_hash_table_destroy(fmtargs);
@@ -115,6 +111,37 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
return o;
}
+const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
+{
+ const struct sr_transform_module *tmod;
+ const struct sr_option **options;
+ const struct sr_transform *t;
+ GHashTable *fmtargs, *fmtopts;
+ char *fmtspec;
+
+ if (!opt_transform_module)
+ opt_transform_module = "nop";
+
+ fmtargs = parse_generic_arg(opt_transform_module, TRUE);
+ fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+ if (!fmtspec)
+ g_critical("Invalid transform module.");
+ if (!(tmod = sr_transform_find(fmtspec)))
+ g_critical("Unknown transform module '%s'.", fmtspec);
+ g_hash_table_remove(fmtargs, "sigrok_key");
+ if ((options = sr_transform_options_get(tmod))) {
+ fmtopts = generic_arg_to_opt(options, fmtargs);
+ sr_transform_options_free(options);
+ } else
+ fmtopts = NULL;
+ t = sr_transform_new(tmod, fmtopts, sdi);
+ if (fmtopts)
+ g_hash_table_destroy(fmtopts);
+ g_hash_table_destroy(fmtargs);
+
+ return t;
+}
+
void datafeed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet, void *cb_data)
{
@@ -140,7 +167,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
driver = sr_dev_inst_driver_get(sdi);
/* If the first packet to come in isn't a header, don't even try. */
- if (packet->type != SR_DF_HEADER && o == NULL)
+ if (packet->type != SR_DF_HEADER && !o)
return;
session = cb_data;
@@ -151,12 +178,26 @@ void datafeed_in(const struct sr_dev_inst *sdi,
g_critical("Failed to initialize output module.");
/* Set up backup analog output module. */
- oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
-
- if (opt_output_file)
- outfile = g_fopen(opt_output_file, "wb");
- else
+ oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
+
+ /*
+ * Don't open a file when using the "srzip" output format.
+ * The srzip output module does open/write/rename/close
+ * on its own. This is especially important on Windows since
+ * libzip (used by srzip) will try to rename a temporary
+ * ZIP file to the final *.sr filename as specified by
+ * the sigrok-cli user. However, on Windows file renames
+ * of files that are already opened by any process are not
+ * possible. Thus, we don't open the *.sr file here,
+ * but rather let srzip perform all file operations.
+ */
+ if (opt_output_file) {
+ /* Only open the file if output format != srzip. */
+ if (!g_str_has_prefix(opt_output_format, "srzip"))
+ outfile = g_fopen(opt_output_file, "wb");
+ } else {
outfile = stdout;
+ }
rcvd_samples_logic = rcvd_samples_analog = 0;
@@ -240,7 +281,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
if (opt_pds) {
#ifdef HAVE_SRD
if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
- logic->data, input_len) != SRD_OK)
+ logic->data, input_len, logic->unitsize) != SRD_OK)
sr_session_stop(session);
#endif
}
@@ -272,13 +313,15 @@ void datafeed_in(const struct sr_dev_inst *sdi,
break;
}
- if (o && outfile && !opt_pds) {
+ if (o && (outfile || g_str_has_prefix(opt_output_format, "srzip")) && !opt_pds) {
if (sr_output_send(o, packet, &out) == SR_OK) {
if (!out || (out->len == 0
&& !opt_output_format
&& packet->type == SR_DF_ANALOG)) {
- /* The user didn't specify an output module,
- * but needs to see this analog data. */
+ /*
+ * The user didn't specify an output module,
+ * but needs to see this analog data.
+ */
sr_output_send(oa, packet, &out);
}
if (out && out->len > 0) {
@@ -290,16 +333,15 @@ void datafeed_in(const struct sr_dev_inst *sdi,
}
}
- /* SR_DF_END needs to be handled after the output module's receive()
- * is called, so it can properly clean up that module. */
+ /*
+ * SR_DF_END needs to be handled after the output module's receive()
+ * is called, so it can properly clean up that module.
+ */
if (packet->type == SR_DF_END) {
g_debug("cli: Received SR_DF_END.");
- if (o) {
+ if (o)
sr_output_free(o);
- if (srzip_and_filename)
- g_free(srzip_and_filename);
- }
o = NULL;
sr_output_free(oa);
@@ -337,7 +379,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
}
src->key = srci->key;
- if ((value == NULL || strlen(value) == 0) &&
+ if ((!value || strlen(value) == 0) &&
(srci->datatype != SR_T_BOOL)) {
g_critical("Option '%s' needs a value.", (char *)key);
return -1;
@@ -447,7 +489,8 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
cg = select_channel_group(sdi);
if ((ret = maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, cg,
src.key, src.data)) != SR_OK) {
- g_critical("Failed to set device option '%s'.", (char *)key);
+ g_critical("Failed to set device option '%s': %s.",
+ (char *)key, sr_strerror(ret));
return ret;
}
}
@@ -468,6 +511,7 @@ void run_session(void)
const uint32_t *dev_opts;
int is_demo_dev;
struct sr_dev_driver *driver;
+ const struct sr_transform *t;
devices = device_scan();
if (!devices) {
@@ -516,7 +560,7 @@ void run_session(void)
g_slist_free(devices);
g_slist_free(real_devices);
- sr_session_new(&session);
+ sr_session_new(sr_ctx, &session);
sr_session_datafeed_callback_add(session, datafeed_in, NULL);
if (sr_dev_open(sdi) != SR_OK) {
@@ -578,8 +622,10 @@ void run_session(void)
}
if (maybe_config_list(driver, sdi, NULL, SR_CONF_LIMIT_SAMPLES,
&gvar) == SR_OK) {
- /* The device has no compression, or compression is turned
- * off, and publishes its sample memory size. */
+ /*
+ * The device has no compression, or compression is turned
+ * off, and publishes its sample memory size.
+ */
g_variant_get(gvar, "(tt)", &min_samples, &max_samples);
g_variant_unref(gvar);
if (limit_samples < min_samples) {
@@ -613,6 +659,9 @@ void run_session(void)
}
}
+ if (!(t = setup_transform_module(sdi)))
+ g_critical("Failed to initialize transform module.");
+
if (sr_session_start(session) != SR_OK) {
g_critical("Failed to start session.");
sr_session_destroy(session);
@@ -631,4 +680,3 @@ void run_session(void)
sr_session_destroy(session);
}
-