X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=7d3396fc744503cdad7e348d2eb319a98e584556;hp=c4f41bf4f57a9a1ea0b70dba02f484ee4c26a1b1;hb=9ed80f1d862aa90d47fde48e0e1e924d1ad5e4a3;hpb=b66260b90ab0dc9a4c3df56fba4ea794f74fdec5
diff --git a/input.c b/input.c
index c4f41bf..7d3396f 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
-#include "config.h"
+#include
#include
#include
#include
@@ -27,10 +26,11 @@
#include
#include
#include
+#include "sigrok-cli.h"
-#define BUFSIZE 16384
+#define CHUNK_SIZE (4 * 1024 * 1024)
-static void load_input_file_module(void)
+static void load_input_file_module(struct df_arg_desc *df_arg)
{
struct sr_session *session;
const struct sr_input *in;
@@ -39,9 +39,11 @@ static void load_input_file_module(void)
struct sr_dev_inst *sdi;
GHashTable *mod_args, *mod_opts;
GString *buf;
+ gboolean got_sdi;
int fd;
ssize_t len;
char *mod_id;
+ gboolean is_stdin;
if (!sr_input_list())
g_critical("No supported input formats available.");
@@ -53,7 +55,9 @@ static void load_input_file_module(void)
mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
}
- buf = g_string_sized_new(BUFSIZE);
+ is_stdin = strcmp(opt_input_file, "-") == 0;
+ fd = 0;
+ buf = g_string_sized_new(CHUNK_SIZE);
if (mod_id) {
/* User specified an input module to use. */
if (!(imod = sr_input_find(mod_id)))
@@ -70,11 +74,11 @@ static void load_input_file_module(void)
g_hash_table_destroy(mod_opts);
if (mod_args)
g_hash_table_destroy(mod_args);
- if ((fd = open(opt_input_file, O_RDONLY)) == -1)
+ if (!is_stdin && (fd = open(opt_input_file, O_RDONLY)) < 0)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
} else {
- if (strcmp(opt_input_file, "-")) {
+ if (!is_stdin) {
/*
* An actual filename: let the input modules try to
* identify the file.
@@ -88,81 +92,115 @@ static void load_input_file_module(void)
* Taking input from a pipe: let the input modules try
* to identify the stream content.
*/
- if (!strcmp(opt_input_file, "-")) {
+ if (is_stdin) {
/* stdin */
fd = 0;
} else {
- if ((fd = open(opt_input_file, O_RDONLY)) == -1)
+ fd = open(opt_input_file, O_RDONLY);
+ if (fd == -1)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
}
- if ((len = read(fd, buf->str, BUFSIZE)) < 1)
+ if ((len = read(fd, buf->str, CHUNK_SIZE)) < 1)
g_critical("Failed to read %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
buf->len = len;
sr_input_scan_buffer(buf, &in);
}
if (!in)
g_critical("Error: no input module found for this file.");
}
- sdi = sr_input_dev_inst_get(in);
-
- if (select_channels(sdi) != SR_OK)
- return;
-
- sr_session_new(&session);
- sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
- if (sr_session_dev_add(session, sdi) != SR_OK) {
- g_critical("Failed to use device.");
- sr_session_destroy(session);
- return;
- }
+ sr_session_new(sr_ctx, &session);
+ df_arg->session = session;
+ sr_session_datafeed_callback_add(session, datafeed_in, df_arg);
- while(TRUE) {
+ got_sdi = FALSE;
+ while (TRUE) {
g_string_truncate(buf, 0);
- len = read(fd, buf->str, BUFSIZE);
+ len = read(fd, buf->str, CHUNK_SIZE);
if (len < 0)
- g_critical("Read failed: %s", strerror(errno));
+ g_critical("Read failed: %s", g_strerror(errno));
+ if (len == 0)
+ /* End of file or stream. */
+ break;
buf->len = len;
if (sr_input_send(in, buf) != SR_OK)
break;
- if (len < BUFSIZE)
- break;
+
+ sdi = sr_input_dev_inst_get(in);
+ if (!got_sdi && sdi) {
+ /* First time we got a valid sdi. */
+ if (select_channels(sdi) != SR_OK)
+ return;
+ if (sr_session_dev_add(session, sdi) != SR_OK) {
+ g_critical("Failed to use device.");
+ sr_session_destroy(session);
+ return;
+ }
+ got_sdi = TRUE;
+ }
}
+ sr_input_end(in);
sr_input_free(in);
g_string_free(buf, TRUE);
+ df_arg->session = NULL;
sr_session_destroy(session);
}
-void load_input_file(void)
+void load_input_file(gboolean do_props)
{
+ struct df_arg_desc df_arg;
struct sr_session *session;
struct sr_dev_inst *sdi;
GSList *devices;
+ GMainLoop *main_loop;
int ret;
- if (strcmp(opt_input_file, "-") || sr_session_load(opt_input_file, &session) == SR_OK) {
- /* sigrok session file */
- ret = sr_session_dev_list(session, &devices);
- if (ret != SR_OK || !devices->data) {
- g_critical("Failed to access session device.");
- sr_session_destroy(session);
- return;
- }
- sdi = devices->data;
- if (select_channels(sdi) != SR_OK) {
+ memset(&df_arg, 0, sizeof(df_arg));
+ df_arg.do_props = do_props;
+
+ if (!strcmp(opt_input_file, "-")) {
+ /* Input from stdin is never a session file. */
+ load_input_file_module(&df_arg);
+ } else {
+ if ((ret = sr_session_load(sr_ctx, opt_input_file,
+ &session)) == SR_OK) {
+ /* sigrok session file */
+ ret = sr_session_dev_list(session, &devices);
+ if (ret != SR_OK || !devices || !devices->data) {
+ g_critical("Failed to access session device.");
+ g_slist_free(devices);
+ sr_session_destroy(session);
+ return;
+ }
+ sdi = devices->data;
+ g_slist_free(devices);
+ if (select_channels(sdi) != SR_OK) {
+ sr_session_destroy(session);
+ return;
+ }
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+ df_arg.session = session;
+ sr_session_datafeed_callback_add(session,
+ datafeed_in, &df_arg);
+ sr_session_stopped_callback_set(session,
+ (sr_session_stopped_callback)g_main_loop_quit,
+ main_loop);
+ if (sr_session_start(session) == SR_OK)
+ g_main_loop_run(main_loop);
+
+ g_main_loop_unref(main_loop);
+ df_arg.session = NULL;
sr_session_destroy(session);
- return;
+ } else if (ret != SR_ERR) {
+ /* It's a session file, but it didn't work out somehow. */
+ g_critical("Failed to load session file.");
+ } else {
+ /* Fall back on input modules. */
+ load_input_file_module(&df_arg);
}
- sr_session_datafeed_callback_add(session, datafeed_in, NULL);
- sr_session_start(session);
- sr_session_run(session);
- sr_session_stop(session);
- }
- else {
- /* fall back on input modules */
- load_input_file_module();
}
}