RC4: Allocate 8 extra bytes for send buffer.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 9a4f0707f6f213f1fc88346b0aa2c039bebfa003..0cee535aa92ff9b5aaba1b815c8e8c95e0dd4731 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,23 +10,24 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/time.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "write.h"
+#include "write_common.h"
 #include "string.h"
 #include "fd.h"
 #include "file_write.cmdline.h"
 #include "error.h"
 
-/** data specific to the file writer */
+/** Data specific to the file writer. */
 struct private_file_write_data {
-       /** the file descriptor of the output file */
+       /** The file descriptor of the output file. */
        int fd;
-       /** non-zero if \a fd was added to the write fd set */
-       int check_fd;
 };
 
 /*
@@ -55,62 +56,77 @@ static int file_write_open(struct writer_node *wn)
                sizeof(struct private_file_write_data));
        struct file_write_args_info *conf = wn->conf;
        char *filename;
+       int ret;
 
        if (conf->filename_given)
                filename = conf->filename_arg;
        else
                filename = random_filename();
        wn->private_data = pfwd;
-       pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+       ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
        if (!conf->filename_given)
                free(filename);
-       if (pfwd->fd >= 0)
+       if (ret < 0)
+               goto out;
+       pfwd->fd = ret;
+       ret = mark_fd_blocking(pfwd->fd);
+       if (ret >= 0)
                return 1;
+       close(pfwd->fd);
+out:
        free(pfwd);
-       return -E_FW_OPEN;
+       return ret;
 }
 
-static int file_write_pre_select(struct sched *s, struct writer_node *wn)
+static void file_write_pre_select(struct sched *s, struct task *t)
 {
+       struct writer_node *wn = container_of(t, struct writer_node, task);
        struct private_file_write_data *pfwd = wn->private_data;
-       struct writer_node_group *wng = wn->wng;
+       int ret;
 
-       pfwd->check_fd = 0;
-       if (pfwd->fd <= 0)
-               return -E_FW_NO_FILE;
-       if (!*wng->loaded)
-               return 1;
-       para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
-       pfwd->check_fd = 1;
-       return 1;
+       t->error = 0;
+       ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+       if (ret > 0)
+               para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
+       else if (ret < 0)
+               sched_min_delay(s);
 }
 
-static int file_write_post_select(struct sched *s, struct writer_node *wn)
+static void file_write_close(struct writer_node *wn)
 {
        struct private_file_write_data *pfwd = wn->private_data;
-       struct writer_node_group *wng = wn->wng;
-       int ret;
 
-       if (!pfwd->check_fd)
-               return 1;
-       if (*wng->loaded <= wn->written)
-               return 1;
-       if (!FD_ISSET(pfwd->fd, &s->wfds))
-               return 1;
-//     PARA_INFO_LOG("writing %zd\n", *wng->loaded);
-       ret = write(pfwd->fd, *wng->bufp + wn->written,
-               *wng->loaded - wn->written);
-       if (ret < 0)
-               return -E_FW_WRITE;
-       wn->written += ret;
-       return 1;
+       close(pfwd->fd);
+       free(pfwd);
 }
 
-static void file_write_close(struct writer_node *wn)
+static void file_write_post_select(__a_unused struct sched *s,
+               struct task *t)
 {
+       struct writer_node *wn = container_of(t, struct writer_node, task);
        struct private_file_write_data *pfwd = wn->private_data;
-       close(pfwd->fd);
-       free(pfwd);
+       struct btr_node *btrn = wn->btrn;
+       int ret;
+       char *buf;
+       size_t bytes;
+
+       t->error = 0;
+       ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+       if (ret <= 0)
+               goto out;
+       if (!FD_ISSET(pfwd->fd, &s->wfds))
+               return;
+       bytes = btr_next_buffer(btrn, &buf);
+       assert(bytes > 0);
+       //PARA_INFO_LOG("writing %zu\n", bytes);
+       ret = write(pfwd->fd, buf, bytes);
+       if (ret < 0)
+               goto out;
+       btr_consume(btrn, ret);
+out:
+       if (ret < 0)
+               btr_remove_node(btrn);
+       t->error = ret;
 }
 
 __malloc static void *file_write_parse_config(const char *options)
@@ -126,6 +142,11 @@ __malloc static void *file_write_parse_config(const char *options)
        return NULL;
 }
 
+static void file_write_free_config(void *conf)
+{
+       file_cmdline_parser_free(conf);
+}
+
 /** the init function of the file writer */
 void file_write_init(struct writer *w)
 {
@@ -136,6 +157,7 @@ void file_write_init(struct writer *w)
        w->pre_select = file_write_pre_select;
        w->post_select = file_write_post_select;
        w->parse_config = file_write_parse_config;
+       w->free_config = file_write_free_config;
        w->close = file_write_close;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {