Introduce btr_node_status() and add btr support to the file writer.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 92777d7ddc4af81b173b5017559af6ea1a1af407..a9635ca2d558c3c541aca0c73bde435f6ef02acb 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -6,14 +6,19 @@
 
 /** \file file_write.c simple output plugin for testing purposes */
 
+#include <regex.h>
 #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"
@@ -27,20 +32,37 @@ struct private_file_write_data {
        int check_fd;
 };
 
+/*
+ * Get a random filename.
+ *
+ * This is by no means a secure way to create temporary files in a hostile
+ * directory like \p /tmp. However, we use it only for creating temp files in
+ * ~/.paraslash, for which it is OK. Result must be freed by the caller.
+ */
+__must_check __malloc static char *random_filename(void)
+{
+       char *result, *home = para_homedir();
+       struct timeval tv;
+
+       gettimeofday(&tv, NULL);
+       srandom(tv.tv_usec);
+       result = make_message("%s/.paraslash/%08lu", home,
+               para_random(99999999));
+       free(home);
+       return result;
+}
+
 static int file_write_open(struct writer_node *wn)
 {
        struct private_file_write_data *pfwd = para_calloc(
                sizeof(struct private_file_write_data));
        struct file_write_args_info *conf = wn->conf;
        char *filename;
+
        if (conf->filename_given)
                filename = conf->filename_arg;
-       else {
-               char *tmp = para_tmpname(), *home = para_homedir();
-               filename = make_message("%s/.paraslash/%s", home, tmp);
-               free(home);
-               free(tmp);
-       }
+       else
+               filename = random_filename();
        wn->private_data = pfwd;
        pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
        if (!conf->filename_given)
@@ -66,6 +88,25 @@ static int file_write_pre_select(struct sched *s, struct writer_node *wn)
        return 1;
 }
 
+static void file_write_pre_select_btr(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;
+       int ret;
+
+       t->error = 0;
+       pfwd->check_fd = 0;
+       ret = btr_node_status(wn->btrn, wn->min_iqs);
+       if (ret >= 0) {
+               para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
+               pfwd->check_fd = 1;
+       }
+       if (ret != 0) {
+               s->timeout.tv_sec = 0;
+               s->timeout.tv_usec = 1;
+       }
+}
+
 static int file_write_post_select(struct sched *s, struct writer_node *wn)
 {
        struct private_file_write_data *pfwd = wn->private_data;
@@ -90,10 +131,45 @@ 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;
+
        close(pfwd->fd);
+       file_cmdline_parser_free(wn->conf);
        free(pfwd);
 }
 
+static void file_write_post_select_btr(__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;
+       struct btr_node *btrn = wn->btrn;
+       int ret;
+       char *buf;
+       size_t bytes;
+
+       t->error = 0;
+       ret = btr_node_status(btrn, wn->min_iqs);
+       if (ret == 0)
+               return;
+       if (ret < 0)
+               goto err;
+       if (!pfwd->check_fd)
+               return;
+       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 err;
+       btr_consume(btrn, ret);
+       return;
+err:
+       assert(ret < 0);
+       t->error = ret;
+}
+
 __malloc static void *file_write_parse_config(const char *options)
 {
        struct file_write_args_info *conf
@@ -115,7 +191,9 @@ void file_write_init(struct writer *w)
        file_cmdline_parser_init(&dummy);
        w->open = file_write_open;
        w->pre_select = file_write_pre_select;
+       w->pre_select_btr = file_write_pre_select_btr;
        w->post_select = file_write_post_select;
+       w->post_select_btr = file_write_post_select_btr;
        w->parse_config = file_write_parse_config;
        w->close = file_write_close;
        w->shutdown = NULL; /* nothing to do */
@@ -123,4 +201,5 @@ void file_write_init(struct writer *w)
                .short_help = file_write_args_info_help,
                .detailed_help = file_write_args_info_detailed_help
        };
+       file_cmdline_parser_free(&dummy);
 }