X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=5e66607e4dba4a0595da7f8fcfeae0dba0bf3bad;hp=e6a3229e7303c459e4fa05807c17dd1aa405087e;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=2ef39ae4d1e6b0d95991d2b980621fb152211444

diff --git a/file_write.c b/file_write.c
index e6a3229e..5e66607e 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 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,9 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -40,30 +37,20 @@ struct private_file_write_data {
 __must_check __malloc static char *random_filename(void)
 {
 	char *result, *home = para_homedir();
-	struct timeval tv;
 
-	gettimeofday(&tv, NULL);
-	srandom(tv.tv_usec);
-	result = make_message("%s/.paraslash/%08lu", home,
+	srandom(clock_get_realtime(NULL)->tv_usec);
+	result = make_message("%s/.paraslash/%08ld", home,
 		para_random(99999999));
 	free(home);
 	return result;
 }
 
-static void file_write_open(struct writer_node *wn)
-{
-	struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
-
-	wn->private_data = pfwd;
-	pfwd->fd = -1;
-}
-
 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;
@@ -76,23 +63,26 @@ 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);
 	return ret;
 }
 
-static void file_write_pre_select(struct sched *s, struct task *t)
+static void file_write_pre_select(struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
 	if (ret == 0)
 		return;
-	if (ret < 0 || pfwd->fd < 0)
+	if (ret < 0 || !pfwd)
 		return sched_min_delay(s);
 	para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
 }
@@ -101,57 +91,58 @@ 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);
 }
 
-static void file_write_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int file_write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	int ret;
 	char *buf;
 	size_t bytes;
 
-	t->error = 0;
+	ret = task_get_notification(wn->task);
+	if (ret < 0)
+		goto out;
 	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;
+		return 0;
 	bytes = btr_next_buffer(btrn, &buf);
 	assert(bytes > 0);
 	//PARA_INFO_LOG("writing %zu\n", bytes);
-	ret = write(pfwd->fd, buf, bytes);
+	ret = xwrite(pfwd->fd, buf, bytes);
 	if (ret < 0)
 		goto out;
 	btr_consume(btrn, ret);
 out:
 	if (ret < 0)
-		btr_remove_node(btrn);
-	t->error = ret;
+		btr_remove_node(&wn->btrn);
+	return 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 */
@@ -159,17 +150,12 @@ 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);
+	w->help = (struct ggo_help)DEFINE_GGO_HELP(file_write);
+	file_write_cmdline_parser_free(&dummy);
 }