Implement chunk queing for the udp sender.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index 8f5d796bee64ba602a59c0b066b6aa0c2c98f2fb..1408ae7f251bc4fe0c4e79e67e00dc7914d0b91b 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -25,7 +25,8 @@
 #include "net.h"
 #include "fd.h"
 #include "sched.h"
-
+#include "close_on_fork.h"
+#include "chunk_queue.h"
 
 /** Convert in_addr to ascii. */
 #define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
@@ -40,17 +41,29 @@ struct udp_target {
        int port;
        /** The socket fd. */
        int fd;
+       /** The list of queued chunks for this fd. */
+       struct chunk_queue *cq;
 };
 
 static struct list_head targets;
 static int sender_status;
 
+static void udp_close_target(struct udp_target *ut)
+{
+       if (ut->fd < 0)
+               return;
+       close(ut->fd);
+       del_close_on_fork_list(ut->fd);
+       cq_destroy(ut->cq);
+       ut->cq = NULL;
+       ut->fd = -1;
+}
+
 static void udp_delete_target(struct udp_target *ut, const char *msg)
 {
        PARA_NOTICE_LOG("deleting %s:%d (%s) from list\n", TARGET_ADDR(ut),
                ut->port, msg);
-       if (ut->fd >= 0)
-               close(ut->fd);
+       udp_close_target(ut);
        list_del(&ut->node);
        free(ut);
 }
@@ -61,21 +74,59 @@ static void udp_send_buf(char *buf, size_t len)
        int ret;
 
        list_for_each_entry_safe(ut, tmp, &targets, node) {
-               size_t written = len;
                if (ut->fd < 0)
                        continue;
-               ret = write_all(ut->fd, buf, &written);
-               if (ret < 0)
-                       return udp_delete_target(ut, "send error");
-               if (written != len)
-                       PARA_WARNING_LOG("short write %zu/%zu\n", written, len);
+               ret = send_queued_chunks(ut->fd, ut->cq, 0);
+               if (ret < 0) {
+                       udp_delete_target(ut, para_strerror(-ret));
+                       continue;
+               }
+               if (!len)
+                       continue;
+               if (!ret) { /* still data left in the queue */
+                       ret = cq_enqueue(ut->cq, buf, len);
+                       if (ret < 0) {
+                               udp_delete_target(ut, para_strerror(-ret));
+                               continue;
+                       }
+               }
+               ret = write_nonblock(ut->fd, buf, len, 0);
+               if (ret < 0) {
+                       udp_delete_target(ut, para_strerror(-ret));
+                       continue;
+               }
+               if (ret != len) {
+                       ret = cq_enqueue(ut->cq, buf + ret, len - ret);
+                       if (ret < 0) {
+                               udp_delete_target(ut, para_strerror(-ret));
+                               continue;
+                       }
+               }
        }
 }
 
-static void udp_init_session(struct udp_target *ut)
+#define UDP_CQ_BYTES 40000
+
+static int udp_init_session(struct udp_target *ut)
 {
+       int ret;
+
+       if (ut->fd >= 0) /* nothing to do */
+               return 0;
        PARA_NOTICE_LOG("sending to udp %s:%d\n", TARGET_ADDR(ut), ut->port);
-       ut->fd = create_udp_send_socket(TARGET_ADDR(ut), ut->port, 10);
+       ret = create_udp_send_socket(TARGET_ADDR(ut), ut->port,
+               conf.udp_ttl_arg);
+       if (ret < 0)
+               return ret;
+       ut->fd = ret;
+       ret = mark_fd_nonblocking(ut->fd);
+       if (ret < 0) {
+               close(ut->fd);
+               return ret;
+       }
+       add_close_on_fork_list(ut->fd);
+       ut->cq = cq_new(UDP_CQ_BYTES);
+       return 1;
 }
 
 static void udp_shutdown_targets(void)
@@ -84,12 +135,12 @@ static void udp_shutdown_targets(void)
        struct udp_target *ut, *tmp;
 
        udp_write_packet_type(buf, UDP_EOF_PACKET);
+       udp_write_magic(buf);
        list_for_each_entry_safe(ut, tmp, &targets, node) {
                if (ut->fd < 0)
                        continue;
-               PARA_INFO_LOG("sending eof to udp target %s:%d\n",
-                       TARGET_ADDR(ut), ut->port);
                write(ut->fd, buf, UDP_AUDIO_HEADER_LEN);
+               udp_close_target(ut);
        }
 }
 
@@ -113,7 +164,8 @@ static void udp_send(long unsigned current_chunk, __a_unused long unsigned chunk
 {
        struct udp_target *ut, *tmp;
        size_t sendbuf_len;
-       int packet_type = UDP_DATA_PACKET;
+       uint8_t packet_type = UDP_DATA_PACKET;
+       int ret;
        char *sendbuf;
        struct timeval *chunk_tv;
        uint8_t stream_type = header_len? UDP_HEADER_STREAM : UDP_PLAIN_STREAM;
@@ -130,8 +182,9 @@ static void udp_send(long unsigned current_chunk, __a_unused long unsigned chunk
        if (list_empty(&targets))
                return;
        list_for_each_entry_safe(ut, tmp, &targets, node) {
-               if (ut->fd < 0)
-                       udp_init_session(ut);
+               ret = udp_init_session(ut);
+               if (ret < 0)
+                       udp_delete_target(ut, para_strerror(-ret));
        }
        if (!need_extra_header(current_chunk))
                header_len = 0;