X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=6425146e2b45123facded53756af6ea3b7a2a58c;hp=79b6270158b318e0d0f77cdaa984f8fac464bbb9;hb=49e9f06791d585fb112e9602946e9740f4cb3a74;hpb=662a1e27fa9573a35a6f9a6f699dee2be447826a
diff --git a/input.c b/input.c
index 79b6270..6425146 100644
--- a/input.c
+++ b/input.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -26,9 +27,8 @@
#include
#include
#include "sigrok-cli.h"
-#include "config.h"
-#define BUFSIZE (16 * 1024)
+#define CHUNK_SIZE (4 * 1024 * 1024)
static void load_input_file_module(void)
{
@@ -55,7 +55,7 @@ static void load_input_file_module(void)
}
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)))
@@ -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,11 +96,11 @@ 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)
+ 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);
}
@@ -108,14 +108,14 @@ static void load_input_file_module(void)
g_critical("Error: no input module found for this file.");
}
sr_session_new(sr_ctx, &session);
- sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
+ sr_session_datafeed_callback_add(session, &datafeed_in, session);
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;
@@ -149,6 +149,7 @@ 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, "-")) {
@@ -161,18 +162,27 @@ void load_input_file(void)
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);
+
+ sr_session_datafeed_callback_add(session, datafeed_in, session);
+ 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);
} else if (ret != SR_ERR) {
/* It's a session file, but it didn't work out somehow. */
g_critical("Failed to load session file.");