X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=0c5a3abf3fd58546ea187fee33516bd761973731;hp=f9782985d113d390c70300d099546066203f188d;hb=d17f43b13cffb458a9931e878086e3d2caa28d25;hpb=383d1bfb5084ea5a475e408d3cc9d2e2a3de5b88

diff --git a/udp_recv.c b/udp_recv.c
index f9782985..0c5a3abf 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -18,10 +18,10 @@
 #include "ggo.h"
 #include "recv.h"
 #include "udp_recv.cmdline.h"
-#include "audiod.h"
 #include "string.h"
 #include "net.h"
 #include "fd.h"
+#include "buffer_tree.h"
 
 /** The size of the receiver node buffer. */
 #define UDP_RECV_CHUNK_SIZE (128 * 1024)
@@ -33,13 +33,20 @@
 struct private_udp_recv_data {
 	/** The socket file descriptor. */
 	int fd;
+	struct btr_pool *btrp;
 };
 
 static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_udp_recv_data *purd = rn->private_data;
+	int ret;
 
+	if (rn->btrn) {
+		ret = generic_recv_pre_select(s, t);
+		if (ret <= 0)
+			return;
+	}
 	para_fd_set(purd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -59,7 +66,7 @@ static int add_rn_output(struct receiver_node *rn, char *buf, size_t len)
 	return 1;
 }
 
-static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
+static void udp_recv_post_select_nobtr(__a_unused struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_udp_recv_data *purd = rn->private_data;
@@ -94,6 +101,58 @@ success:
 	t->error = 1;
 }
 
+static void udp_recv_post_select_btr(__a_unused struct sched *s, struct task *t)
+{
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct private_udp_recv_data *purd = rn->private_data;
+	struct btr_node *btrn = rn->btrn;
+	int ret;
+	char *buf = NULL;
+	size_t packet_size, bufsize;
+
+	t->error = 0;
+	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+	if (ret < 0)
+		goto err;
+	if (ret == 0)
+		return;
+	if (!FD_ISSET(purd->fd, &s->rfds))
+		return;
+	bufsize = btr_pool_get_buffer(purd->btrp, &buf);
+	ret = -E_UDP_OVERRUN;
+	if (bufsize == 0)
+		goto err;
+	ret = recv_bin_buffer(purd->fd, buf, bufsize);
+	if (ret == 0)
+		ret = -E_RECV_EOF;
+	if (ret < 0)
+		goto err;
+	packet_size = ret;
+	if (packet_size >= FEC_EOF_PACKET_LEN) {
+		if (!memcmp(buf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN)) {
+			PARA_CRIT_LOG("%p: eof\n", rn);
+			ret = -E_RECV_EOF;
+			goto err;
+		}
+	}
+	btr_pool_allocate(purd->btrp, packet_size);
+	btr_add_output_pool(purd->btrp, buf, packet_size, btrn);
+	return;
+err:
+	btr_remove_node(btrn);
+	t->error = ret;
+	close(purd->fd);
+	purd->fd = -1;
+}
+
+static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
+{
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	if (rn->btrn)
+		return udp_recv_post_select_btr(s, t);
+	udp_recv_post_select_nobtr(s, t);
+}
+
 static void udp_shutdown(void)
 {
 	return;
@@ -105,6 +164,8 @@ static void udp_recv_close(struct receiver_node *rn)
 
 	if (purd->fd >= 0)
 		close(purd->fd);
+	PARA_CRIT_LOG("%p: close\n", rn);
+	btr_pool_free(purd->btrp);
 	free(rn->private_data);
 	free(rn->buf);
 }
@@ -206,10 +267,13 @@ static int udp_recv_open(struct receiver_node *rn)
 	}
 
 	ret = mark_fd_nonblocking(purd->fd);
-	if (ret < 0)
+	if (ret < 0) {
+		close(purd->fd);
 		goto err;
-	PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
+	}
+	PARA_CRIT_LOG("rn %p: receiving from %s:%d, fd=%d\n", rn, c->host_arg,
 		c->port_arg, purd->fd);
+	purd->btrp = btr_pool_new(320 * 1024);
 	return purd->fd;
 err:
 	free(rn->private_data);
@@ -217,6 +281,11 @@ err:
 	return ret;
 }
 
+static void udp_recv_free_config(void *conf)
+{
+	udp_recv_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the udp receiver.
  *
@@ -235,6 +304,7 @@ void udp_recv_init(struct receiver *r)
 	r->pre_select = udp_recv_pre_select;
 	r->post_select = udp_recv_post_select;
 	r->parse_config = udp_recv_parse_config;
+	r->free_config = udp_recv_free_config;
 	r->help = (struct ggo_help) {
 		.short_help = udp_recv_args_info_help,
 		.detailed_help = udp_recv_args_info_detailed_help