QUIC: Do not count the duplicate received bytes in GetTotalReceivedBytes

net/quic/chromium/quic_http_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/chromium/quic_http_stream.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/quic/chromium/quic_http_utils.h"
 #include "net/quic/core/quic_client_promised_info.h"
+#include "net/quic/core/quic_stream_sequencer.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/ssl/ssl_info.h"
 
 namespace net {
 
 namespace {
@@ skipping 337 matching lines @@
 bool QuicHttpStream::IsConnectionReused() const {
   // TODO(rch): do something smarter here.
   return stream_ && stream_->id() > 1;
 }
 
 int64_t QuicHttpStream::GetTotalReceivedBytes() const {
   // TODO(sclittle): Currently, this only includes headers and response body
   // bytes. Change this to include QUIC overhead as well.
   int64_t total_received_bytes = headers_bytes_received_;
   if (stream_) {
-    total_received_bytes += stream_->stream_bytes_read();
+    DCHECK_LE(stream_->sequencer()->NumBytesConsumed(),
+              stream_->stream_bytes_read());
+    // Only count the uniquely received bytes.
+    total_received_bytes += stream_->sequencer()->NumBytesConsumed();
   } else {
     total_received_bytes += closed_stream_received_bytes_;
   }
   return total_received_bytes;
 }
 
 int64_t QuicHttpStream::GetTotalSentBytes() const {
   // TODO(sclittle): Currently, this only includes request headers and body
   // bytes. Change this to include QUIC overhead as well.
   int64_t total_sent_bytes = headers_bytes_sent_;
@@ skipping 415 matching lines @@
   return rv;
 }
 
 void QuicHttpStream::ResetStream() {
   if (push_handle_) {
     push_handle_->Cancel();
     push_handle_ = nullptr;
   }
   if (!stream_)
     return;
-  closed_stream_received_bytes_ = stream_->stream_bytes_read();
+  DCHECK_LE(stream_->sequencer()->NumBytesConsumed(),
+            stream_->stream_bytes_read());
+  // Only count the uniquely received bytes.
+  closed_stream_received_bytes_ = stream_->sequencer()->NumBytesConsumed();
   closed_stream_sent_bytes_ = stream_->stream_bytes_written();
   closed_is_first_stream_ = stream_->IsFirstStream();
   stream_ = nullptr;
 
   // If |request_body_stream_| is non-NULL, Reset it, to abort any in progress
   // read.
   if (request_body_stream_)
     request_body_stream_->Reset();
 }
 
 }  // namespace net