Report number of bytes acked in stats

quiche/include/quiche.h

@@ -557,6 +557,9 @@ typedef struct {
     // The number of received bytes.
     uint64_t recv_bytes;
 
+    // The number of bytes acked.
+    uint64_t acked_bytes;
+
     // The number of bytes lost.
     uint64_t lost_bytes;
 

quiche/src/ffi.rs

@@ -1210,6 +1210,7 @@ pub struct Stats {
     retrans: usize,
     sent_bytes: u64,
     recv_bytes: u64,
+    acked_bytes: u64,
     lost_bytes: u64,
     stream_retrans_bytes: u64,
     paths_count: usize,
@@ -1245,6 +1246,7 @@ pub extern fn quiche_conn_stats(conn: &Connection, out: &mut Stats) {
     out.retrans = stats.retrans;
     out.sent_bytes = stats.sent_bytes;
     out.recv_bytes = stats.recv_bytes;
+    out.acked_bytes = stats.acked_bytes;
     out.lost_bytes = stats.lost_bytes;
     out.stream_retrans_bytes = stats.stream_retrans_bytes;
     out.paths_count = stats.paths_count;

quiche/src/lib.rs

@@ -1442,6 +1442,9 @@ pub struct Connection {
     /// Total number of bytes received over the connection.
     recv_bytes: u64,
 
+    /// Total number of bytes sent acked over the connection.
+    acked_bytes: u64,
+
     /// Total number of bytes sent lost over the connection.
     lost_bytes: u64,
 
@@ -1905,6 +1908,7 @@ impl Connection {
             retrans_count: 0,
             sent_bytes: 0,
             recv_bytes: 0,
+            acked_bytes: 0,
             lost_bytes: 0,
 
             rx_data: 0,
@@ -6575,6 +6579,7 @@ impl Connection {
             retrans: self.retrans_count,
             sent_bytes: self.sent_bytes,
             recv_bytes: self.recv_bytes,
+            acked_bytes: self.acked_bytes,
             lost_bytes: self.lost_bytes,
             stream_retrans_bytes: self.stream_retrans_bytes,
             paths_count: self.paths.len(),
@@ -6956,18 +6961,20 @@ impl Connection {
                         p.recovery.delivery_rate_update_app_limited(true);
                     }
 
-                    let (lost_packets, lost_bytes) = p.recovery.on_ack_received(
-                        &ranges,
-                        ack_delay,
-                        epoch,
-                        handshake_status,
-                        now,
-                        &self.trace_id,
-                        &mut self.newly_acked,
-                    )?;
+                    let (lost_packets, lost_bytes, acked_bytes) =
+                        p.recovery.on_ack_received(
+                            &ranges,
+                            ack_delay,
+                            epoch,
+                            handshake_status,
+                            now,
+                            &self.trace_id,
+                            &mut self.newly_acked,
+                        )?;
 
                     self.lost_count += lost_packets;
                     self.lost_bytes += lost_bytes as u64;
+                    self.acked_bytes += acked_bytes as u64;
                 }
             },
 
@@ -7936,6 +7943,9 @@ pub struct Stats {
     /// The number of received bytes.
     pub recv_bytes: u64,
 
+    /// The number of bytes sent acked.
+    pub acked_bytes: u64,
+
     /// The number of bytes sent lost.
     pub lost_bytes: u64,
 

quiche/src/recovery/bbr/mod.rs

@@ -453,7 +453,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0)),
+            Ok((0, 0, mss * 5)),
         );
 
         assert_eq!(r.bbr_state.state, BBRStateMachine::Startup);
@@ -514,7 +514,7 @@ mod tests {
         let mut acked = ranges::RangeSet::default();
         acked.insert(4..5);
 
-        // 2 acked, 2 x MSS lost.
+        // 1 acked, 2 x MSS lost.
         assert_eq!(
             r.on_ack_received(
                 &acked,
@@ -525,7 +525,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((2, 2400)),
+            Ok((2, 2 * mss, mss)),
         );
 
         // Sent: 0, 1, 2, 3, 4, Acked 4.
@@ -595,7 +595,7 @@ mod tests {
                     "",
                     &mut Vec::new(),
                 ),
-                Ok((0, 0)),
+                Ok((0, 0, mss)),
             );
         }
 
@@ -650,7 +650,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0)),
+            Ok((0, 0, mss)),
         );
 
         // Now we are in Drain state.
@@ -717,7 +717,7 @@ mod tests {
                     "",
                     &mut Vec::new(),
                 ),
-                Ok((0, 0)),
+                Ok((0, 0, mss)),
             );
         }
 
@@ -791,7 +791,7 @@ mod tests {
                     "",
                     &mut Vec::new(),
                 ),
-                Ok((0, 0)),
+                Ok((0, 0, mss)),
             );
         }
 
@@ -848,7 +848,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0)),
+            Ok((0, 0, mss)),
         );
 
         assert_eq!(r.bbr_state.state, BBRStateMachine::ProbeRTT);

quiche/src/recovery/delivery_rate.rs

@@ -383,7 +383,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0)),
+            Ok((0, 0, mss * 5)),
         );
 
         assert!(r.app_limited());

quiche/src/recovery/mod.rs

@@ -657,7 +657,7 @@ impl Recovery {
         &mut self, ranges: &ranges::RangeSet, ack_delay: u64,
         epoch: packet::Epoch, handshake_status: HandshakeStatus, now: Instant,
         trace_id: &str, newly_acked: &mut Vec<Acked>,
-    ) -> Result<(usize, usize)> {
+    ) -> Result<(usize, usize, usize)> {
         let largest_acked = ranges.last().unwrap();
 
         // Update the largest acked packet.
@@ -694,7 +694,7 @@ impl Recovery {
         }
 
         if newly_acked.is_empty() {
-            return Ok((0, 0));
+            return Ok((0, 0, 0));
         }
 
         // Check if largest packet is newly acked.
@@ -725,7 +725,7 @@ impl Recovery {
         self.epochs[epoch]
             .drain_acked_and_lost_packets(now - self.rtt_stats.rtt());
 
-        Ok(loss)
+        Ok((loss.0, loss.1, acked_bytes))
     }
 
     pub fn on_loss_detection_timeout(
@@ -1642,7 +1642,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0))
+            Ok((0, 0, 2 * 1000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 2);
@@ -1734,7 +1734,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((2, 2000))
+            Ok((2, 2000, 2 * 1000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 4);
@@ -1896,7 +1896,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0))
+            Ok((0, 0, 3 * 1000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 2);
@@ -2068,7 +2068,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((1, 1000))
+            Ok((1, 1000, 1000 * 2))
         );
 
         now += Duration::from_millis(10);
@@ -2088,7 +2088,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0))
+            Ok((0, 0, 1000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 0);
@@ -2171,7 +2171,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0))
+            Ok((0, 0, 12000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 0);
@@ -2408,7 +2408,7 @@ mod tests {
                 "",
                 &mut Vec::new(),
             ),
-            Ok((0, 0))
+            Ok((0, 0, 2 * 1000))
         );
 
         assert_eq!(r.epochs[packet::Epoch::Application].sent_packets.len(), 2);