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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/disk_cache/blockfile/disk_cache_perftest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/disk_cache/blockfile/block_files_unittest.cc ('k') | net/disk_cache/blockfile/disk_format.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/blockfile/disk_cache_perftest.cc
diff --git a/net/disk_cache/blockfile/disk_cache_perftest.cc b/net/disk_cache/blockfile/disk_cache_perftest.cc
index 571cea2ee25edaec7a7b842d466c0fe0dcb883c1..414aae349f41a4981fcc350c3add887f5266dec1 100644
--- a/net/disk_cache/blockfile/disk_cache_perftest.cc
+++ b/net/disk_cache/blockfile/disk_cache_perftest.cc
@@ -39,8 +39,9 @@ const int kMaxSize = 16 * 1024 - 1;
// Creates num_entries on the cache, and writes 200 bytes of metadata and up
// to kMaxSize of data to each entry.
-bool TimeWrite(int num_entries, disk_cache::Backend* cache,
- TestEntries* entries) {
+bool TimeWrite(int num_entries,
+ disk_cache::Backend* cache,
+ TestEntries* entries) {
const int kSize1 = 200;
scoped_refptr<net::IOBuffer> buffer1(new net::IOBuffer(kSize1));
scoped_refptr<net::IOBuffer> buffer2(new net::IOBuffer(kMaxSize));
@@ -67,16 +68,24 @@ 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)
@@ -91,8 +100,10 @@ bool TimeWrite(int num_entries, disk_cache::Backend* cache,
}
// Reads the data and metadata from each entry listed on |entries|.
-bool TimeRead(int num_entries, disk_cache::Backend* cache,
- const TestEntries& entries, bool cold) {
+bool TimeRead(int num_entries,
+ disk_cache::Backend* cache,
+ const TestEntries& entries,
+ bool cold) {
const int kSize1 = 200;
scoped_refptr<net::IOBuffer> buffer1(new net::IOBuffer(kSize1));
scoped_refptr<net::IOBuffer> buffer2(new net::IOBuffer(kMaxSize));
@@ -105,8 +116,8 @@ bool TimeRead(int num_entries, disk_cache::Backend* cache,
MessageLoopHelper helper;
CallbackTest callback(&helper, true);
- const char* message = cold ? "Read disk cache entries (cold)" :
- "Read disk cache entries (warm)";
+ const char* message = cold ? "Read disk cache entries (cold)"
+ : "Read disk cache entries (warm)";
base::PerfTimeLogger timer(message);
for (int i = 0; i < num_entries; i++) {
@@ -116,7 +127,10 @@ 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++;
@@ -124,7 +138,10 @@ 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++;
@@ -161,14 +178,21 @@ 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;
scoped_ptr<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));
@@ -183,20 +207,25 @@ TEST_F(DiskCacheTest, CacheBackendPerformance) {
base::MessageLoop::current()->RunUntilIdle();
cache.reset();
- ASSERT_TRUE(base::EvictFileFromSystemCache(
- cache_path_.AppendASCII("index")));
- ASSERT_TRUE(base::EvictFileFromSystemCache(
- cache_path_.AppendASCII("data_0")));
- ASSERT_TRUE(base::EvictFileFromSystemCache(
- cache_path_.AppendASCII("data_1")));
- ASSERT_TRUE(base::EvictFileFromSystemCache(
- cache_path_.AppendASCII("data_2")));
- ASSERT_TRUE(base::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());
+ ASSERT_TRUE(base::EvictFileFromSystemCache(cache_path_.AppendASCII("index")));
+ ASSERT_TRUE(
+ base::EvictFileFromSystemCache(cache_path_.AppendASCII("data_0")));
+ ASSERT_TRUE(
+ base::EvictFileFromSystemCache(cache_path_.AppendASCII("data_1")));
+ ASSERT_TRUE(
+ base::EvictFileFromSystemCache(cache_path_.AppendASCII("data_2")));
+ ASSERT_TRUE(
+ base::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());
ASSERT_EQ(net::OK, cb.GetResult(rv));
EXPECT_TRUE(TimeRead(num_entries, cache.get(), entries, true));
@@ -227,8 +256,8 @@ TEST_F(DiskCacheTest, BlockFilesPerformance) {
// Fill up the 32-byte block file (use three files).
for (int i = 0; i < kNumEntries; i++) {
- EXPECT_TRUE(files.CreateBlock(disk_cache::RANKINGS, BlockSize(),
- &address[i]));
+ EXPECT_TRUE(
+ files.CreateBlock(disk_cache::RANKINGS, BlockSize(), &address[i]));
}
timer1.Done();
@@ -240,8 +269,8 @@ TEST_F(DiskCacheTest, BlockFilesPerformance) {
entry = 0;
files.DeleteBlock(address[entry], false);
- EXPECT_TRUE(files.CreateBlock(disk_cache::RANKINGS, BlockSize(),
- &address[entry]));
+ EXPECT_TRUE(
+ files.CreateBlock(disk_cache::RANKINGS, BlockSize(), &address[entry]));
}
timer2.Done();
« net/base/mime_util_unittest.cc ('K') | « net/disk_cache/blockfile/block_files_unittest.cc ('k') | net/disk_cache/blockfile/disk_format.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698