X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=4495bf007c4d9965f294bb54027721dbaaf126c9;hp=1c534ae169a8082b0e2712e01af1b5ec3bb90abd;hb=6cfcbbc058624e76e2cbd503513c60aa2c8607dc;hpb=732bf143e456df7fc2e845884fbbdfdaf3fafebc

diff --git a/file_write.c b/file_write.c
index 1c534ae1..4495bf00 100644
--- a/file_write.c
+++ b/file_write.c
@@ -6,26 +6,28 @@
 
 /** \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"
 #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;
 };
 
 /*
@@ -69,47 +71,57 @@ static int file_write_open(struct writer_node *wn)
 	return -E_FW_OPEN;
 }
 
-static int file_write_pre_select(struct sched *s, struct writer_node *wn)
+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;
-	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) {
+		s->timeout.tv_sec = 0;
+		s->timeout.tv_usec = 1;
+	}
 }
 
-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_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;
-	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)
@@ -125,6 +137,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)
 {
@@ -132,13 +149,15 @@ 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->post_select = file_write_post_select;
+	w->pre_select_btr = file_write_pre_select_btr;
+	w->post_select_btr = file_write_post_select_btr;
 	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) {
 		.short_help = file_write_args_info_help,
 		.detailed_help = file_write_args_info_detailed_help
 	};
+	file_cmdline_parser_free(&dummy);
 }