X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=a12867d5d24830e0b9b2050aff957a42eff3cbf0;hp=4a4dc66e52d61b2a5e632bbadd67f26a5f42ed27;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=bb991c66000ea867d0fcbd692ffdc5473eb785fb

diff --git a/file_write.c b/file_write.c
index 4a4dc66e..a12867d5 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,9 +8,7 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -50,19 +48,17 @@ __must_check __malloc static char *random_filename(void)
 	return result;
 }
 
-static int file_write_open(struct writer_node *wn)
+static int prepare_output_file(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;
 	int ret;
+	struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
 
 	if (conf->filename_given)
 		filename = conf->filename_arg;
 	else
 		filename = random_filename();
-	wn->private_data = pfwd;
 	ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
 	if (!conf->filename_given)
 		free(filename);
@@ -70,8 +66,11 @@ static int file_write_open(struct writer_node *wn)
 		goto out;
 	pfwd->fd = ret;
 	ret = mark_fd_blocking(pfwd->fd);
-	if (ret >= 0)
-		return 1;
+	if (ret < 0)
+		goto out_close;
+	wn->private_data = pfwd;
+	return 1;
+out_close:
 	close(pfwd->fd);
 out:
 	free(pfwd);
@@ -82,20 +81,21 @@ 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;
-	int ret;
+	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	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);
+	if (ret == 0)
+		return;
+	if (ret < 0 || !pfwd)
+		return sched_min_delay(s);
+	para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
 }
 
 static void file_write_close(struct writer_node *wn)
 {
 	struct private_file_write_data *pfwd = wn->private_data;
 
+	if (!pfwd)
+		return;
 	close(pfwd->fd);
 	free(pfwd);
 }
@@ -110,10 +110,16 @@ static void file_write_post_select(__a_unused struct sched *s,
 	char *buf;
 	size_t bytes;
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 	if (ret <= 0)
 		goto out;
+	if (!pfwd) {
+		ret = prepare_output_file(wn);
+		goto out;
+	}
 	if (!FD_ISSET(pfwd->fd, &s->wfds))
 		return;
 	bytes = btr_next_buffer(btrn, &buf);
@@ -125,22 +131,22 @@ static void file_write_post_select(__a_unused struct sched *s,
 	btr_consume(btrn, ret);
 out:
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&wn->btrn);
 	t->error = ret;
 }
 
-__malloc static void *file_write_parse_config_or_die(const char *options)
+__malloc static void *file_write_parse_config_or_die(int argc, char **argv)
 {
 	struct file_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	file_cmdline_parser_string(options, conf, "file_write");
+	file_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void file_write_free_config(void *conf)
 {
-	file_cmdline_parser_free(conf);
+	file_write_cmdline_parser_free(conf);
 }
 
 /** the init function of the file writer */
@@ -148,17 +154,15 @@ void file_write_init(struct writer *w)
 {
 	struct file_write_args_info dummy;
 
-	file_cmdline_parser_init(&dummy);
-	w->open = file_write_open;
+	file_write_cmdline_parser_init(&dummy);
 	w->pre_select = file_write_pre_select;
 	w->post_select = file_write_post_select;
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	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);
+	file_write_cmdline_parser_free(&dummy);
 }