Disk cache: Keep a map of all open entries....

net/disk_cache/entry_impl.cc

 // Copyright (c) 2006-2009 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/disk_cache/entry_impl.h"
 
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
@@ skipping 110 matching lines @@
       // There was a failure writing the actual data. Mark the entry as dirty.
       int current_id = backend_->GetCurrentEntryId();
       node_.Data()->dirty = current_id == 1 ? -1 : current_id - 1;
       node_.Store();
     } else if (node_.HasData() && node_.Data()->dirty) {
       node_.Data()->dirty = 0;
       node_.Store();
     }
   }
 
-  backend_->CacheEntryDestroyed();
+  backend_->CacheEntryDestroyed(entry_.address());
 }
 
 void EntryImpl::Doom() {
   if (doomed_)
     return;
 
   SetPointerForInvalidEntry(backend_->GetCurrentEntryId());
   backend_->InternalDoomEntry(this);
 }
 
@@ skipping 357 matching lines @@
   DCHECK(success);
 }
 
 bool EntryImpl::LoadNodeAddress() {
   Addr address(entry_.Data()->rankings_node);
   if (!node_.LazyInit(backend_->File(address), address))
     return false;
   return node_.Load();
 }
 
-EntryImpl* EntryImpl::Update(EntryImpl* entry) {
-  DCHECK(entry->rankings()->HasData());
+bool EntryImpl::Update() {
+  DCHECK(node_.HasData());
 
-  RankingsNode* rankings = entry->rankings()->Data();
+  RankingsNode* rankings = node_.Data();
   if (rankings->pointer) {
-    // Already in memory. Prevent clearing the dirty flag on the destructor.
-    rankings->dirty = 0;
-    EntryImpl* real_node = reinterpret_cast<EntryImpl*>(rankings->pointer);
-    real_node->AddRef();
-    entry->Release();
-    return real_node;
+    // Nothing to do here, the entry was in memory.
+    DCHECK(rankings->pointer == this);
   } else {
-    rankings->dirty = entry->backend_->GetCurrentEntryId();
-    rankings->pointer = entry;
-    if (!entry->rankings()->Store()) {
-      entry->Release();
-      return NULL;
-    }
-    return entry;
+    rankings->dirty = backend_->GetCurrentEntryId();
+    rankings->pointer = this;
+    if (!node_.Store())
+      return false;
   }
+  return true;
 }
 
 bool EntryImpl::IsDirty(int32 current_id) {
   DCHECK(node_.HasData());
   // We are checking if the entry is valid or not. If there is a pointer here,
-  // |dirty| has to be the id of the cache that is using the entry (the one
-  // that created the pointer), 0 is not a valid id.
-  if (node_.Data()->pointer && !node_.Data()->dirty)
+  // we should not be checking the entry.
+  if (node_.Data()->pointer)
     return true;
 
   return node_.Data()->dirty && current_id != node_.Data()->dirty;
 }
 
 void EntryImpl::ClearDirtyFlag() {
   node_.Data()->dirty = 0;
 }
 
 void EntryImpl::SetPointerForInvalidEntry(int32 new_id) {
@@ skipping 325 matching lines @@
   Trace("%s 0x%p 0x%x 0x%x", msg, reinterpret_cast<void*>(this),
         entry_.address().value(), node_.address().value());
 
   Trace("  data: 0x%x 0x%x 0x%x", entry_.Data()->data_addr[0],
         entry_.Data()->data_addr[1], entry_.Data()->long_key);
 
   Trace("  doomed: %d 0x%p 0x%x", doomed_, pointer, dirty);
 }
 
 }  // namespace disk_cache