Disk cache: First implementation of TrimDeleted() and a few...

net/disk_cache/entry_impl.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.
 
 #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 364 matching lines @@
 base::PlatformFile EntryImpl::GetPlatformFile(int index) {
   DCHECK(index >= 0 && index < NUM_STREAMS);
 
   Addr address(entry_.Data()->data_addr[index]);
   if (!address.is_initialized() || !address.is_separate_file())
     return base::kInvalidPlatformFileValue;
 
   return base::CreatePlatformFile(backend_->GetFileName(address),
                                   base::PLATFORM_FILE_OPEN |
                                       base::PLATFORM_FILE_READ |
-                                      base::PLATFORM_FILE_ASYNC,
+                                  base::PLATFORM_FILE_ASYNC,
                                   NULL);
 }
 
 uint32 EntryImpl::GetHash() {
   return entry_.Data()->hash;
 }
 
 bool EntryImpl::CreateEntry(Addr node_address, const std::string& key,
                             uint32 hash) {
   Trace("Create entry In");
@@ skipping 54 matching lines @@
   if (!node_.Data()->dirty) {
     node_.Data()->dirty = backend_->GetCurrentEntryId();
     node_.Store();
   }
   doomed_ = true;
 }
 
 void EntryImpl::DeleteEntryData(bool everything) {
   DCHECK(doomed_ || !everything);
 
-  UMA_HISTOGRAM_COUNTS("DiskCache.DeleteHeader", GetDataSize(0));
-  UMA_HISTOGRAM_COUNTS("DiskCache.DeleteData", GetDataSize(1));
+  if (GetDataSize(0))
+    UMA_HISTOGRAM_COUNTS("DiskCache.DeleteHeader", GetDataSize(0));
+  if (GetDataSize(1))
+    UMA_HISTOGRAM_COUNTS("DiskCache.DeleteData", GetDataSize(1));
   for (int index = 0; index < NUM_STREAMS; index++) {
     Addr address(entry_.Data()->data_addr[index]);
     if (address.is_initialized()) {
       DeleteData(address, index);
       backend_->ModifyStorageSize(entry_.Data()->data_size[index] -
                                       unreported_size_[index], 0);
+      entry_.Data()->data_addr[index] = 0;
+      entry_.Data()->data_size[index] = 0;
     }
   }
 
-  if (!everything)
+  if (!everything) {
+    entry_.Store();
     return;
+  }
 
   // Remove all traces of this entry.
   backend_->RemoveEntry(this);
 
   Addr address(entry_.Data()->long_key);
   DeleteData(address, kKeyFileIndex);
   backend_->ModifyStorageSize(entry_.Data()->key_len, 0);
 
   memset(node_.buffer(), 0, node_.size());
   memset(entry_.buffer(), 0, entry_.size());
@@ skipping 359 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