commit 0abcd8febd32d1f0b833ee190a0d4aa79895db36
author wub <wub@google.com> Mon Mar 30 16:24:50 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 30 16:25:31 2020 -0700
tree e2508a468c6fe1cce35a865c1c0ba1e50a47d385
parent ab9039a1fbf54e13340495bb168554535839f617

gfe-relnote: (n/a) When QUIC switches from BbrSender to Bbr2Sender, let Bbr2Sender copy the bandwidth sampler states from BbrSender. Protected by --gfe2_reloadable_flag_quic_bbr_copy_sampler_state_from_v1_to_v2.

PiperOrigin-RevId: 303846658
Change-Id: I37d88015801392608d87140213d01db02d01209f

quic/core/congestion_control/bbr2_sender.cc

diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc
index c975aec..4d79443 100644
--- a/quic/core/congestion_control/bbr2_sender.cc
+++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -58,7 +58,8 @@
                        QuicPacketCount initial_cwnd_in_packets,
                        QuicPacketCount max_cwnd_in_packets,
                        QuicRandom* random,
-                       QuicConnectionStats* stats)
+                       QuicConnectionStats* stats,
+                       BbrSender* old_sender)
     : mode_(Bbr2Mode::STARTUP),
       rtt_stats_(rtt_stats),
       unacked_packets_(unacked_packets),
@@ -70,7 +71,8 @@
              rtt_stats->SmoothedOrInitialRtt(),
              rtt_stats->last_update_time(),
              /*cwnd_gain=*/1.0,
-             /*pacing_gain=*/kInitialPacingGain),
+             /*pacing_gain=*/kInitialPacingGain,
+             old_sender ? &old_sender->sampler_ : nullptr),
       initial_cwnd_(
           cwnd_limits().ApplyLimits(initial_cwnd_in_packets * kDefaultTCPMSS)),
       cwnd_(initial_cwnd_),