summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 17:52:40 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 17:52:40 +0000
commit6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75 (patch)
tree0d51fc05132bd306f4b03091a32974ff4770cf98 /net/disk_cache
parent26615ae54c78930ca83380df0c1320caba826193 (diff)
downloadchromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.zip
chromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.tar.gz
chromium_src-6e3a23d8a7ffc9afc3488b3f9db0d498692a2e75.tar.bz2
Disk cache: Fix back some style changes made recently.
No real code change. BUG=none TEST=none R=rsleevi@chromium.org Review URL: https://codereview.chromium.org/16916002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r--net/disk_cache/cache_creator.cc4
-rw-r--r--net/disk_cache/disk_cache_perftest.cc53
-rw-r--r--net/disk_cache/in_flight_backend_io.cc24
-rw-r--r--net/disk_cache/mem_entry_impl.cc15
-rw-r--r--net/disk_cache/sparse_control.cc63
-rw-r--r--net/disk_cache/stress_cache.cc10
6 files changed, 52 insertions, 117 deletions
diff --git a/net/disk_cache/cache_creator.cc b/net/disk_cache/cache_creator.cc
index 5a7e7e2..8384f82 100644
--- a/net/disk_cache/cache_creator.cc
+++ b/net/disk_cache/cache_creator.cc
@@ -84,8 +84,8 @@ int CacheCreator::Run() {
// appropriate.
if (backend_type_ == net::CACHE_BACKEND_SIMPLE && type_ == net::DISK_CACHE) {
disk_cache::SimpleBackendImpl* simple_cache =
- new disk_cache::SimpleBackendImpl(
- path_, max_bytes_, type_, thread_.get(), net_log_);
+ new disk_cache::SimpleBackendImpl(path_, max_bytes_, type_,
+ thread_.get(), net_log_);
created_cache_ = simple_cache;
return simple_cache->Init(
base::Bind(&CacheCreator::OnIOComplete, base::Unretained(this)));
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 1d6bfd6..4aa7eca 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -67,24 +67,16 @@ bool TimeWrite(int num_entries, disk_cache::Backend* cache,
if (net::OK != cb.GetResult(rv))
break;
int ret = cache_entry->WriteData(
- 0,
- 0,
- buffer1.get(),
- kSize1,
- base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
- false);
+ 0, 0, buffer1.get(), kSize1,
+ base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false);
if (net::ERR_IO_PENDING == ret)
expected++;
else if (kSize1 != ret)
break;
ret = cache_entry->WriteData(
- 1,
- 0,
- buffer2.get(),
- entry.data_len,
- base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
- false);
+ 1, 0, buffer2.get(), entry.data_len,
+ base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false);
if (net::ERR_IO_PENDING == ret)
expected++;
else if (entry.data_len != ret)
@@ -124,10 +116,7 @@ bool TimeRead(int num_entries, disk_cache::Backend* cache,
if (net::OK != cb.GetResult(rv))
break;
int ret = cache_entry->ReadData(
- 0,
- 0,
- buffer1.get(),
- kSize1,
+ 0, 0, buffer1.get(), kSize1,
base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
if (net::ERR_IO_PENDING == ret)
expected++;
@@ -135,10 +124,7 @@ bool TimeRead(int num_entries, disk_cache::Backend* cache,
break;
ret = cache_entry->ReadData(
- 1,
- 0,
- buffer2.get(),
- entries[i].data_len,
+ 1, 0, buffer2.get(), entries[i].data_len,
base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
if (net::ERR_IO_PENDING == ret)
expected++;
@@ -175,21 +161,14 @@ TEST_F(DiskCacheTest, Hash) {
TEST_F(DiskCacheTest, CacheBackendPerformance) {
base::Thread cache_thread("CacheThread");
ASSERT_TRUE(cache_thread.StartWithOptions(
- base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
+ base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
ASSERT_TRUE(CleanupCacheDir());
net::TestCompletionCallback cb;
disk_cache::Backend* cache;
- int rv =
- disk_cache::CreateCacheBackend(net::DISK_CACHE,
- net::CACHE_BACKEND_BLOCKFILE,
- cache_path_,
- 0,
- false,
- cache_thread.message_loop_proxy().get(),
- NULL,
- &cache,
- cb.callback());
+ int rv = disk_cache::CreateCacheBackend(
+ net::DISK_CACHE, net::CACHE_BACKEND_BLOCKFILE, cache_path_, 0, false,
+ cache_thread.message_loop_proxy().get(), NULL, &cache, cb.callback());
ASSERT_EQ(net::OK, cb.GetResult(rv));
@@ -215,15 +194,9 @@ TEST_F(DiskCacheTest, CacheBackendPerformance) {
ASSERT_TRUE(file_util::EvictFileFromSystemCache(
cache_path_.AppendASCII("data_3")));
- rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
- net::CACHE_BACKEND_BLOCKFILE,
- cache_path_,
- 0,
- false,
- cache_thread.message_loop_proxy().get(),
- NULL,
- &cache,
- cb.callback());
+ rv = disk_cache::CreateCacheBackend(
+ net::DISK_CACHE, net::CACHE_BACKEND_BLOCKFILE, cache_path_, 0, false,
+ cache_thread.message_loop_proxy().get(), NULL, &cache, cb.callback());
ASSERT_EQ(net::OK, cb.GetResult(rv));
EXPECT_TRUE(TimeRead(num_entries, cache, entries, true));
diff --git a/net/disk_cache/in_flight_backend_io.cc b/net/disk_cache/in_flight_backend_io.cc
index bc7a335..3ed9e4d 100644
--- a/net/disk_cache/in_flight_backend_io.cc
+++ b/net/disk_cache/in_flight_backend_io.cc
@@ -288,34 +288,24 @@ void BackendIO::ExecuteEntryOperation() {
switch (operation_) {
case OP_READ:
result_ =
- entry_->ReadDataImpl(index_,
- offset_,
- buf_.get(),
- buf_len_,
+ entry_->ReadDataImpl(index_, offset_, buf_.get(), buf_len_,
base::Bind(&BackendIO::OnIOComplete, this));
break;
case OP_WRITE:
result_ =
- entry_->WriteDataImpl(index_,
- offset_,
- buf_.get(),
- buf_len_,
+ entry_->WriteDataImpl(index_, offset_, buf_.get(), buf_len_,
base::Bind(&BackendIO::OnIOComplete, this),
truncate_);
break;
case OP_READ_SPARSE:
result_ = entry_->ReadSparseDataImpl(
- offset64_,
- buf_.get(),
- buf_len_,
- base::Bind(&BackendIO::OnIOComplete, this));
+ offset64_, buf_.get(), buf_len_,
+ base::Bind(&BackendIO::OnIOComplete, this));
break;
case OP_WRITE_SPARSE:
result_ = entry_->WriteSparseDataImpl(
- offset64_,
- buf_.get(),
- buf_len_,
- base::Bind(&BackendIO::OnIOComplete, this));
+ offset64_, buf_.get(), buf_len_,
+ base::Bind(&BackendIO::OnIOComplete, this));
break;
case OP_GET_RANGE:
result_ = entry_->GetAvailableRangeImpl(offset64_, buf_len_, start_);
@@ -326,7 +316,7 @@ void BackendIO::ExecuteEntryOperation() {
break;
case OP_IS_READY:
result_ = entry_->ReadyForSparseIOImpl(
- base::Bind(&BackendIO::OnIOComplete, this));
+ base::Bind(&BackendIO::OnIOComplete, this));
break;
default:
NOTREACHED() << "Invalid Operation";
diff --git a/net/disk_cache/mem_entry_impl.cc b/net/disk_cache/mem_entry_impl.cc
index 6bfaa29..dfd8ee6 100644
--- a/net/disk_cache/mem_entry_impl.cc
+++ b/net/disk_cache/mem_entry_impl.cc
@@ -378,11 +378,8 @@ int MemEntryImpl::InternalReadSparseData(int64 offset, IOBuffer* buf,
CreateNetLogSparseReadWriteCallback(child->net_log().source(),
io_buf->BytesRemaining()));
}
- int ret = child->ReadData(kSparseData,
- child_offset,
- io_buf.get(),
- io_buf->BytesRemaining(),
- CompletionCallback());
+ int ret = child->ReadData(kSparseData, child_offset, io_buf.get(),
+ io_buf->BytesRemaining(), CompletionCallback());
if (net_log_.IsLoggingAllEvents()) {
net_log_.EndEventWithNetErrorCode(
net::NetLog::TYPE_SPARSE_READ_CHILD_DATA, ret);
@@ -443,12 +440,8 @@ int MemEntryImpl::InternalWriteSparseData(int64 offset, IOBuffer* buf,
// previously written.
// TODO(hclam): if there is data in the entry and this write is not
// continuous we may want to discard this write.
- int ret = child->WriteData(kSparseData,
- child_offset,
- io_buf.get(),
- write_len,
- CompletionCallback(),
- true);
+ int ret = child->WriteData(kSparseData, child_offset, io_buf.get(),
+ write_len, CompletionCallback(), true);
if (net_log_.IsLoggingAllEvents()) {
net_log_.EndEventWithNetErrorCode(
net::NetLog::TYPE_SPARSE_WRITE_CHILD_DATA, ret);
diff --git a/net/disk_cache/sparse_control.cc b/net/disk_cache/sparse_control.cc
index ccf41e3..2894cb1 100644
--- a/net/disk_cache/sparse_control.cc
+++ b/net/disk_cache/sparse_control.cc
@@ -351,8 +351,8 @@ void SparseControl::DeleteChildren(EntryImpl* entry) {
entry->net_log().AddEvent(net::NetLog::TYPE_SPARSE_DELETE_CHILDREN);
DCHECK(entry->backend_.get());
- ChildrenDeleter* deleter =
- new ChildrenDeleter(entry->backend_.get(), entry->GetKey());
+ ChildrenDeleter* deleter = new ChildrenDeleter(entry->backend_.get(),
+ entry->GetKey());
// The object will self destruct when finished.
deleter->AddRef();
@@ -383,12 +383,8 @@ int SparseControl::CreateSparseEntry() {
scoped_refptr<net::IOBuffer> buf(
new net::WrappedIOBuffer(reinterpret_cast<char*>(&sparse_header_)));
- int rv = entry_->WriteData(kSparseIndex,
- 0,
- buf.get(),
- sizeof(sparse_header_),
- CompletionCallback(),
- false);
+ int rv = entry_->WriteData(kSparseIndex, 0, buf.get(), sizeof(sparse_header_),
+ CompletionCallback(), false);
if (rv != sizeof(sparse_header_)) {
DLOG(ERROR) << "Unable to save sparse_header_";
return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
@@ -418,8 +414,8 @@ int SparseControl::OpenSparseEntry(int data_len) {
new net::WrappedIOBuffer(reinterpret_cast<char*>(&sparse_header_)));
// Read header.
- int rv = entry_->ReadData(
- kSparseIndex, 0, buf.get(), sizeof(sparse_header_), CompletionCallback());
+ int rv = entry_->ReadData(kSparseIndex, 0, buf.get(), sizeof(sparse_header_),
+ CompletionCallback());
if (rv != static_cast<int>(sizeof(sparse_header_)))
return net::ERR_CACHE_READ_FAILURE;
@@ -432,11 +428,8 @@ int SparseControl::OpenSparseEntry(int data_len) {
// Read the actual bitmap.
buf = new net::IOBuffer(map_len);
- rv = entry_->ReadData(kSparseIndex,
- sizeof(sparse_header_),
- buf.get(),
- map_len,
- CompletionCallback());
+ rv = entry_->ReadData(kSparseIndex, sizeof(sparse_header_), buf.get(),
+ map_len, CompletionCallback());
if (rv != map_len)
return net::ERR_CACHE_READ_FAILURE;
@@ -478,8 +471,8 @@ bool SparseControl::OpenChild() {
new net::WrappedIOBuffer(reinterpret_cast<char*>(&child_data_)));
// Read signature.
- int rv = child_->ReadData(
- kSparseIndex, 0, buf.get(), sizeof(child_data_), CompletionCallback());
+ int rv = child_->ReadData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
+ CompletionCallback());
if (rv != sizeof(child_data_))
return KillChildAndContinue(key, true); // This is a fatal failure.
@@ -502,12 +495,8 @@ void SparseControl::CloseChild() {
new net::WrappedIOBuffer(reinterpret_cast<char*>(&child_data_)));
// Save the allocation bitmap before closing the child entry.
- int rv = child_->WriteData(kSparseIndex,
- 0,
- buf.get(),
- sizeof(child_data_),
- CompletionCallback(),
- false);
+ int rv = child_->WriteData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
+ CompletionCallback(), false);
if (rv != sizeof(child_data_))
DLOG(ERROR) << "Failed to save child data";
child_->Release();
@@ -576,12 +565,8 @@ void SparseControl::WriteSparseData() {
reinterpret_cast<const char*>(children_map_.GetMap())));
int len = children_map_.ArraySize() * 4;
- int rv = entry_->WriteData(kSparseIndex,
- sizeof(sparse_header_),
- buf.get(),
- len,
- CompletionCallback(),
- false);
+ int rv = entry_->WriteData(kSparseIndex, sizeof(sparse_header_), buf.get(),
+ len, CompletionCallback(), false);
if (rv != len) {
DLOG(ERROR) << "Unable to save sparse map";
}
@@ -684,12 +669,8 @@ void SparseControl::InitChildData() {
scoped_refptr<net::WrappedIOBuffer> buf(
new net::WrappedIOBuffer(reinterpret_cast<char*>(&child_data_)));
- int rv = child_->WriteData(kSparseIndex,
- 0,
- buf.get(),
- sizeof(child_data_),
- CompletionCallback(),
- false);
+ int rv = child_->WriteData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
+ CompletionCallback(), false);
if (rv != sizeof(child_data_))
DLOG(ERROR) << "Failed to save child data";
SetChildBit(true);
@@ -744,8 +725,8 @@ bool SparseControl::DoChildIO() {
CreateNetLogSparseReadWriteCallback(child_->net_log().source(),
child_len_));
}
- rv = child_->ReadDataImpl(
- kSparseData, child_offset_, user_buf_.get(), child_len_, callback);
+ rv = child_->ReadDataImpl(kSparseData, child_offset_, user_buf_.get(),
+ child_len_, callback);
break;
case kWriteOperation:
if (entry_->net_log().IsLoggingAllEvents()) {
@@ -754,12 +735,8 @@ bool SparseControl::DoChildIO() {
CreateNetLogSparseReadWriteCallback(child_->net_log().source(),
child_len_));
}
- rv = child_->WriteDataImpl(kSparseData,
- child_offset_,
- user_buf_.get(),
- child_len_,
- callback,
- false);
+ rv = child_->WriteDataImpl(kSparseData, child_offset_, user_buf_.get(),
+ child_len_, callback, false);
break;
case kGetRangeOperation:
rv = DoGetAvailableRange();
diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index ef257a7..65eb01a 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -111,8 +111,10 @@ void StressTheCache(int iteration) {
base::Thread::Options(base::MessageLoop::TYPE_IO, 0)))
return;
- disk_cache::BackendImpl* cache = new disk_cache::BackendImpl(
- path, mask, cache_thread.message_loop_proxy().get(), NULL);
+ disk_cache::BackendImpl* cache =
+ new disk_cache::BackendImpl(path, mask,
+ cache_thread.message_loop_proxy().get(),
+ NULL);
cache->SetMaxSize(cache_size);
cache->SetFlags(disk_cache::kNoLoadProtection);
@@ -167,8 +169,8 @@ void StressTheCache(int iteration) {
base::snprintf(buffer->data(), kSize,
"i: %d iter: %d, size: %d, truncate: %d ", i, iteration,
size, truncate ? 1 : 0);
- rv = entries[slot]
- ->WriteData(0, 0, buffer.get(), size, cb.callback(), truncate);
+ rv = entries[slot]->WriteData(0, 0, buffer.get(), size, cb.callback(),
+ truncate);
CHECK_EQ(size, cb.GetResult(rv));
if (rand() % 100 > 80) {
generated by cgit v1.1 at 2025-03-12 20:23:37 +0000