X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=3b1c6917bda57f9a5a810b713bb41261dd1ae045;hp=aaccb06ac77fcd7bded8ffc46c300039227eabe1;hb=b564291f5f15b5bd4a319ea59875023551a705cc;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/recv.c b/recv.c
index aaccb06a..3b1c6917 100644
--- a/recv.c
+++ b/recv.c
@@ -15,18 +15,21 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
-#include "gcc-compat.h"
 #include "para.h"
 
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "recv.cmdline.h"
+#include "fd.h"
 #include "error.h"
+#include "stdout.h"
 
-struct gengetopt_args_info conf;
+struct recv_args_info conf;
 
 INIT_RECV_ERRLISTS;
 
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 
@@ -42,25 +45,37 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 {
 	int i;
 
-	if (cmdline_parser(argc, argv, &conf))
+	if (recv_cmdline_parser(argc, argv, &conf))
 		return NULL;
 	if (conf.list_receivers_given) {
 		printf("available receivers: ");
 		for (i = 0; receivers[i].name; i++)
 			printf("%s%s", i? " " : "", receivers[i].name);
-		printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+		printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+			"for help on <receivername>.\n");
 		exit(EXIT_SUCCESS);
 	}
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
+void rn_event_handler(struct task *t)
+{
+	struct receiver_node *rn = t->private_data;
+	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	rn->eof = 1;
+	unregister_task(t);
+}
+
 int main(int argc, char *argv[])
 {
-	int ret, eof = 0, max, r_opened = 0, receiver_num;
-	struct timeval timeout;
+	int ret, r_opened = 0, receiver_num;
 	struct	receiver *r = NULL;
-	fd_set rfds, wfds;
 	struct receiver_node rn;
+	struct stdout_task sot;
+	struct sched s;
+
+	s.default_timeout.tv_sec = 1;
+	s.default_timeout.tv_usec = 0;
 
 	memset(&rn, 0, sizeof(struct receiver_node));
 	for (ret = 0; receivers[ret].name; ret++)
@@ -77,52 +92,28 @@ int main(int argc, char *argv[])
 	if (ret < 0)
 		goto out;
 	r_opened = 1;
-recv:
-	FD_ZERO(&rfds);
-	FD_ZERO(&wfds);
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 1000 * 1000;
-	max = -1;
-	ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-	max = MAX(max, ret);
 
-	PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
-	ret = select(max + 1, &rfds, &wfds, NULL, &timeout);
-	if (ret < 0) {
-		if (errno == EINTR || errno == EAGAIN)
-			goto recv;
-		ret = -E_RECV_SELECT;
-		goto out;
-	}
-	ret = r->post_select(&rn, ret, &rfds, &wfds);
-	if (ret < 0)
-		goto out;
-	if (!ret)
-		eof = 1;
-	if (!rn.loaded) {
-		if (eof)
-			goto out;
-		goto recv;
-	}
-	ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-	PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
-	if (ret < 0) {
-		ret = -E_WRITE_STDOUT;
-		goto out;
-	}
-	if (ret != rn.loaded) {
-		PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
-		memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
-	}
-	rn.loaded -= ret;
-	if (rn.loaded || !eof)
-		goto recv;
+	stdout_set_defaults(&sot);
+	sot.buf = rn.buf;
+	sot.loaded = &rn.loaded;
+	sot.input_eof = &rn.eof;
+	register_task(&sot.task);
+
+	rn.task.private_data = &rn;
+	rn.task.pre_select = r->pre_select;
+	rn.task.post_select = r->post_select;
+	rn.task.event_handler = rn_event_handler;
+	sprintf(rn.task.status, "receiver node");
+	register_task(&rn.task);
+
+
+	ret = sched(&s);
 out:
 	if (r_opened)
 		r->close(&rn);
 	if (r)
 		r->shutdown();
 	if (ret < 0)
-		PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	return ret;
 }