Make synchronous methods on disk_cache::SimpleEntryImpl() reentrant.

net/disk_cache/simple/simple_synchronous_entry.cc

 // Copyright (c) 2013 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/simple/simple_synchronous_entry.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/hash.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/sha1.h"
 #include "base/stringprintf.h"
 #include "base/task_runner.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "net/disk_cache/simple/simple_disk_format.h"
 
 using base::ClosePlatformFile;
 using base::GetPlatformFileInfo;
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 using base::PLATFORM_FILE_CREATE_ALWAYS;
 using base::PLATFORM_FILE_OK;
 using base::PLATFORM_FILE_OPEN;
 using base::PLATFORM_FILE_READ;
 using base::PLATFORM_FILE_WRITE;
@@ skipping 64 matching lines @@
                             base::Bind(callback, sync_entry,
                                        sync_entry ? net::OK : net::ERR_FAILED));
 }
 
 // static
 void SimpleSynchronousEntry::DoomEntry(
     const FilePath& path,
     const std::string& key,
     scoped_refptr<TaskRunner> callback_runner,
     const net::CompletionCallback& callback) {
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     bool delete_result =
         file_util::Delete(path.AppendASCII(GetFilenameForKeyAndIndex(key, i)),
                           false);
     DCHECK(delete_result);
   }
   if (!callback.is_null())
     callback_runner->PostTask(FROM_HERE, base::Bind(callback, net::OK));
 }
 
 void SimpleSynchronousEntry::DoomAndClose() {
   scoped_refptr<TaskRunner> callback_runner = callback_runner_;
   FilePath path = path_;
   std::string key = key_;
 
   Close();
   // |this| is now deleted.
 
   DoomEntry(path, key, callback_runner, net::CompletionCallback());
 }
 
 void SimpleSynchronousEntry::Close() {
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     bool result = ClosePlatformFile(files_[i]);
     DCHECK(result);
   }
   delete this;
 }
 
 void SimpleSynchronousEntry::ReadData(
     int index,
     int offset,
     net::IOBuffer* buf,
@@ skipping 64 matching lines @@
     const std::string& key) : callback_runner_(callback_runner),
                               path_(path),
                               key_(key),
                               initialized_(false) {
 }
 
 SimpleSynchronousEntry::~SimpleSynchronousEntry() {
 }
 
 bool SimpleSynchronousEntry::OpenOrCreateFiles(bool create) {
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     FilePath filename = path_.AppendASCII(GetFilenameForKeyAndIndex(key_, i));
     int flags = PLATFORM_FILE_READ | PLATFORM_FILE_WRITE;
     if (create)
       flags |= PLATFORM_FILE_CREATE_ALWAYS;
     else
       flags |= PLATFORM_FILE_OPEN;
     PlatformFileError error;
     files_[i] = CreatePlatformFile(filename, flags, NULL, &error);
     if (error != PLATFORM_FILE_OK) {
       while (--i >= 0) {
         bool did_close = ClosePlatformFile(files_[i]);
         DCHECK(did_close);
       }
       return false;
     }
   }
 
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     PlatformFileInfo file_info;
     CHECK(GetPlatformFileInfo(files_[i], &file_info));
     last_used_ = std::max(last_used_, file_info.last_accessed);
     last_modified_ = std::max(last_modified_, file_info.last_modified);
     data_size_[i] = DataSizeFromKeyAndFileSize(key_.size(), file_info.size);
   }
 
   return true;
 }
 
 bool SimpleSynchronousEntry::InitializeForOpen() {
   DCHECK(!initialized_);
   if (!OpenOrCreateFiles(false))
     return false;
 
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     SimpleFileHeader header;
     if (ReadPlatformFile(files_[i], 0, reinterpret_cast<char*>(&header),
                          sizeof(header)) != sizeof(header)) {
       return false;
     }
 
     if (header.initial_magic_number != kSimpleInitialMagicNumber) {
       // TODO(gavinp): This seems very bad; for now we log at WARNING, but we
       // should give consideration to not saturating the log with these if that
       // becomes a problem.
@@ skipping 37 matching lines @@
   return true;
 }
 
 bool SimpleSynchronousEntry::InitializeForCreate() {
   DCHECK(!initialized_);
   if (!OpenOrCreateFiles(true)) {
     LOG(ERROR) << "Could not create platform files for key " << key_;
     return false;
   }
 
-  for (int i = 0; i < kIndexCount; ++i) {
+  for (int i = 0; i < kSimpleEntryFileCount; ++i) {
     SimpleFileHeader header;
     header.initial_magic_number = kSimpleInitialMagicNumber;
     header.version = kSimpleVersion;
 
     header.key_length = key_.size();
     header.key_hash = base::Hash(key_);
 
     if (WritePlatformFile(files_[i], 0, reinterpret_cast<char*>(&header),
                           sizeof(header)) != sizeof(header)) {
       // TODO(gavinp): Clean up created files.
       LOG(WARNING) << "Could not write headers to new cache entry.";
       return false;
     }
 
     if (WritePlatformFile(files_[i], sizeof(header), key_.data(),
                           key_.size()) != implicit_cast<int>(key_.size())) {
       // TODO(gavinp): Clean up created files.
       LOG(WARNING) << "Could not write keys to new cache entry.";
       return false;
     }
   }
 
   initialized_ = true;
   return true;
 }
 
 }  // namespace disk_cache