stdout: Try to write as much as possible in one go.

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index d64586bccd9cdd12ffe743247680d8686ee1c002..34fe08cd6a46e8305fa990988b1408f056fad191 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,22 @@ 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);
+       int ret;
+
+       t->error = 0;
+       sot->check_fd = 0;
+       ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
+       if (ret > 0)
+               para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+       else if (ret < 0) {
+               s->timeout.tv_sec = 0;
+               s->timeout.tv_usec = 1;
+       }
+}
+
 /**
  * The post select function of the stdout task.
  *
@@ -77,21 +95,57 @@ 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);
+       struct btr_node *btrn = sot->btrn;
+       int ret;
+       char *buf;
+       size_t sz;
+
+       t->error = 0;
+       ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+       if (ret < 0)
+               goto out;
+       if (ret == 0)
+               return;
+       if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+               return;
+
+       for (;;) {
+               sz = btr_next_buffer(btrn, &buf);
+               if (sz == 0)
+                       break;
+               ret = write_nonblock(STDOUT_FILENO, buf, sz, 0);
+               if (ret <= 0)
+                       break;
+               btr_consume(btrn, ret);
+       }
+out:
+       if (ret < 0)
+               btr_remove_node(btrn);
+       t->error = ret;
+}
 /**
  * Initialize a stdout task structure with default values.
  *
  * \param sot The stdout task structure.
  *
- * This fills in the pre/post select function poinzters of the task structure
+ * This fills in the pre/post select function pointers of the task structure
  * given by \a sot.
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
        int ret;
 
-       sot->task.pre_select = stdout_pre_select;
-       sot->task.post_select = stdout_post_select;
-       sprintf(sot->task.status, "stdout writer");
+       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");
        ret = mark_fd_nonblocking(STDOUT_FILENO);
        if (ret >= 0)
                return;