X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=97bdafd3d617602f7afd745ba0371477ff046281;hp=a12867d5d24830e0b9b2050aff957a42eff3cbf0;hb=69a294cd641c623db61f46ee86901845789a1c7b;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9

diff --git a/file_write.c b/file_write.c
index a12867d5..97bdafd3 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <sys/time.h>
 
 #include "para.h"
 #include "list.h"
@@ -38,10 +37,8 @@ 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);
+	srandom(clock_get_realtime(NULL)->tv_usec);
 	result = make_message("%s/.paraslash/%08lu", home,
 		para_random(99999999));
 	free(home);
@@ -79,7 +76,7 @@ out:
 
 static void file_write_pre_select(struct sched *s, struct task *t)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_file_write_data *pfwd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -100,10 +97,10 @@ static void file_write_close(struct writer_node *wn)
 	free(pfwd);
 }
 
-static void file_write_post_select(__a_unused struct sched *s,
+static int file_write_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_file_write_data *pfwd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	int ret;
@@ -121,18 +118,18 @@ static void file_write_post_select(__a_unused struct sched *s,
 		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(&wn->btrn);
-	t->error = ret;
+	return ret;
 }
 
 __malloc static void *file_write_parse_config_or_die(int argc, char **argv)
@@ -160,9 +157,6 @@ void file_write_init(struct writer *w)
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;
-	w->help = (struct ggo_help) {
-		.short_help = file_write_args_info_help,
-		.detailed_help = file_write_args_info_detailed_help
-	};
+	w->help = (struct ggo_help)DEFINE_GGO_HELP(file_write);
 	file_write_cmdline_parser_free(&dummy);
 }