diff options
| -rw-r--r-- | src/plugins/http/http.c | 8 | ||||
| -rw-r--r-- | src/plugins/srtp/srtp.c | 5 | ||||
| -rw-r--r-- | src/vnet/session/session_node.c | 6 | ||||
| -rw-r--r-- | src/vnet/session/transport.h | 1 | ||||
| -rw-r--r-- | src/vnet/tls/tls.c | 3 |
5 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/http/http.c b/src/plugins/http/http.c index a6a6af1f42f..574c34187cc 100644 --- a/src/plugins/http/http.c +++ b/src/plugins/http/http.c @@ -528,11 +528,7 @@ state_send_more_data (http_conn_t *hc, transport_send_params_t *sp) if (sent > 0) { /* Ask scheduler to notify app of deq event if needed */ - sp->max_burst_size = http_buffer_drain (hb, sent); - } - else - { - sp->max_burst_size = 0; + sp->bytes_dequeued += http_buffer_drain (hb, sent); } /* Not finished sending all data */ @@ -822,8 +818,6 @@ http_app_tx_callback (void *session, transport_send_params_t *sp) session_t *as = (session_t *) session; http_conn_t *hc; - sp->flags = 0; - hc = http_conn_get_w_thread (as->connection_index, as->thread_index); if (hc->req_state < HTTP_REQ_STATE_WAIT_APP) { diff --git a/src/plugins/srtp/srtp.c b/src/plugins/srtp/srtp.c index 62274ba635e..cc4b59de569 100644 --- a/src/plugins/srtp/srtp.c +++ b/src/plugins/srtp/srtp.c @@ -238,6 +238,7 @@ srtp_ctx_write (srtp_tc_t *ctx, session_t *app_session, us = session_get_from_handle (ctx->srtp_session_handle); to_deq = svm_fifo_max_dequeue_cons (app_session->tx_fifo); mq = session_main_get_vpp_event_queue (us->thread_index); + sp->bytes_dequeued = to_deq; while (to_deq > 0) { @@ -296,6 +297,9 @@ done: session_transport_closed_notify (&ctx->connection); } + ASSERT (sp->bytes_dequeued >= to_deq); + sp->bytes_dequeued -= to_deq; + return n_wrote > 0 ? clib_max (n_wrote / TRANSPORT_PACER_MIN_MSS, 1) : 0; } @@ -812,7 +816,6 @@ srtp_custom_tx_callback (void *session, transport_send_params_t *sp) SESSION_STATE_TRANSPORT_CLOSED)) return 0; - sp->flags = 0; ctx = srtp_ctx_get_w_thread (app_session->connection_index, app_session->thread_index); if (PREDICT_FALSE (ctx->is_migrated)) diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index 162d54e7697..35ce091bc5a 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -1441,6 +1441,8 @@ session_tx_fifo_dequeue_internal (session_worker_t * wrk, /* Clear custom-tx flag used to request reschedule for tx */ s->flags &= ~SESSION_F_CUSTOM_TX; + sp->flags = 0; + sp->bytes_dequeued = 0; sp->max_burst_size = clib_min (SESSION_NODE_FRAME_SIZE - *n_tx_packets, TRANSPORT_PACER_MAX_BURST_PKTS); @@ -1459,8 +1461,8 @@ session_tx_fifo_dequeue_internal (session_worker_t * wrk, session_evt_add_head_old (wrk, elt); } - if (sp->max_burst_size && - svm_fifo_needs_deq_ntf (s->tx_fifo, sp->max_burst_size)) + if (sp->bytes_dequeued && + svm_fifo_needs_deq_ntf (s->tx_fifo, sp->bytes_dequeued)) session_dequeue_notify (s); return n_packets; diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h index 4edc281ff9c..02ab540f6a2 100644 --- a/src/vnet/session/transport.h +++ b/src/vnet/session/transport.h @@ -57,6 +57,7 @@ typedef struct transport_send_params_ struct { u32 max_burst_size; + u32 bytes_dequeued; }; }; transport_snd_flags_t flags; diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index 9cf10086a91..01849178644 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -365,7 +365,7 @@ tls_ctx_write (tls_ctx_t * ctx, session_t * app_session, sp->max_burst_size = sp->max_burst_size * TRANSPORT_PACER_MIN_MSS; n_wrote = tls_vfts[ctx->tls_ctx_engine].ctx_write (ctx, app_session, sp); - sp->max_burst_size = n_wrote; + sp->bytes_dequeued = n_wrote; return n_wrote > 0 ? clib_max (n_wrote / TRANSPORT_PACER_MIN_MSS, 1) : 0; } @@ -942,7 +942,6 @@ tls_custom_tx_callback (void *session, transport_send_params_t * sp) >= SESSION_STATE_TRANSPORT_CLOSED)) return 0; - sp->flags = 0; ctx = tls_ctx_get (app_session->connection_index); return tls_ctx_write (ctx, app_session, sp); } |