tcp: retry lost retransmits

[vpp.git] / src / vnet / tcp / tcp_bt.c

diff --git a/src/vnet/tcp/tcp_bt.c b/src/vnet/tcp/tcp_bt.c
index 7494747..b550fdd 100644 (file)
--- a/src/vnet/tcp/tcp_bt.c
+++ b/src/vnet/tcp/tcp_bt.c
@@ -241,7 +241,8 @@ tcp_bt_alloc_tx_sample (tcp_connection_t * tc, u32 min_seq)
   bts = bt_alloc_sample (tc->bt, min_seq);
   bts->delivered = tc->delivered;
   bts->delivered_time = tc->delivered_time;
-  bts->tx_rate = transport_connection_tx_pacer_rate (&tc->connection);
+  bts->tx_time = tcp_time_now_us (tc->c_thread_index);
+  bts->first_tx_time = tc->first_tx_time;
   bts->flags |= tc->app_limited ? TCP_BTS_IS_APP_LIMITED : 0;
   return bts;
 }
@@ -268,8 +269,11 @@ tcp_bt_track_tx (tcp_connection_t * tc)
   tcp_bt_sample_t *bts, *tail;
   u32 bts_index;
 
-  if (!tcp_flight_size (tc))
-    tc->delivered_time = tcp_time_now_us (tc->c_thread_index);
+  if (tc->snd_una == tc->snd_nxt)
+    {
+      tc->delivered_time = tcp_time_now_us (tc->c_thread_index);
+      tc->first_tx_time = tc->delivered_time;
+    }
 
   bts = tcp_bt_alloc_tx_sample (tc, tc->snd_nxt);
   bts_index = bt_sample_index (bt, bts);
@@ -415,14 +419,15 @@ static void
 tcp_bt_sample_to_rate_sample (tcp_connection_t * tc, tcp_bt_sample_t * bts,
                              tcp_rate_sample_t * rs)
 {
-  if (rs->sample_delivered && rs->sample_delivered >= bts->delivered)
+  if (rs->prior_delivered && rs->prior_delivered >= bts->delivered)
     return;
 
-  rs->sample_delivered = bts->delivered;
-  rs->delivered = tc->delivered - bts->delivered;
-  rs->ack_time = tc->delivered_time - bts->delivered_time;
-  rs->tx_rate = bts->tx_rate;
+  rs->prior_delivered = bts->delivered;
+  rs->prior_time = bts->delivered_time;
+  rs->interval_time = bts->tx_time - bts->first_tx_time;
+  rs->rtt_time = bts->tx_time;
   rs->flags = bts->flags;
+  tc->first_tx_time = bts->tx_time;
 }
 
 static void
@@ -527,6 +532,13 @@ tcp_bt_sample_delivery_rate (tcp_connection_t * tc, tcp_rate_sample_t * rs)
 
   if (tc->sack_sb.last_sacked_bytes)
     tcp_bt_walk_samples_ooo (tc, rs);
+
+  rs->interval_time = clib_max (tc->delivered_time - rs->prior_time,
+                               rs->interval_time);
+  rs->delivered = tc->delivered - rs->prior_delivered;
+  rs->rtt_time = tc->delivered_time - rs->rtt_time;
+  rs->acked_and_sacked = delivered;
+  rs->lost = tc->sack_sb.last_lost_bytes;
 }
 
 void
@@ -537,6 +549,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, ({