X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input.c;h=21c28cd70a74467e665eab3440324b728e6402c9;hb=96d0921142060606933323f6bc37b02ee1225c3d;hp=b81e84b47a5ab94541636dc02008aa256add3608;hpb=67a00747d638fad479a69533e190446975643d6a;p=sigrok-cli.git
diff --git a/input.c b/input.c
index b81e84b..21c28cd 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,8 +26,9 @@
#include
#include
#include
+#include "sigrok-cli.h"
-#define BUFSIZE 16384
+#define BUFSIZE (16 * 1024)
static void load_input_file_module(void)
{
@@ -74,7 +74,7 @@ static void load_input_file_module(void)
g_hash_table_destroy(mod_args);
if ((fd = open(opt_input_file, O_RDONLY)) == -1)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
} else {
if (strcmp(opt_input_file, "-")) {
/*
@@ -96,26 +96,26 @@ static void load_input_file_module(void)
} else {
if ((fd = open(opt_input_file, O_RDONLY)) == -1)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
}
if ((len = read(fd, buf->str, BUFSIZE)) < 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_new(sr_ctx, &session);
sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
got_sdi = FALSE;
- while(TRUE) {
+ while (TRUE) {
g_string_truncate(buf, 0);
len = read(fd, buf->str, BUFSIZE);
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;
@@ -124,7 +124,7 @@ static void load_input_file_module(void)
break;
sdi = sr_input_dev_inst_get(in);
- if(!got_sdi && sdi) {
+ if (!got_sdi && sdi) {
/* First time we got a valid sdi. */
if (select_channels(sdi) != SR_OK)
return;
@@ -135,7 +135,6 @@ static void load_input_file_module(void)
}
got_sdi = TRUE;
}
-
}
sr_input_end(in);
sr_input_free(in);
@@ -150,27 +149,46 @@ void load_input_file(void)
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) {
+ 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.");
+ 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);
+
+ sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+ 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);
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();
}
- 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();
}
}