dccp_recv: Use para_readv() instead of recv_bin_buffer().

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 85842248a97999b60824a267ed1180e0a8dafe0c..e0d3e23481f9b2a6b3390ffa9397257b1e095b0d 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -28,9 +28,6 @@
 
 #include "dccp_recv.cmdline.h"
 
-/** the size of the output buffer */
-#define DCCP_BUFSIZE 40960
-
 /**
  * data specific to the dccp receiver
  *
@@ -50,8 +47,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 
        if (pdd && pdd->fd > 0)
                close(pdd->fd);
-       free(rn->buf);
-       rn->buf = NULL;
+       btr_pool_free(pdd->btrp);
        free(rn->private_data);
        rn->private_data = NULL;
 }
@@ -80,7 +76,6 @@ static int dccp_recv_open(struct receiver_node *rn)
        ret = mark_fd_nonblocking(fd);
        if (ret < 0)
                goto err;
-       rn->buf = para_calloc(DCCP_BUFSIZE);
        rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
        pdd->btrp = btr_pool_new("dccp_recv", 320 * 1024);
        pdd->fd = fd;
@@ -105,10 +100,9 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_dccp_recv_data *pdd = rn->private_data;
 
-       if (rn->btrn)
-               if (generic_recv_pre_select(s, t) <= 0)
-                       return;
        t->error = 0;
+       if (generic_recv_pre_select(s, t) <= 0)
+               return;
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -117,62 +111,41 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_dccp_recv_data *pdd = rn->private_data;
        struct btr_node *btrn = rn->btrn;
-       int ret;
-
-       if (btrn) {
-               ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-               if (ret < 0)
-                       goto err;
-               if (ret == 0)
-                       return;
-       } else {
-               if (rn->output_error && *rn->output_error < 0) {
-                       t->error = *rn->output_error;
-                       return;
-               }
-       }
+       struct iovec iov[2];
+       int ret, iovcnt;
+
+       ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
+               return;
        if (!FD_ISSET(pdd->fd, &s->rfds))
                return; /* nothing to do */
-       if (rn->loaded >= DCCP_BUFSIZE) {
-               t->error = -E_DCCP_OVERRUN;
-               return;
-       }
-       if (btrn) {
-               char *buf;
-               size_t sz;
-
-               sz = btr_pool_get_buffer(pdd->btrp, &buf);
-               ret = -E_DCCP_OVERRUN;
-               if (sz == 0)
-                       goto err;
-               //buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
-               //sz = HTTP_RECV_READ_BUF_SIZE;
-               ret = recv_bin_buffer(pdd->fd, buf, sz);
-               if (ret == 0)
-                       ret = -E_RECV_EOF;
-               if (ret < 0)
-                       goto err;
+       iovcnt = btr_pool_get_buffers(pdd->btrp, iov);
+       ret = -E_DCCP_OVERRUN;
+       if (iovcnt == 0)
+               goto err;
+       ret = para_readv(pdd->fd, iov, iovcnt);
+       if (ret == 0)
+               ret = -E_RECV_EOF;
+       if (ret < 0)
+               goto err;
+       if (ret <= iov[0].iov_len) /* only the first buffer was filled */
                btr_add_output_pool(pdd->btrp, ret, btrn);
-               return;
-       }
-       t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
-               DCCP_BUFSIZE - rn->loaded);
-       if (t->error > 0) {
-               rn->loaded += t->error;
-               return;
+       else { /* both buffers contain data */
+               btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn);
+               btr_add_output_pool(pdd->btrp, ret - iov[0].iov_len, btrn);
        }
-       if (!t->error)
-               t->error = -E_RECV_EOF;
        return;
 err:
-       if (btrn)
-               btr_remove_node(rn->btrn);
+       btr_remove_node(rn->btrn);
        t->error = ret;
 }
 
 static void dccp_recv_free_config(void *conf)
 {
        dccp_recv_cmdline_parser_free(conf);
+       free(conf);
 }
 
 /**