X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=file_write.c;h=2a53499abf532c05717afe5351b6ad72c3730b39;hb=2f813fc9eb96531dde5c907b50b45d381456bb4e;hp=7a24b3ac6b78e9d56b1f194c0479c3584cabbfb3;hpb=c282c836791cedf57c128555af90af37c7c01c05;p=paraslash.git

diff --git a/file_write.c b/file_write.c
index 7a24b3ac..2a53499a 100644
--- a/file_write.c
+++ b/file_write.c
@@ -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;
 };
 
 /*
@@ -73,21 +71,6 @@ 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)
-{
-	struct private_file_write_data *pfwd = wn->private_data;
-	struct writer_node_group *wng = wn->wng;
-
-	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;
-}
-
 static void file_write_pre_select_btr(struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -95,36 +78,11 @@ static void file_write_pre_select_btr(struct sched *s, struct task *t)
 	int ret;
 
 	t->error = 0;
-	pfwd->check_fd = 0;
 	ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
-	if (ret > 0) {
+	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;
-	}
-}
-
-static int file_write_post_select(struct sched *s, 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;
+	else if (ret < 0)
+		sched_min_delay(s);
 }
 
 static void file_write_close(struct writer_node *wn)
@@ -132,7 +90,6 @@ 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);
 }
 
@@ -148,12 +105,8 @@ 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 (!FD_ISSET(pfwd->fd, &s->wfds))
 		return;
 	bytes = btr_next_buffer(btrn, &buf);
@@ -161,11 +114,11 @@ 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;
 }
 
@@ -194,9 +147,7 @@ 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->free_config = file_write_free_config;