Disk cache: Fix handling of invalid entries that are detected...

net/disk_cache/rankings.h

 // Copyright (c) 2006-2008 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.
 
 // See net/disk_cache/disk_cache.h for the public interface.
 
 #ifndef NET_DISK_CACHE_RANKINGS_H_
 #define NET_DISK_CACHE_RANKINGS_H_
 
 #include <list>
@@ skipping 109 matching lines @@
   void Remove(CacheRankingsBlock* node, List list);
 
   // Moves a given entry to the head.
   void UpdateRank(CacheRankingsBlock* node, bool modified, List list);
 
   // Iterates through the list.
   CacheRankingsBlock* GetNext(CacheRankingsBlock* node, List list);
   CacheRankingsBlock* GetPrev(CacheRankingsBlock* node, List list);
   void FreeRankingsBlock(CacheRankingsBlock* node);
 
+  // Controls tracking of nodes used for enumerations.
+  void TrackRankingsBlock(CacheRankingsBlock* node, bool start_tracking);
+
   // Peforms a simple self-check of the lists, and returns the number of items
   // or an error code (negative value).
   int SelfCheck();
 
   // Returns false if the entry is clearly invalid. from_list is true if the
   // node comes from the LRU list.
   bool SanityCheck(CacheRankingsBlock* node, bool from_list);
 
  private:
   typedef std::pair<CacheAddr, CacheRankingsBlock*> IteratorPair;
@@ skipping 24 matching lines @@
   bool CheckSingleLink(CacheRankingsBlock* prev, CacheRankingsBlock* next);
 
   // Peforms a simple check of the list, and returns the number of items or an
   // error code (negative value).
   int CheckList(List list);
 
   // Returns true if addr is the head or tail of any list.
   bool IsHead(CacheAddr addr);
   bool IsTail(CacheAddr addr);
 
-  // Controls tracking of nodes used for enumerations.
-  void TrackRankingsBlock(CacheRankingsBlock* node, bool start_tracking);
-
   // Updates the iterators whenever node is being changed.
   void UpdateIterators(CacheRankingsBlock* node);
 
-  // Verifies that no iterator gets invalidated by changing a node.
-  void NotAnIterator(CacheRankingsBlock* node);
+  // Invalidates the iterators pointing to this node.
+  void InvalidateIterators(CacheRankingsBlock* node);
 
   // Keeps track of the number of entries on a list.
   void IncrementCounter(List list);
   void DecrementCounter(List list);
 
   bool init_;
   bool count_lists_;
   Addr heads_[LAST_ELEMENT];
   Addr tails_[LAST_ELEMENT];
   BackendImpl* backend_;
   LruData* control_data_;  // Data related to the LRU lists.
   IteratorList iterators_;
 
   DISALLOW_COPY_AND_ASSIGN(Rankings);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_RANKINGS_H_