};
/** 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. */
static struct list_head access_perm_list;
+struct chunk_queue{
+ /** The list of pending chunks for this client. */
+ struct list_head q;
+ /** The number of pending bytes for this client. */
+ unsigned long num_pending;
+ unsigned long max_pending;
+};
+
/** Describes one client that connected the tcp port of the http sender. */
struct http_client {
/** The file descriptor of the 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;
+ struct chunk_queue *cq;
};
/**
static int server_fd = -1, numclients;
static struct sender *self;
-static void http_shutdown_client(struct http_client *hc, const char *msg)
+
+static int cq_enqueue(struct chunk_queue *cq, 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 (cq->num_pending + len > cq->max_pending)
+ return -E_QUEUE;
+ qc = para_malloc(sizeof(struct queued_chunk));
+ cq->num_pending += len;
+ qc->chunk_num = chunk_num;
+ qc->sent = sent;
+ list_add_tail(&qc->node, &cq->q);
+ PARA_DEBUG_LOG("%lu bytes queued for %p\n", cq->num_pending, &cq->q);
+ return 1;
+}
+
+static struct queued_chunk *cq_peek(struct chunk_queue *cq)
+{
+ if (list_empty(&cq->q))
+ return NULL;
+ return list_entry(cq->q.next, struct queued_chunk, node);
+}
+
+int cq_dequeue(struct chunk_queue *cq)
+{
+ struct queued_chunk *qc = cq_peek(cq);
+ assert(qc);
+ list_del(&qc->node);
+ free(qc);
+ return 1;
+}
+
+void cq_update(struct chunk_queue *cq, size_t sent)
+{
+ struct queued_chunk *qc = cq_peek(cq);
+ assert(qc);
+ qc->sent += sent;
+ cq->num_pending -= sent;
+}
+
+int cq_get(struct queued_chunk *qc, char **buf, size_t *len)
+{
+ int ret;
+
+ 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 > qc->sent);
+ *buf += qc->sent;
+ *len -= qc->sent;
+ return 1;
+}
+
+struct chunk_queue *cq_init(size_t max_pending)
+{
+ struct chunk_queue *cq = para_malloc(sizeof(*cq));
+ INIT_LIST_HEAD(&cq->q);
+ cq->max_pending = max_pending;
+ cq->num_pending = 0;
+ return cq;
+}
+
+void cq_destroy(struct chunk_queue *cq)
{
struct queued_chunk *qc, *tmp;
+ list_for_each_entry_safe(qc, tmp, &cq->q, node) {
+ list_del(&qc->node);
+ free(qc);
+ }
+ free(cq);
+}
+
+static void http_shutdown_client(struct http_client *hc, const char *msg)
+{
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);
}
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);
+ cq_update(hc->cq, ret);
+ if (ret != len)
+ return 1;
+ cq_dequeue(hc->cq);
}
return 1;
}
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;
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;
}
goto err_out;
}
hc->status = HTTP_CONNECTED;
- INIT_LIST_HEAD(&hc->chunk_queue);
+ hc->cq = cq_init(MAX_BACKLOG);
PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
CLIENT_ADDR(hc), hc->fd);
numclients++;
projects / paraslash.git / blobdiff