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

diff --git a/file_write.c b/file_write.c
index 4495bf00..0cee535a 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.
  */
@@ -56,22 +56,29 @@ static int file_write_open(struct writer_node *wn)
 		sizeof(struct private_file_write_data));
 	struct file_write_args_info *conf = wn->conf;
 	char *filename;
+	int ret;
 
 	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)
+	if (ret < 0)
+		goto out;
+	pfwd->fd = ret;
+	ret = mark_fd_blocking(pfwd->fd);
+	if (ret >= 0)
 		return 1;
+	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;
@@ -79,12 +86,10 @@ static void file_write_pre_select_btr(struct sched *s, struct task *t)
 
 	t->error = 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);
-	} else if (ret < 0) {
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
-	}
+	else if (ret < 0)
+		sched_min_delay(s);
 }
 
 static void file_write_close(struct writer_node *wn)
@@ -95,7 +100,7 @@ static void file_write_close(struct writer_node *wn)
 	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);
@@ -149,8 +154,8 @@ void file_write_init(struct writer *w)
 
 	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->pre_select = file_write_pre_select;
+	w->post_select = file_write_post_select;
 	w->parse_config = file_write_parse_config;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;