diff options
| -rw-r--r-- | src/plugins/http_static/static_server.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/plugins/http_static/static_server.c b/src/plugins/http_static/static_server.c index c715dfa6fb8..ba81882fca0 100644 --- a/src/plugins/http_static/static_server.c +++ b/src/plugins/http_static/static_server.c @@ -299,8 +299,8 @@ static_send_data (http_session_t * hs, u8 * data, u32 length, u32 offset) { int actual_transfer; - actual_transfer = svm_fifo_enqueue - (hs->tx_fifo, bytes_to_send, data + offset); + actual_transfer = svm_fifo_enqueue ( + hs->tx_fifo, clib_min (bytes_to_send, 4 << 20), data + offset); /* Made any progress? */ if (actual_transfer <= 0) @@ -893,7 +893,7 @@ state_send_more_data (session_t * s, http_session_t * hs, { /* No: ask for a shoulder-tap when the tx fifo has space */ svm_fifo_add_want_deq_ntf (hs->tx_fifo, - SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + SVM_FIFO_WANT_DEQ_NOTIF_IF_LEQ_THRESH); hs->session_state = HTTP_STATE_SEND_MORE_DATA; return 0; } @@ -1033,6 +1033,7 @@ http_static_server_session_accept_callback (session_t * s) { http_static_server_main_t *hsm = &http_static_server_main; http_session_t *hs; + u32 thresh; hsm->vpp_queue[s->thread_index] = session_main_get_vpp_event_queue (s->thread_index); @@ -1051,6 +1052,21 @@ http_static_server_session_accept_callback (session_t * s) http_static_server_sessions_writer_unlock (); + /* The application sets a threshold for it's fifo to get notified when + * additional data can be enqueued. We want to keep the TX fifo reasonably + * full, however avoid entering a state where the + * fifo is full all the time and small chunks of data are being enqueued + * each time. If the fifo is small (under 16K) we set + * the threshold to 0, meaning a notification will be given when the + * fifo empties. + */ +#define HTTP_FIFO_THRESH (16 << 10) + thresh = (svm_fifo_size (hs->tx_fifo) < HTTP_FIFO_THRESH) ? + 0 : + svm_fifo_size (hs->tx_fifo) - HTTP_FIFO_THRESH; + + svm_fifo_set_deq_thresh (hs->tx_fifo, thresh); + s->session_state = SESSION_STATE_READY; return 0; } |