Pass unitsize to srd_session_send() directly.

[sigrok-cli.git] / input.c

diff --git a/input.c b/input.c
index b0458e5eb20baef067da62d9715ce81b2d324723..79b6270158b318e0d0f77cdaa984f8fac464bbb9 100644 (file)
--- a/input.c
+++ b/input.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,8 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
-#define BUFSIZE 16384
+#define BUFSIZE (16 * 1024)
 
 static void load_input_file_module(void)
 {
@@ -39,6 +39,7 @@ 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;
@@ -53,6 +54,7 @@ static void load_input_file_module(void)
                mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
        }
 
+       fd = 0;
        buf = g_string_sized_new(BUFSIZE);
        if (mod_id) {
                /* User specified an input module to use. */
@@ -79,9 +81,10 @@ static void load_input_file_module(void)
                         * An actual filename: let the input modules try to
                         * identify the file.
                         */
-                       in = sr_input_scan_file(opt_input_file);
-                       /* That worked, reopen the file for reading. */
-                       fd = open(opt_input_file, O_RDONLY);
+                       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
@@ -99,35 +102,41 @@ static void load_input_file_module(void)
                                g_critical("Failed to read %s: %s.", opt_input_file,
                                                strerror(errno));
                        buf->len = len;
-                       in = sr_input_scan_buffer(buf);
+                       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_new(sr_ctx, &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;
-       }
 
-       while(TRUE) {
+       got_sdi = FALSE;
+       while (TRUE) {
                g_string_truncate(buf, 0);
                len = read(fd, buf->str, BUFSIZE);
                if (len < 0)
                        g_critical("Read failed: %s", 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);
 
@@ -142,26 +151,34 @@ void load_input_file(void)
        GSList *devices;
        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) {
-                       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 */
+       if (!strcmp(opt_input_file, "-")) {
+               /* Input from stdin is never a session file. */
                load_input_file_module();
+       } 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.");
+                               sr_session_destroy(session);
+                               return;
+                       }
+                       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 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();
+               }
        }
 }