diff options
| -rw-r--r-- | src/vnet/session/transport.c | 5 | ||||
| -rw-r--r-- | src/vnet/session/transport_types.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 6caa4d38cd7..effd5891e0b 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -581,7 +581,7 @@ spacer_max_burst (spacer_t * pacer, u64 norm_time_now) if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10) { pacer->last_update = norm_time_now; - pacer->bucket += inc; + pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec); } return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); @@ -598,13 +598,14 @@ static inline void spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) { ASSERT (rate_bytes_per_sec != 0); + pacer->bytes_per_sec = rate_bytes_per_sec; pacer->tokens_per_period = rate_bytes_per_sec / transport_pacer_period; } static inline u64 spacer_pace_rate (spacer_t * pacer) { - return pacer->tokens_per_period * transport_pacer_period; + return pacer->bytes_per_sec; } void diff --git a/src/vnet/session/transport_types.h b/src/vnet/session/transport_types.h index ac2177c77b0..b6e01b54345 100644 --- a/src/vnet/session/transport_types.h +++ b/src/vnet/session/transport_types.h @@ -49,6 +49,7 @@ typedef enum transport_connection_flags_ typedef struct _spacer { + u64 bytes_per_sec; u64 bucket; u64 last_update; f32 tokens_per_period; |