buffer_tree: Add code to splice out a node of the buffer tree.

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index ebc1cb98fd7970f9b17cab73710a6557c5a3c385..6539b68f3ff8f91befc8d99cf6b5c3002b2b9e98 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -8,14 +8,15 @@
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>

+#include <stdbool.h>

 
 #include "para.h"
 
 #include "para.h"

-#include "string.h"

 #include "list.h"
 #include "sched.h"
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"
 #include "list.h"
 #include "sched.h"
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"

+#include "buffer_tree.h"

 
 /**
  * The pre_select function of the stdout task.
 
 /**
  * The pre_select function of the stdout task.


@@ -44,6 +45,26 @@ static void stdout_pre_select(struct sched *s, struct task *t)
        para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
 }
 
        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)) {
+                       t->error = -E_ORPHAN;
+                       btr_del_node(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.
  *
 /**
  * The post select function of the stdout task.
  *


@@ -62,22 +83,53 @@ static void stdout_post_select(struct sched *s, struct task *t)
 
        t->error = 0;
        if (!sot->check_fd) {
 
        t->error = 0;
        if (!sot->check_fd) {

-               if (*sot->input_error)
+               if (!*sot->loaded && *sot->input_error < 0)

                        t->error = *sot->input_error;
                return;
        }
        if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
                return;
                        t->error = *sot->input_error;
                return;
        }
        if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
                return;

-       ret = write(STDOUT_FILENO, sot->buf, *sot->loaded);
+       ret = write(STDOUT_FILENO, *sot->bufp, *sot->loaded);

        if (ret < 0) {
                t->error = -ERRNO_TO_PARA_ERROR(errno);
                return;
        }
        *sot->loaded -= ret;
        if (*sot->loaded)
        if (ret < 0) {
                t->error = -ERRNO_TO_PARA_ERROR(errno);
                return;
        }
        *sot->loaded -= ret;
        if (*sot->loaded)

-               memmove(sot->buf, sot->buf + ret, *sot->loaded);
+               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);
+       bool orphan = btr_no_parent(sot->btrn);
+       char *buf;
+
+       t->error = 0;
+       if (!sot->check_fd) {
+               if (sz == 0 && orphan) {
+                       t->error = -E_ORPHAN;
+                       goto err;
+               }
+               return;
+       }
+       if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+               return;
+       sz = btr_next_buffer(sot->btrn, &buf);
+       if (sz == 0)
+               return;
+       ret = write(STDOUT_FILENO, buf, sz);
+       if (ret < 0) {
+               t->error = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
+       }
+       btr_consume(sot->btrn, ret);
+       return;
+err:
+       btr_del_node(sot->btrn);
+}

 /**
  * Initialize a stdout task structure with default values.
  *
 /**
  * Initialize a stdout task structure with default values.
  *


@@ -90,8 +142,13 @@ void stdout_set_defaults(struct stdout_task *sot)
 {
        int ret;
 
 {
        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)
        sprintf(sot->task.status, "stdout writer");
        ret = mark_fd_nonblocking(STDOUT_FILENO);
        if (ret >= 0)