Move chunk_queue stuff to own files chunk_queue.[ch].
[paraslash.git] / http_send.c
index 414c375..bbf6341 100644 (file)
@@ -18,6 +18,7 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "chunk_queue.h"
 
 /** \cond convert sock_addr_in to ascii */
 #define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
@@ -43,7 +44,7 @@ enum http_status {
 };
 
 /** Clients will be kicked if there are more than that many bytes pending. */
-#define MAX_BACKLOG 40000
+#define MAX_BACKLOG 400000
 /** The list of connected clients. */
 static struct list_head clients;
 /** The whitelist/blacklist. */
@@ -64,25 +65,7 @@ struct http_client {
        /** The position of this client in the client list. */
        struct list_head node;
        /** The list of pending chunks for this client. */
-       struct list_head chunk_queue;
-       /** The number of pending bytes for this client. */
-       unsigned long cq_bytes;
-};
-
-/**
- * Describes one queued chunk of the chunk queue.
- *
- * The send function of the http sender checks each client fd for writing. If a
- * client fd is not ready, it tries to queue that chunk for this client until
- * the number of queued bytes exceeds \p MAX_BACKLOG.
- */
-struct queued_chunk {
-       /** The number of the queued chunk, -1U means header. */
-       unsigned chunk_num;
-       /** The number of bytes already sent. */
-       unsigned sent;
-       /** Position of the chunk in the chunk queue. */
-       struct list_head node;
+       struct chunk_queue *cq;
 };
 
 /**
@@ -100,18 +83,15 @@ struct access_info {
 static int server_fd = -1, numclients;
 static struct sender *self;
 
+
 static void http_shutdown_client(struct http_client *hc, const char *msg)
 {
-       struct queued_chunk *qc, *tmp;
        PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc),
                hc->fd, msg);
        numclients--;
        close(hc->fd);
        del_close_on_fork_list(hc->fd);
-       list_for_each_entry_safe(qc, tmp, &hc->chunk_queue, node) {
-               list_del(&qc->node);
-               free(qc);
-       }
+       cq_destroy(hc->cq);
        list_del(&hc->node);
        free(hc);
 }
@@ -144,61 +124,23 @@ static int http_send_err_msg(struct http_client *hc)
        return http_send_msg(hc, HTTP_ERR_MSG);
 }
 
-static int queue_chunk(struct http_client *hc, long unsigned chunk_num,
-       size_t sent)
-{
-       struct queued_chunk *qc;
-       char *buf;
-       size_t len;
-       int ret;
-
-       if (chunk_num != -1U) {
-               ret = vss_get_chunk(chunk_num, &buf, &len);
-               if (ret < 0)
-                       return ret;
-       } else
-               buf = vss_get_header(&len);
-       if (hc->cq_bytes + len > MAX_BACKLOG)
-               return -E_QUEUE;
-       qc = para_malloc(sizeof(struct queued_chunk));
-       hc->cq_bytes += len;
-       qc->chunk_num = chunk_num;
-       qc->sent = sent;
-       list_add_tail(&qc->node, &hc->chunk_queue);
-       PARA_INFO_LOG("%lu bytes queued for fd %d\n", hc->cq_bytes, hc->fd);
-       return 1;
-}
-
 static int send_queued_chunks(struct http_client *hc)
 {
-       int ret;
-       struct queued_chunk *qc, *tmp;
-
-       if (list_empty(&hc->chunk_queue))
-               return 1;
-       list_for_each_entry_safe(qc, tmp, &hc->chunk_queue, node) {
+       struct queued_chunk *qc;
+       while ((qc = cq_peek(hc->cq))) {
                char *buf;
                size_t len;
-               ret = write_ok(hc->fd);
+               int ret = write_ok(hc->fd);
                if (ret <= 0)
                        return ret? -E_WRITE_OK : 0;
-               if (qc->chunk_num != -1U) {
-                       ret = vss_get_chunk(qc->chunk_num, &buf, &len);
-                       if (ret < 0)
-                               return ret;
-               } else
-                       buf = vss_get_header(&len);
-               assert(len && len > qc->sent);
-               ret = write(hc->fd, buf + qc->sent, len - qc->sent);
+               cq_get(qc, &buf, &len);
+               ret = write(hc->fd, buf, len);
                if (ret < 0)
-                       return -1; /* FIXME */
-               hc->cq_bytes -= ret;
-               if (ret != len - qc->sent) {
-                       qc->sent += ret;
-                       return 0;
-               }
-               list_del(&qc->node);
-               free(qc);
+                       return -E_SEND_QUEUED_CHUNK;
+               cq_update(hc->cq, ret);
+               if (ret != len)
+                       return 1;
+               cq_dequeue(hc->cq);
        }
        return 1;
 }
@@ -206,7 +148,7 @@ static int send_queued_chunks(struct http_client *hc)
 static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_num,
        size_t sent)
 {
-       int ret = queue_chunk(hc, chunk_num, sent);
+       int ret = cq_enqueue(hc->cq, chunk_num, sent);
        if (ret < 0)
                http_shutdown_client(hc, "queue error");
        return ret;
@@ -242,9 +184,6 @@ static void http_send( long unsigned current_chunk,
                if (!len)
                        continue;
                if (!ret || write_ok(hc->fd) <= 0) {
-                       PARA_INFO_LOG("fd %d not ready (%lu bytes queued),"
-                               " trying to queue chunk\n", hc->fd,
-                               hc->cq_bytes);
                        queue_chunk_or_shutdown(hc, current_chunk, 0);
                        continue;
                }
@@ -336,7 +275,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                goto err_out;
        }
        hc->status = HTTP_CONNECTED;
-       INIT_LIST_HEAD(&hc->chunk_queue);
+       hc->cq = cq_new(MAX_BACKLOG);
        PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
                CLIENT_ADDR(hc), hc->fd);
        numclients++;