X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=7d3396fc744503cdad7e348d2eb319a98e584556;hp=c62c96406917a74e424a4de7e054625bee5894c3;hb=56fc0d6dbca2d46ff2a79275ef6307c4e38bf6a1;hpb=4bf77ec67e693aa08f5b72b71fff9943df8a65e7

diff --git a/input.c b/input.c
index c62c964..7d3396f 100644
--- a/input.c
+++ b/input.c
@@ -17,162 +17,190 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
-/**
- * Return the input file format which the CLI tool should use.
- *
- * If the user specified -I / --input-format, use that one. Otherwise, try to
- * autodetect the format as good as possible. Failing that, return NULL.
- *
- * @param filename The filename of the input file. Must not be NULL.
- * @param opt The -I / --input-file option the user specified (or NULL).
- *
- * @return A pointer to the 'struct sr_input_format' that should be used,
- *         or NULL if no input format was selected or auto-detected.
- */
-static struct sr_input_format *determine_input_file_format(
-			const char *filename, const char *opt)
-{
-	int i;
-	struct sr_input_format **inputs;
-
-	/* If there are no input formats, return NULL right away. */
-	inputs = sr_input_list();
-	if (!inputs) {
-		g_critical("No supported input formats available.");
-		return NULL;
-	}
-
-	/* If the user specified -I / --input-format, use that one. */
-	if (opt) {
-		for (i = 0; inputs[i]; i++) {
-			if (strcasecmp(inputs[i]->id, opt))
-				continue;
-			g_debug("Using user-specified input file format '%s'.",
-					inputs[i]->id);
-			return inputs[i];
-		}
-
-		/* The user specified an unknown input format, return NULL. */
-		g_critical("Error: specified input file format '%s' is "
-			"unknown.", opt);
-		return NULL;
-	}
-
-	/* Otherwise, try to find an input module that can handle this file. */
-	for (i = 0; inputs[i]; i++) {
-		if (inputs[i]->format_match(filename))
-			break;
-	}
-
-	/* Return NULL if no input module wanted to touch this. */
-	if (!inputs[i]) {
-		g_critical("Error: no matching input module found.");
-		return NULL;
-	}
-
-	g_debug("cli: Autodetected '%s' input format for file '%s'.",
-		inputs[i]->id, filename);
-
-	return inputs[i];
-}
+#define CHUNK_SIZE (4 * 1024 * 1024)
 
-static void load_input_file_format(void)
+static void load_input_file_module(struct df_arg_desc *df_arg)
 {
-	GHashTable *fmtargs = NULL;
-	struct stat st;
 	struct sr_session *session;
-	struct sr_input *in;
-	struct sr_input_format *input_format;
-	char *fmtspec = NULL;
+	const struct sr_input *in;
+	const struct sr_input_module *imod;
+	const struct sr_option **options;
+	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.");
 
+	mod_id = NULL;
+	mod_args = NULL;
 	if (opt_input_format) {
-		fmtargs = parse_generic_arg(opt_input_format, TRUE);
-		fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
-	}
-
-	if (!(input_format = determine_input_file_format(opt_input_file,
-						   fmtspec))) {
-		/* The exact cause was already logged. */
-		return;
+		mod_args = parse_generic_arg(opt_input_format, TRUE);
+		mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
 	}
 
-	if (fmtargs)
-		g_hash_table_remove(fmtargs, "sigrok_key");
-
-	if (stat(opt_input_file, &st) == -1) {
-		g_critical("Failed to load %s: %s", opt_input_file,
-			strerror(errno));
-		exit(1);
-	}
-
-	/* Initialize the input module. */
-	if (!(in = g_try_malloc(sizeof(struct sr_input)))) {
-		g_critical("Failed to allocate input module.");
-		exit(1);
-	}
-	in->format = input_format;
-	in->param = fmtargs;
-	if (in->format->init) {
-		if (in->format->init(in, opt_input_file) != SR_OK) {
-			g_critical("Input format init failed.");
-			exit(1);
+	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)))
+			g_critical("Error: unknown input module '%s'.", mod_id);
+		g_hash_table_remove(mod_args, "sigrok_key");
+		if ((options = sr_input_options_get(imod))) {
+			mod_opts = generic_arg_to_opt(options, mod_args);
+			sr_output_options_free(options);
+		} else
+			mod_opts = NULL;
+		if (!(in = sr_input_new(imod, mod_opts)))
+			g_critical("Error: failed to initialize input module.");
+		if (mod_opts)
+			g_hash_table_destroy(mod_opts);
+		if (mod_args)
+			g_hash_table_destroy(mod_args);
+		if (!is_stdin && (fd = open(opt_input_file, O_RDONLY)) < 0)
+			g_critical("Failed to load %s: %s.", opt_input_file,
+					g_strerror(errno));
+	} else {
+		if (!is_stdin) {
+			/*
+			 * An actual filename: let the input modules try to
+			 * identify the file.
+			 */
+			if (sr_input_scan_file(opt_input_file, &in) == SR_OK) {
+				/* That worked, reopen the file for reading. */
+				fd = open(opt_input_file, O_RDONLY);
+			}
+		} else {
+			/*
+			 * Taking input from a pipe: let the input modules try
+			 * to identify the stream content.
+			 */
+			if (is_stdin) {
+				/* stdin */
+				fd = 0;
+			} else {
+				fd = open(opt_input_file, O_RDONLY);
+				if (fd == -1)
+					g_critical("Failed to load %s: %s.", opt_input_file,
+							g_strerror(errno));
+			}
+			if ((len = read(fd, buf->str, CHUNK_SIZE)) < 1)
+				g_critical("Failed to read %s: %s.", opt_input_file,
+						g_strerror(errno));
+			buf->len = len;
+			sr_input_scan_buffer(buf, &in);
 		}
+		if (!in)
+			g_critical("Error: no input module found for this file.");
 	}
+	sr_session_new(sr_ctx, &session);
+	df_arg->session = session;
+	sr_session_datafeed_callback_add(session, datafeed_in, df_arg);
+
+	got_sdi = FALSE;
+	while (TRUE) {
+		g_string_truncate(buf, 0);
+		len = read(fd, buf->str, CHUNK_SIZE);
+		if (len < 0)
+			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 (select_channels(in->sdi) != SR_OK)
-		return;
-
-	sr_session_new(&session);
-	sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
-	if (sr_session_dev_add(session, in->sdi) != SR_OK) {
-		g_critical("Failed to use device.");
-		sr_session_destroy(session);
-		return;
+		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);
 
-	input_format->loadfile(in, opt_input_file);
-
+	df_arg->session = NULL;
 	sr_session_destroy(session);
 
-	if (fmtargs)
-		g_hash_table_destroy(fmtargs);
 }
 
-void load_input_file(void)
+void load_input_file(gboolean do_props)
 {
-	GSList *devices;
+	struct df_arg_desc df_arg;
 	struct sr_session *session;
 	struct sr_dev_inst *sdi;
+	GSList *devices;
+	GMainLoop *main_loop;
 	int ret;
 
-	if (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.");
+	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);
 		}
-		sdi = devices->data;
-		if (select_channels(sdi) != SR_OK) {
-			sr_session_destroy(session);
-			return;
-		}
-		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_format();
 	}
 }