From 92f190a802b6999ce68696032e556aa75171e1cc Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 23 Aug 2019 10:28:01 -0700 Subject: [PATCH] tcp: fix byte tracker samples flush Type: fix Change-Id: I3b4cb8fc17387693d6ad6cdef004ca99cd56bc23 Signed-off-by: Florin Coras --- src/plugins/unittest/tcp_test.c | 13 +++++++++++++ src/vnet/tcp/tcp_bt.c | 1 + 2 files changed, 14 insertions(+) diff --git a/src/plugins/unittest/tcp_test.c b/src/plugins/unittest/tcp_test.c index 940ffcf94c4..7aa24562d7e 100644 --- a/src/plugins/unittest/tcp_test.c +++ b/src/plugins/unittest/tcp_test.c @@ -1093,6 +1093,19 @@ tcp_test_delivery (vlib_main_t * vm, unformat_input_t * input) TCP_TEST (rs->flags & TCP_BTS_IS_APP_LIMITED, "is app limited"); TCP_TEST (tc->app_limited == 0, "app limited should be cleared"); + /* + * 9) test flush + */ + + tcp_bt_track_tx (tc); + tc->snd_nxt += burst; + + session_main.wrk[thread_index].last_vlib_time = 12; + tcp_bt_track_tx (tc); + tc->snd_nxt += burst; + + tcp_bt_flush_samples (tc); + /* * Cleanup */ diff --git a/src/vnet/tcp/tcp_bt.c b/src/vnet/tcp/tcp_bt.c index dd3d9539d9a..fe007543cd0 100644 --- a/src/vnet/tcp/tcp_bt.c +++ b/src/vnet/tcp/tcp_bt.c @@ -544,6 +544,7 @@ tcp_bt_flush_samples (tcp_connection_t * tc) u32 *samples = 0, *si; vec_validate (samples, pool_elts (bt->samples) - 1); + vec_reset_length (samples); /* *INDENT-OFF* */ pool_foreach (bts, bt->samples, ({ -- 2.16.6