revert to only using bytes from InFlight for congestion event

Author: Tipuch

quinn-proto/src/congestion.rs

@@ -1,7 +1,7 @@
 //! Logic for controlling the rate at which data is sent
 
 use crate::Instant;
-use crate::connection::{InFlight, RttEstimator};
+use crate::connection::RttEstimator;
 use std::any::Any;
 use std::sync::Arc;
 
@@ -55,7 +55,7 @@ pub trait Controller: Send + Sync {
     fn on_end_acks(
         &mut self,
         now: Instant,
-        in_flight: &InFlight,
+        in_flight: u64,
         app_limited: bool,
         largest_packet_num_acked: Option<u64>,
     ) {

quinn-proto/src/congestion/bbr3/mod.rs

@@ -3,7 +3,6 @@ mod max_filter;
 use crate::RttEstimator;
 use crate::congestion::bbr3::max_filter::MaxFilter;
 use crate::congestion::{Controller, ControllerFactory, ControllerMetrics};
-use crate::connection::InFlight;
 use crate::{Duration, Instant};
 use rand::{Rng, SeedableRng};
 use rand_pcg::Pcg32;
@@ -1467,11 +1466,11 @@ impl Controller for Bbr3 {
     fn on_end_acks(
         &mut self,
         _now: Instant,
-        in_flight: &InFlight,
+        in_flight: u64,
         app_limited: bool,
         largest_packet_num_acked: Option<u64>,
     ) {
-        self.inflight = in_flight.bytes;
+        self.inflight = in_flight;
         if let Some(largest_packet_num) = largest_packet_num_acked {
             if app_limited && self.delivered > self.app_limited {
                 self.app_limited = largest_packet_num;

quinn-proto/src/connection/mod.rs

@@ -61,7 +61,7 @@ mod packet_crypto;
 use packet_crypto::{PrevCrypto, ZeroRttCrypto};
 
 mod paths;
-pub use paths::{InFlight, RttEstimator};
+pub use paths::RttEstimator;
 use paths::{PathData, PathResponses};
 
 pub(crate) mod qlog;
@@ -1512,7 +1512,7 @@ impl Connection {
 
         self.path.congestion.on_end_acks(
             now,
-            &self.path.in_flight,
+            self.path.in_flight.bytes,
             self.app_limited,
             self.spaces[space].largest_acked_packet,
         );

quinn-proto/src/connection/paths.rs

@@ -421,18 +421,18 @@ struct PathResponse {
 
 /// Summary statistics of packets that have been sent on a particular path, but which have not yet
 /// been acked or deemed lost
-pub struct InFlight {
+pub(super) struct InFlight {
     /// Sum of the sizes of all sent packets considered "in flight" by congestion control
     ///
     /// The size does not include IP or UDP overhead. Packets only containing ACK frames do not
     /// count towards this to ensure congestion control does not impede congestion feedback.
-    pub bytes: u64,
+    pub(super) bytes: u64,
     /// Number of packets in flight containing frames other than ACK and PADDING
     ///
     /// This can be 0 even when bytes is not 0 because PADDING frames cause a packet to be
     /// considered "in flight" by congestion control. However, if this is nonzero, bytes will always
     /// also be nonzero.
-    pub ack_eliciting: u64,
+    pub(super) ack_eliciting: u64,
 }
 
 impl InFlight {

quinn-proto/src/lib.rs

@@ -45,9 +45,9 @@ pub use bloom_token_log::BloomTokenLog;
 mod connection;
 pub use crate::connection::{
     Chunk, Chunks, ClosedStream, Connection, ConnectionError, ConnectionStats, Datagrams, Event,
-    FinishError, FrameStats, InFlight, PathStats, ReadError, ReadableError, RecvStream,
-    RttEstimator, SendDatagramError, SendStream, ShouldTransmit, StreamEvent, Streams, UdpStats,
-    WriteError, Written,
+    FinishError, FrameStats, PathStats, ReadError, ReadableError, RecvStream, RttEstimator,
+    SendDatagramError, SendStream, ShouldTransmit, StreamEvent, Streams, UdpStats, WriteError,
+    Written,
 };
 #[cfg(feature = "qlog")]
 pub use connection::qlog::QlogStream;