X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=41298a74317b43969595339f08cedd2783753ad2;hp=13008c2dd4dcce7850b7fdd508dea827790d1787;hb=4dc05b2d870c81077263920fcb51548839664a0d;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7

diff --git a/file_write.c b/file_write.c
index 13008c2d..41298a74 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 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);
@@ -100,7 +97,7 @@ 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);
@@ -121,7 +118,7 @@ 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);
@@ -132,7 +129,7 @@ static void file_write_post_select(__a_unused struct sched *s,
 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)
@@ -156,7 +153,8 @@ void file_write_init(struct writer *w)
 
 	file_write_cmdline_parser_init(&dummy);
 	w->pre_select = file_write_pre_select;
-	w->post_select = file_write_post_select;
+	w->new_post_select = file_write_post_select;
+	w->post_select = NULL;
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;