X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=7762d7940754a3b044917107205d34c610c65cde;hp=4b6a5efe6ea8af1c2f14732b5c2030850b02c9ff;hb=877c179023ba45d481e9d89ac82fb0856617587b;hpb=12ccf687f664e92de34b9fbb3164c9495e2cbdff

diff --git a/file_write.c b/file_write.c
index 4b6a5efe..7762d794 100644
--- 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.
  */
@@ -24,12 +24,10 @@
 #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;
 };
 
 /*
@@ -52,54 +50,59 @@ __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;
-	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)
-		return 1;
+	if (ret < 0)
+		goto out;
+	pfwd->fd = ret;
+	ret = mark_fd_blocking(pfwd->fd);
+	if (ret < 0)
+		goto out_close;
+	wn->private_data = pfwd;
+	return 1;
+out_close:
+	close(pfwd->fd);
+out:
 	free(pfwd);
-	return -E_FW_OPEN;
+	return ret;
 }
 
-static void file_write_pre_select_btr(struct sched *s, struct task *t)
+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;
-	pfwd->check_fd = 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);
-		pfwd->check_fd = 1;
-	} else if (ret < 0) {
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
-	}
+	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);
 }
 
-static void file_write_post_select_btr(__a_unused struct sched *s,
+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);
@@ -111,12 +114,12 @@ static void file_write_post_select_btr(__a_unused struct sched *s,
 
 	t->error = 0;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
-	if (ret == 0)
-		return;
-	if (ret < 0)
-		goto err;
-	if (!pfwd->check_fd)
-		return;
+	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);
@@ -124,26 +127,21 @@ static void file_write_post_select_btr(__a_unused struct sched *s,
 	//PARA_INFO_LOG("writing %zu\n", bytes);
 	ret = write(pfwd->fd, buf, bytes);
 	if (ret < 0)
-		goto err;
+		goto out;
 	btr_consume(btrn, ret);
-	return;
-err:
-	assert(ret < 0);
+out:
+	if (ret < 0)
+		btr_remove_node(btrn);
 	t->error = ret;
-	btr_remove_node(btrn);
 }
 
-__malloc static void *file_write_parse_config(const char *options)
+__malloc static void *file_write_parse_config_or_die(const char *options)
 {
-	struct file_write_args_info *conf
-		= para_calloc(sizeof(struct file_write_args_info));
-	int ret = file_cmdline_parser_string(options, conf, "file_write");
-
-	PARA_INFO_LOG("conf->filename_given: %d\n", conf->filename_given);
-	if (!ret)
-		return conf;
-	free(conf);
-	return NULL;
+	struct file_write_args_info *conf = para_calloc(sizeof(*conf));
+
+	/* exits on errors */
+	file_cmdline_parser_string(options, conf, "file_write");
+	return conf;
 }
 
 static void file_write_free_config(void *conf)
@@ -157,10 +155,9 @@ 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_btr = file_write_pre_select_btr;
-	w->post_select_btr = file_write_post_select_btr;
-	w->parse_config = file_write_parse_config;
+	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 */