Moves HpackEntry index computation into the container class HpackHeaderTable.

net/spdy/hpack_header_table.h

 // Copyright 2014 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.
 
 #ifndef NET_SPDY_HPACK_HEADER_TABLE_H_
 #define NET_SPDY_HPACK_HEADER_TABLE_H_
 
 #include <cstddef>
 #include <deque>
 #include <set>
@@ skipping 18 matching lines @@
  public:
   friend class test::HpackHeaderTablePeer;
 
   // HpackHeaderTable takes advantage of the deque property that references
   // remain valid, so long as insertions & deletions are at the head & tail.
   // If this changes (eg we start to drop entries from the middle of the table),
   // this needs to be a std::list, in which case |index_| can be trivially
   // extended to map to list iterators.
   typedef std::deque<HpackEntry> EntryTable;
 
+  // Implements a total ordering of HpackEntry on name(), value(), then index
+  // ascending. Note that index may change over the lifetime of an HpackEntry,
+  // but the relative index order of two entries will not. This comparator is
+  // composed with the 'lookup' HpackEntry constructor to allow for efficient
+  // lower-bounding of matching entries.
+  struct NET_EXPORT_PRIVATE EntryComparator {
+    explicit EntryComparator(HpackHeaderTable* table) : table_(table) {}
+
+    bool operator() (const HpackEntry* lhs, const HpackEntry* rhs) const;
+
+   private:
+    HpackHeaderTable* table_;
+  };
+  typedef std::set<HpackEntry*, EntryComparator> OrderedEntrySet;
+
   HpackHeaderTable();
 
   ~HpackHeaderTable();
 
   // Last-aknowledged value of SETTINGS_HEADER_TABLE_SIZE.
   size_t settings_size_bound() { return settings_size_bound_; }
 
   // Current and maximum estimated byte size of the table, as described in
   // 3.3.1. Notably, this is /not/ the number of entries in the table.
   size_t size() const { return size_; }
   size_t max_size() const { return max_size_; }
 
-  const HpackEntry::OrderedSet& reference_set() {
+  const OrderedEntrySet& reference_set() {
     return reference_set_;
   }
 
   // Returns the entry matching the index, or NULL.
   HpackEntry* GetByIndex(size_t index);
 
   // Returns the lowest-value entry having |name|, or NULL.
   HpackEntry* GetByName(base::StringPiece name);
 
   // Returns the lowest-index matching entry, or NULL.
   HpackEntry* GetByNameAndValue(base::StringPiece name,
                                 base::StringPiece value);
 
+  // Returns the index of an entry within this header table.
+  size_t IndexOf(const HpackEntry* entry) const;
+
   // Sets the maximum size of the header table, evicting entries if
   // necessary as described in 3.3.2.
   void SetMaxSize(size_t max_size);
 
   // Sets the SETTINGS_HEADER_TABLE_SIZE bound of the table. Will call
   // SetMaxSize() as needed to preserve max_size() <= settings_size_bound().
   void SetSettingsHeaderTableSize(size_t settings_size);
 
   // Determine the set of entries which would be evicted by the insertion
   // of |name| & |value| into the table, as per section 3.3.3. No eviction
@@ skipping 27 matching lines @@
   // Returns number of evictions required to reclaim |reclaim_size| table size.
   size_t EvictionCountToReclaim(size_t reclaim_size) const;
 
   // Evicts |count| oldest entries from the table.
   void Evict(size_t count);
 
   EntryTable dynamic_entries_;
   EntryTable static_entries_;
 
   // Full table index, over |dynamic_entries_| and |static_entries_|.
-  HpackEntry::OrderedSet index_;
+  OrderedEntrySet index_;
   // The reference set is strictly a subset of |dynamic_entries_|.
-  HpackEntry::OrderedSet reference_set_;
+  OrderedEntrySet reference_set_;
 
   // Last acknowledged value for SETTINGS_HEADER_TABLE_SIZE.
   size_t settings_size_bound_;
 
   // Estimated current and maximum byte size of the table.
   // |max_size_| <= |settings_header_table_size_|
   size_t size_;
   size_t max_size_;
 
   // Total number of table insertions which have occurred. Referenced by
-  // dynamic HpackEntry instances for determination of table index.
+  // IndexOf() for determination of an HpackEntry's table index.
   size_t total_insertions_;
 
-  // Current number of dynamic entries. Referenced by static HpackEntry
-  // instances for determination of table index.
-  size_t dynamic_entries_count_;
-
   DISALLOW_COPY_AND_ASSIGN(HpackHeaderTable);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_HPACK_HEADER_TABLE_H_