X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=8cafbb687b8498ff6b9db43a1129676363b3db20;hp=7497dfaa0f00e6be8c8856a2659bcaaa65938100;hb=75d545612d8fb51b7e6b2f8a7349b54502004cfa;hpb=7d037b0b440e1913776650dbe35dbac6d5cfb5d5

diff --git a/file_write.c b/file_write.c
index 7497dfaa..8cafbb68 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-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -50,21 +50,12 @@ __must_check __malloc static char *random_filename(void)
 	return result;
 }
 
-static int file_write_open(struct writer_node *wn)
-{
-	struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
-
-	wn->private_data = pfwd;
-	pfwd->fd = -1;
-	return 0;
-}
-
 static int prepare_output_file(struct writer_node *wn)
 {
 	struct file_write_args_info *conf = wn->conf;
-	struct private_file_write_data *pfwd = wn->private_data;
 	char *filename;
 	int ret;
+	struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
 
 	if (conf->filename_given)
 		filename = conf->filename_arg;
@@ -77,8 +68,11 @@ static int prepare_output_file(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);
@@ -89,22 +83,22 @@ 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 && pfwd->fd >= 0)
-		para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
-	else if (ret != 0) /* error or bos and fd not yet open */
-		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->fd >= 0)
-		close(pfwd->fd);
+	if (!pfwd)
+		return;
+	close(pfwd->fd);
 	free(pfwd);
 }
 
@@ -122,10 +116,9 @@ static void file_write_post_select(__a_unused struct sched *s,
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 	if (ret <= 0)
 		goto out;
-	if (pfwd->fd < 0) {
+	if (!pfwd) {
 		ret = prepare_output_file(wn);
-		if (ret < 0)
-			goto out;
+		goto out;
 	}
 	if (!FD_ISSET(pfwd->fd, &s->wfds))
 		return;
@@ -162,7 +155,6 @@ void file_write_init(struct writer *w)
 	struct file_write_args_info dummy;
 
 	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->parse_config_or_die = file_write_parse_config_or_die;