gui: Use variable-sized input buffer for the audiod pipe.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index fc2cd9a145d25ac5ff0197fa132a87f5492661f7..21770ca86a368e177b5d9923f51743fe1932999c 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -203,24 +203,6 @@ static int para_open_audiod_pipe(char *cmd)
        return ret;
 }
 
-static int read_audiod_pipe(int fd, line_handler_t *line_handler)
-{
-       static char buf[4096];
-       const ssize_t bufsize = sizeof(buf) - 1;
-       static ssize_t loaded;
-       ssize_t ret;
-
-       if (loaded >= bufsize)
-               loaded = 0;
-       ret = read(fd, buf + loaded, bufsize - loaded);
-       if (ret > 0) {
-               loaded += ret;
-               buf[loaded] = '\0';
-               loaded = for_each_line(buf, loaded, line_handler, NULL);
-       }
-       return ret;
-}
-
 static int find_cmd_byname(char *name)
 {
        int i;
@@ -687,6 +669,43 @@ static void print_stat_item(int i)
        wrefresh(top.win);
 }
 
+/*
+ * print status line if line starts with known command.
+ */
+static int update_item(int item_num, char *buf)
+{
+       free(stat_content[item_num]);
+       stat_content[item_num] = para_strdup(buf);
+       print_stat_item(item_num);
+       return 1;
+}
+
+static int read_audiod_pipe(int fd)
+{
+       static char *buf;
+       static int bufsize, loaded;
+       int ret;
+
+       if (loaded >= bufsize) {
+               if (bufsize > 1000 * 1000) {
+                       loaded = 0;
+                       return 0;
+               }
+               bufsize += bufsize + 1000;
+               buf = para_realloc(buf, bufsize);
+       }
+       assert(loaded < bufsize);
+       ret = read(fd, buf + loaded, bufsize - loaded);
+       if (ret <= 0)
+               return ret;
+       loaded += ret;
+       ret = for_each_stat_item(buf, loaded, update_item);
+       if (ret < 0)
+               return ret;
+       loaded = ret;
+       return 1;
+}
+
 static void print_all_items(void)
 {
        int i;
@@ -769,26 +788,6 @@ reap_next_child:
        goto reap_next_child;
 }
 
-/*
- * print status line if line starts with known command.
- */
-static int check_stat_line(char *line, __a_unused void *data)
-{
-       int i;
-
-//     PARA_INFO_LOG("%s: checking: %s\n", __func__, line);
-       i = stat_line_valid(line);
-       if (i >= 0) {
-               line += strlen(status_item_list[i]) + 1;
-               if (*line == ' ')
-                       line++;
-               free(stat_content[i]);
-               stat_content[i] = para_strdup(line);
-               print_stat_item(i);
-       }
-       return 1;
-}
-
 /*
  * This sucker modifies its first argument. *handler and *arg are
  * pointers to 0-terminated strings (inside line). Crap.
@@ -859,8 +858,8 @@ static void handle_signal(int sig)
                return;
        case SIGINT:
                PARA_WARNING_LOG("caught SIGINT, reset");
-               /* Nothing to do. SIGINT killed our child, para_client stat.
-                * This get noticed by do_select which resets everything
+               /* Nothing to do. SIGINT killed our child which gets noticed
+                * by do_select and resets everything.
                 */
                return;
        case SIGUSR1:
@@ -946,7 +945,7 @@ repeat:
                }
        }
        if (audiod_pipe >= 0 && FD_ISSET(audiod_pipe, &rfds))
-               if (read_audiod_pipe(audiod_pipe, check_stat_line) <= 0) {
+               if (read_audiod_pipe(audiod_pipe) <= 0) {
                        close(audiod_pipe);
                        audiod_pipe = -1;
                        clear_all_items();