Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: net/quic/quic_sent_entropy_manager.cc

Issue 2193073003: Move shared files in net/quic/ into net/quic/core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: io_thread_unittest.cc Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_sent_entropy_manager.h ('k') | net/quic/quic_sent_entropy_manager_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_sent_entropy_manager.cc
diff --git a/net/quic/quic_sent_entropy_manager.cc b/net/quic/quic_sent_entropy_manager.cc
deleted file mode 100644
index ca387b944563f5a3f360b00cdc7d305489ff4250..0000000000000000000000000000000000000000
--- a/net/quic/quic_sent_entropy_manager.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2013 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/quic_sent_entropy_manager.h"
-
-#include "base/logging.h"
-#include "net/base/linked_hash_map.h"
-#include "net/quic/quic_flags.h"
-
-using std::make_pair;
-using std::max;
-using std::min;
-
-namespace net {
-
-QuicSentEntropyManager::QuicSentEntropyManager() : map_offset_(1) {}
-
-QuicSentEntropyManager::~QuicSentEntropyManager() {}
-
-QuicPacketEntropyHash QuicSentEntropyManager::GetPacketEntropy(
- QuicPacketNumber packet_number) const {
- return packets_entropy_[packet_number - map_offset_];
-}
-
-QuicPacketNumber QuicSentEntropyManager::GetLargestPacketWithEntropy() const {
- return map_offset_ + packets_entropy_.size() - 1;
-}
-
-QuicPacketNumber QuicSentEntropyManager::GetSmallestPacketWithEntropy() const {
- return map_offset_;
-}
-
-void QuicSentEntropyManager::UpdateCumulativeEntropy(
- QuicPacketNumber packet_number,
- CumulativeEntropy* cumulative) const {
- while (cumulative->packet_number < packet_number) {
- ++cumulative->packet_number;
- cumulative->entropy ^= GetPacketEntropy(cumulative->packet_number);
- }
-}
-
-void QuicSentEntropyManager::RecordPacketEntropyHash(
- QuicPacketNumber packet_number,
- QuicPacketEntropyHash entropy_hash) {
- if (!packets_entropy_.empty()) {
- // Ensure packets always are recorded in order.
- // Every packet's entropy is recorded, even if it's not sent, so there
- // are not packet number gaps.
- DCHECK_EQ(GetLargestPacketWithEntropy() + 1, packet_number);
- }
- packets_entropy_.push_back(entropy_hash);
- DVLOG(2) << "Recorded packet number " << packet_number
- << " with entropy hash: " << static_cast<int>(entropy_hash);
-}
-
-QuicPacketEntropyHash QuicSentEntropyManager::GetCumulativeEntropy(
- QuicPacketNumber packet_number) {
- DCHECK_LE(last_cumulative_entropy_.packet_number, packet_number);
- DCHECK_GE(GetLargestPacketWithEntropy(), packet_number);
- // First the entropy for largest_observed packet number should be updated.
- UpdateCumulativeEntropy(packet_number, &last_cumulative_entropy_);
- return last_cumulative_entropy_.entropy;
-}
-
-bool QuicSentEntropyManager::IsValidEntropy(
- QuicPacketNumber largest_observed,
- const PacketNumberQueue& missing_packets,
- QuicPacketEntropyHash entropy_hash) {
- DCHECK_GE(largest_observed, last_valid_entropy_.packet_number);
- // Ensure the largest and smallest packet numbers are in range.
- if (largest_observed > GetLargestPacketWithEntropy()) {
- return false;
- }
- if (!missing_packets.Empty() &&
- missing_packets.Min() < GetSmallestPacketWithEntropy()) {
- return false;
- }
- // First the entropy for largest_observed packet number should be updated.
- UpdateCumulativeEntropy(largest_observed, &last_valid_entropy_);
-
- // Now XOR out all the missing entropies.
- QuicPacketEntropyHash expected_entropy_hash = last_valid_entropy_.entropy;
- if (FLAGS_quic_use_packet_number_queue_intervals) {
- for (auto itr = missing_packets.begin_intervals();
- itr != missing_packets.end_intervals(); ++itr) {
- const auto& interval = *itr;
- for (QuicPacketNumber packet_number = interval.min();
- packet_number < interval.max(); ++packet_number) {
- expected_entropy_hash ^= GetPacketEntropy(packet_number);
- }
- }
- } else {
- for (QuicPacketNumber packet : missing_packets) {
- expected_entropy_hash ^= GetPacketEntropy(packet);
- }
- }
- DLOG_IF(WARNING, entropy_hash != expected_entropy_hash)
- << "Invalid entropy hash: " << static_cast<int>(entropy_hash)
- << " expected entropy hash: " << static_cast<int>(expected_entropy_hash);
- return entropy_hash == expected_entropy_hash;
-}
-
-void QuicSentEntropyManager::ClearEntropyBefore(
- QuicPacketNumber packet_number) {
- // Don't discard entropy before updating the cumulative entropy used to
- // calculate EntropyHash and IsValidEntropy.
- if (last_cumulative_entropy_.packet_number < packet_number) {
- UpdateCumulativeEntropy(packet_number, &last_cumulative_entropy_);
- }
- if (last_valid_entropy_.packet_number < packet_number) {
- UpdateCumulativeEntropy(packet_number, &last_valid_entropy_);
- }
- while (map_offset_ < packet_number) {
- packets_entropy_.pop_front();
- ++map_offset_;
- }
- DVLOG(2) << "Cleared entropy before: " << packet_number;
-}
-
-} // namespace net
« no previous file with comments | « net/quic/quic_sent_entropy_manager.h ('k') | net/quic/quic_sent_entropy_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698