X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=7d3396fc744503cdad7e348d2eb319a98e584556;hp=9d7bf626cd24a2341afaa1d29f83b381deadb4f4;hb=9ed80f1d862aa90d47fde48e0e1e924d1ad5e4a3;hpb=f0f54487c6a146af523d6eb19fcce63422e3f0f1

diff --git a/input.c b/input.c
index 9d7bf62..7d3396f 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,7 @@
  * 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>
@@ -27,10 +26,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
-#define BUFSIZE (16 * 1024)
+#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;
@@ -43,6 +43,7 @@ static void load_input_file_module(void)
 	int fd;
 	ssize_t len;
 	char *mod_id;
+	gboolean is_stdin;
 
 	if (!sr_input_list())
 		g_critical("No supported input formats available.");
@@ -54,8 +55,9 @@ static void load_input_file_module(void)
 		mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
 	}
 
+	is_stdin = strcmp(opt_input_file, "-") == 0;
 	fd = 0;
-	buf = g_string_sized_new(BUFSIZE);
+	buf = g_string_sized_new(CHUNK_SIZE);
 	if (mod_id) {
 		/* User specified an input module to use. */
 		if (!(imod = sr_input_find(mod_id)))
@@ -72,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.
@@ -90,32 +92,34 @@ 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.");
 	}
-	sr_session_new(&session);
-	sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
+	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, 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;
@@ -140,44 +144,63 @@ static void load_input_file_module(void)
 	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;
 
+	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();
+		load_input_file_module(&df_arg);
 	} else {
-		if ((ret = sr_session_load(opt_input_file, &session)) == SR_OK) {
+		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;
 			}
-			sr_session_datafeed_callback_add(session, datafeed_in, NULL);
-			sr_session_start(session);
-			sr_session_run(session);
-			sr_session_stop(session);
+			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);
 		} 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();
+			load_input_file_module(&df_arg);
 		}
 	}
 }