Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1260)

Unified Diff: net/disk_cache/simple/simple_synchronous_entry.cc

Issue 12226095: Make synchronous methods on disk_cache::SimpleEntryImpl() reentrant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add TODO(felipeg) Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/disk_cache/simple/simple_synchronous_entry.cc
diff --git a/net/disk_cache/simple/simple_synchronous_entry.cc b/net/disk_cache/simple/simple_synchronous_entry.cc
index 9c65ce1f1e1cafb22edd36c9c0406b908a47d94f..d2a9fbd8c1cf7d63bff0dffb4a85179aca53b2ff 100644
--- a/net/disk_cache/simple/simple_synchronous_entry.cc
+++ b/net/disk_cache/simple/simple_synchronous_entry.cc
@@ -17,7 +17,6 @@
#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;
@@ -102,7 +101,7 @@ void SimpleSynchronousEntry::DoomEntry(
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);
@@ -124,7 +123,7 @@ void SimpleSynchronousEntry::DoomAndClose() {
}
void SimpleSynchronousEntry::Close() {
- for (int i = 0; i < kIndexCount; ++i) {
+ for (int i = 0; i < kSimpleEntryFileCount; ++i) {
bool result = ClosePlatformFile(files_[i]);
DCHECK(result);
}
@@ -209,7 +208,7 @@ 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)
@@ -227,7 +226,7 @@ bool SimpleSynchronousEntry::OpenOrCreateFiles(bool create) {
}
}
- 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);
@@ -243,7 +242,7 @@ bool SimpleSynchronousEntry::InitializeForOpen() {
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)) {
@@ -301,7 +300,7 @@ bool SimpleSynchronousEntry::InitializeForCreate() {
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;

Powered by Google App Engine
This is Rietveld 408576698