Disk cache: Remove remaining uses of RankingsNode.pointer....

net/disk_cache/eviction.cc

 // 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.
 
 // The eviction policy is a very simple pure LRU, so the elements at the end of
 // the list are evicted until kCleanUpMargin free space is available. There is
 // only one list in use (Rankings::NO_USE), and elements are sent to the front
 // of the list whenever they are accessed.
 
 // The new (in-development) eviction policy ads re-use as a factor to evict
@@ skipping 74 matching lines @@
   Rankings::ScopedRankingsBlock node(rankings_);
   Rankings::ScopedRankingsBlock next(rankings_,
       rankings_->GetPrev(node.get(), Rankings::NO_USE));
   int target_size = empty ? 0 : max_size_;
   while (header_->num_bytes > target_size && next.get()) {
     // The iterator could be invalidated within EvictEntry().
     if (!next->HasData())
       break;
     node.reset(next.release());
     next.reset(rankings_->GetPrev(node.get(), Rankings::NO_USE));
-    if (!node->Data()->pointer || empty) {
+    if (node->Data()->dirty != backend_->GetCurrentEntryId() || empty) {
       // This entry is not being used by anybody.
       // Do NOT use node as an iterator after this point.
       rankings_->TrackRankingsBlock(node.get(), false);
       if (!EvictEntry(node.get(), empty))
         continue;
 
       if (!empty) {
         backend_->OnEvent(Stats::TRIM_ENTRY);
 
         if ((Time::Now() - start).InMilliseconds() > 20) {
@@ skipping 162 matching lines @@
 
   int target_size = empty ? 0 : max_size_;
   for (; list < kListsToSearch; list++) {
     while (header_->num_bytes > target_size && next[list].get()) {
       // The iterator could be invalidated within EvictEntry().
       if (!next[list]->HasData())
         break;
       node.reset(next[list].release());
       next[list].reset(rankings_->GetPrev(node.get(),
                                           static_cast<Rankings::List>(list)));
-      if (!node->Data()->pointer || empty) {
+      if (node->Data()->dirty != backend_->GetCurrentEntryId() || empty) {
         // This entry is not being used by anybody.
         // Do NOT use node as an iterator after this point.
         rankings_->TrackRankingsBlock(node.get(), false);
         if (!EvictEntry(node.get(), empty))
           continue;
 
         if (!empty && (Time::Now() - start).InMilliseconds() > 20) {
           MessageLoop::current()->PostTask(FROM_HERE,
               factory_.NewRunnableMethod(&Eviction::TrimCache, false));
           break;
@@ skipping 129 matching lines @@
 bool Eviction::RemoveDeletedNode(CacheRankingsBlock* node) {
   EntryImpl* entry;
   bool dirty;
   if (backend_->NewEntry(Addr(node->Data()->contents), &entry, &dirty)) {
     Trace("NewEntry failed on Trim 0x%x", node->address().value());
     return false;
   }
 
   // TODO(rvargas): figure out how to deal with corruption at this point (dirty
   // entries that live in this list).
-  if (node->Data()->pointer) {
+  if (node->Data()->dirty) {
     // We ignore the failure; we're removing the entry anyway.
     entry->Update();
   }
   entry->entry()->Data()->state = ENTRY_DOOMED;
   entry->Doom();
   entry->Release();
   return true;
 }
 
 bool Eviction::NodeIsOldEnough(CacheRankingsBlock* node, int list) {
@@ skipping 40 matching lines @@
               Time::FromInternalValue(last2.get()->Data()->last_used));
   if (last3.get())
     CACHE_UMA(AGE, "HighUseAge", header_->experiment,
               Time::FromInternalValue(last3.get()->Data()->last_used));
   if (last4.get())
     CACHE_UMA(AGE, "DeletedAge", header_->experiment,
               Time::FromInternalValue(last4.get()->Data()->last_used));
 }
 
 }  // namespace disk_cache