[btr] Split btr_del_node() into two functions.

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index d64586bccd9cdd12ffe743247680d8686ee1c002..bf4a923de06c466c0234bae9da301f1b294f11cb 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -8,6 +8,7 @@
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -15,6 +16,7 @@
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
 /**
  * The pre_select function of the stdout task.
@@ -43,6 +45,24 @@ static void stdout_pre_select(struct sched *s, struct task *t)
        para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
 }
 
+static void stdout_pre_select_btr(struct sched *s, struct task *t)
+{
+       struct stdout_task *sot = container_of(t, struct stdout_task, task);
+       size_t sz = btr_get_input_queue_size(sot->btrn);
+
+       t->error = 0;
+       sot->check_fd = 0;
+       if (sz == 0) {
+               if (btr_no_parent(sot->btrn)) {
+                       s->timeout.tv_sec = 0;
+                       s->timeout.tv_usec = 1;
+               }
+               return;
+       }
+       sot->check_fd = 1;
+       para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+}
+
 /**
  * The post select function of the stdout task.
  *
@@ -77,6 +97,36 @@ static void stdout_post_select(struct sched *s, struct task *t)
                memmove(*sot->bufp, *sot->bufp + ret, *sot->loaded);
 }
 
+static void stdout_post_select_btr(struct sched *s, struct task *t)
+{
+       struct stdout_task *sot = container_of(t, struct stdout_task, task);
+       ssize_t ret;
+       size_t sz = btr_get_input_queue_size(sot->btrn);
+       char *buf;
+
+       t->error = 0;
+       if (!sot->check_fd) {
+               if (sz == 0 && btr_no_parent(sot->btrn)) {
+                       t->error = -E_STDOUT_EOF;
+                       goto err;
+               }
+               return;
+       }
+       if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+               return;
+       sz = btr_next_buffer(sot->btrn, &buf);
+       if (sz == 0)
+               return;
+       ret = write_nonblock(STDOUT_FILENO, buf, sz, 0);
+       if (ret < 0) {
+               t->error = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
+       }
+       btr_consume(sot->btrn, ret);
+       return;
+err:
+       btr_remove_node(sot->btrn);
+}
 /**
  * Initialize a stdout task structure with default values.
  *
@@ -89,8 +139,13 @@ void stdout_set_defaults(struct stdout_task *sot)
 {
        int ret;
 
-       sot->task.pre_select = stdout_pre_select;
-       sot->task.post_select = stdout_post_select;
+       if (sot->btrn) {
+               sot->task.pre_select = stdout_pre_select_btr;
+               sot->task.post_select = stdout_post_select_btr;
+       } else {
+               sot->task.pre_select = stdout_pre_select;
+               sot->task.post_select = stdout_post_select;
+       }
        sprintf(sot->task.status, "stdout writer");
        ret = mark_fd_nonblocking(STDOUT_FILENO);
        if (ret >= 0)