Simplify BBR2 by inlining Bbr2NetworkModel::IsCongestionWindowLimited.
PiperOrigin-RevId: 398721126
diff --git a/quic/core/congestion_control/bbr2_misc.cc b/quic/core/congestion_control/bbr2_misc.cc
index 2a772ca..8c9059e 100644
--- a/quic/core/congestion_control/bbr2_misc.cc
+++ b/quic/core/congestion_control/bbr2_misc.cc
@@ -330,14 +330,6 @@
return true;
}
-bool Bbr2NetworkModel::IsCongestionWindowLimited(
- const Bbr2CongestionEvent& congestion_event) const {
- QuicByteCount prior_bytes_in_flight = congestion_event.bytes_in_flight +
- congestion_event.bytes_acked +
- congestion_event.bytes_lost;
- return prior_bytes_in_flight >= congestion_event.prior_cwnd;
-}
-
bool Bbr2NetworkModel::IsInflightTooHigh(
const Bbr2CongestionEvent& congestion_event,
int64_t max_loss_events) const {
diff --git a/quic/core/congestion_control/bbr2_misc.h b/quic/core/congestion_control/bbr2_misc.h
index d745b11..82a4c82 100644
--- a/quic/core/congestion_control/bbr2_misc.h
+++ b/quic/core/congestion_control/bbr2_misc.h
@@ -425,9 +425,6 @@
return round_trip_counter_.Count();
}
- bool IsCongestionWindowLimited(
- const Bbr2CongestionEvent& congestion_event) const;
-
// Return true if the number of loss events exceeds max_loss_events and
// fraction of bytes lost exceed the loss threshold.
bool IsInflightTooHigh(const Bbr2CongestionEvent& congestion_event,
diff --git a/quic/core/congestion_control/bbr2_probe_bw.cc b/quic/core/congestion_control/bbr2_probe_bw.cc
index 0ebe4d0..9350f39 100644
--- a/quic/core/congestion_control/bbr2_probe_bw.cc
+++ b/quic/core/congestion_control/bbr2_probe_bw.cc
@@ -348,7 +348,7 @@
return;
}
} else {
- if (!model_->IsCongestionWindowLimited(congestion_event)) {
+ if (congestion_event.prior_bytes_in_flight < congestion_event.prior_cwnd) {
QUIC_DVLOG(3) << sender_
<< " Raising inflight_hi early return: Not cwnd limited.";
// Not fully utilizing cwnd, so can't safely grow.
