X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=335ad2e630598de4d98cafbb2257e5e07be144af;hp=f7db6fc8ac8b17dfb8452e93b91b0155f26cb366;hb=ef915594659eb6e0ced39759c68637647cb50c95;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99

diff --git a/dccp_recv.c b/dccp_recv.c
index f7db6fc8..335ad2e6 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -26,9 +26,12 @@
 #include "para.h"
 #include "error.h"
 #include "dccp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"
+#include "fd.h"
 
 #include "dccp_recv.cmdline.h"
 
@@ -116,35 +119,41 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 	return NULL;
 }
 
-static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds,
-		__a_unused fd_set *wfds, __a_unused struct timeval *timeout)
+static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
+	struct receiver_node *rn = t->private_data;
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	if (!pdd)
-		return -1;
-	FD_SET(pdd->fd, rfds);
-	return pdd->fd;
+	t->ret = 1;
+	para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
-static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
-		fd_set *rfds, __a_unused fd_set *wfds)
+static void dccp_recv_post_select(struct sched *s, struct task *t)
 {
-	int ret;
+	struct receiver_node *rn = t->private_data;
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
-		return 1; /* nothing to do */
+	t->ret = -E_DCCP_RECV_EOF;
+	if (rn->output_eof && *rn->output_eof)
+		goto out;
+	t->ret = 1;
+	if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
+		goto out; /* nothing to do */
+	t->ret = -E_DCCP_OVERRUN;
 	if (rn->loaded >= DCCP_BUFSIZE)
-		return -E_DCCP_OVERRUN;
-	ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+		goto out;
+	t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
 		DCCP_BUFSIZE - rn->loaded);
-	if (ret <= 0) {
-		PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof");
-		return ret;
+	if (t->ret <= 0) {
+		if (!t->ret)
+			t->ret = -E_DCCP_RECV_EOF;
+		goto out;
 	}
-	rn->loaded += ret;
-	return 1;
+	rn->loaded += t->ret;
+	return;
+out:
+	if (t->ret < 0)
+		rn->eof = 1;
 }
 
 /**