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

Side by Side Diff: net/disk_cache/disk_cache_perftest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | net/disk_cache/entry_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/hash.h" 10 #include "base/hash.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 entry.key = GenerateKey(true); 60 entry.key = GenerateKey(true);
61 entry.data_len = rand() % kMaxSize; 61 entry.data_len = rand() % kMaxSize;
62 entries->push_back(entry); 62 entries->push_back(entry);
63 63
64 disk_cache::Entry* cache_entry; 64 disk_cache::Entry* cache_entry;
65 net::TestCompletionCallback cb; 65 net::TestCompletionCallback cb;
66 int rv = cache->CreateEntry(entry.key, &cache_entry, cb.callback()); 66 int rv = cache->CreateEntry(entry.key, &cache_entry, cb.callback());
67 if (net::OK != cb.GetResult(rv)) 67 if (net::OK != cb.GetResult(rv))
68 break; 68 break;
69 int ret = cache_entry->WriteData( 69 int ret = cache_entry->WriteData(
70 0, 0, buffer1, kSize1, 70 0,
71 base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false); 71 0,
72 buffer1.get(),
73 kSize1,
74 base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
75 false);
72 if (net::ERR_IO_PENDING == ret) 76 if (net::ERR_IO_PENDING == ret)
73 expected++; 77 expected++;
74 else if (kSize1 != ret) 78 else if (kSize1 != ret)
75 break; 79 break;
76 80
77 ret = cache_entry->WriteData( 81 ret = cache_entry->WriteData(
78 1, 0, buffer2, entry.data_len, 82 1,
79 base::Bind(&CallbackTest::Run, base::Unretained(&callback)), false); 83 0,
84 buffer2.get(),
85 entry.data_len,
86 base::Bind(&CallbackTest::Run, base::Unretained(&callback)),
87 false);
80 if (net::ERR_IO_PENDING == ret) 88 if (net::ERR_IO_PENDING == ret)
81 expected++; 89 expected++;
82 else if (entry.data_len != ret) 90 else if (entry.data_len != ret)
83 break; 91 break;
84 cache_entry->Close(); 92 cache_entry->Close();
85 } 93 }
86 94
87 helper.WaitUntilCacheIoFinished(expected); 95 helper.WaitUntilCacheIoFinished(expected);
88 timer.Done(); 96 timer.Done();
89 97
(...skipping 19 matching lines...) Expand all
109 "Read disk cache entries (warm)"; 117 "Read disk cache entries (warm)";
110 PerfTimeLogger timer(message); 118 PerfTimeLogger timer(message);
111 119
112 for (int i = 0; i < num_entries; i++) { 120 for (int i = 0; i < num_entries; i++) {
113 disk_cache::Entry* cache_entry; 121 disk_cache::Entry* cache_entry;
114 net::TestCompletionCallback cb; 122 net::TestCompletionCallback cb;
115 int rv = cache->OpenEntry(entries[i].key, &cache_entry, cb.callback()); 123 int rv = cache->OpenEntry(entries[i].key, &cache_entry, cb.callback());
116 if (net::OK != cb.GetResult(rv)) 124 if (net::OK != cb.GetResult(rv))
117 break; 125 break;
118 int ret = cache_entry->ReadData( 126 int ret = cache_entry->ReadData(
119 0, 0, buffer1, kSize1, 127 0,
128 0,
129 buffer1.get(),
130 kSize1,
120 base::Bind(&CallbackTest::Run, base::Unretained(&callback))); 131 base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
121 if (net::ERR_IO_PENDING == ret) 132 if (net::ERR_IO_PENDING == ret)
122 expected++; 133 expected++;
123 else if (kSize1 != ret) 134 else if (kSize1 != ret)
124 break; 135 break;
125 136
126 ret = cache_entry->ReadData( 137 ret = cache_entry->ReadData(
127 1, 0, buffer2, entries[i].data_len, 138 1,
139 0,
140 buffer2.get(),
141 entries[i].data_len,
128 base::Bind(&CallbackTest::Run, base::Unretained(&callback))); 142 base::Bind(&CallbackTest::Run, base::Unretained(&callback)));
129 if (net::ERR_IO_PENDING == ret) 143 if (net::ERR_IO_PENDING == ret)
130 expected++; 144 expected++;
131 else if (entries[i].data_len != ret) 145 else if (entries[i].data_len != ret)
132 break; 146 break;
133 cache_entry->Close(); 147 cache_entry->Close();
134 } 148 }
135 149
136 helper.WaitUntilCacheIoFinished(expected); 150 helper.WaitUntilCacheIoFinished(expected);
137 timer.Done(); 151 timer.Done();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 257
244 files.DeleteBlock(address[entry], false); 258 files.DeleteBlock(address[entry], false);
245 EXPECT_TRUE(files.CreateBlock(disk_cache::RANKINGS, BlockSize(), 259 EXPECT_TRUE(files.CreateBlock(disk_cache::RANKINGS, BlockSize(),
246 &address[entry])); 260 &address[entry]));
247 } 261 }
248 262
249 timer2.Done(); 263 timer2.Done();
250 base::MessageLoop::current()->RunUntilIdle(); 264 base::MessageLoop::current()->RunUntilIdle();
251 delete[] address; 265 delete[] address;
252 } 266 }
OLDNEW
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | net/disk_cache/entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698