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

Side by Side Diff: net/disk_cache/v3/block_bitmaps.cc

Issue 17816008: Disk cache: Introduce BlockBitmaps for V3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/disk_cache/block_files.h" 5 #include "net/disk_cache/v3/block_bitmaps.h"
6 6
7 #include "base/atomicops.h"
8 #include "base/file_util.h"
9 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
10 #include "base/strings/string_util.h"
11 #include "base/strings/stringprintf.h"
12 #include "base/threading/thread_checker.h"
13 #include "base/time/time.h" 8 #include "base/time/time.h"
14 #include "net/disk_cache/cache_util.h" 9 #include "net/disk_cache/disk_format_base.h"
15 #include "net/disk_cache/file_lock.h"
16 #include "net/disk_cache/trace.h" 10 #include "net/disk_cache/trace.h"
17 11
18 using base::TimeTicks; 12 using base::TimeTicks;
19 13
20 namespace disk_cache { 14 namespace disk_cache {
21 15
22 BlockFiles::BlockFiles(const base::FilePath& path) 16 BlockBitmaps::BlockBitmaps() {
23 : init_(false), zero_buffer_(NULL), path_(path) {
24 } 17 }
25 18
26 BlockFiles::~BlockFiles() { 19 BlockBitmaps::~BlockBitmaps() {
27 if (zero_buffer_)
28 delete[] zero_buffer_;
29 CloseFiles();
30 } 20 }
31 21
32 bool BlockFiles::Init(bool create_files) { 22 void BlockBitmaps::Init(const BlockFilesBitmaps& bitmaps) {
33 DCHECK(!init_); 23 bitmaps_ = bitmaps;
34 if (init_) 24 }
25
26 bool BlockBitmaps::CreateBlock(FileType block_type,
27 int block_count,
28 Addr* block_address) {
29 DCHECK_NE(block_type, EXTERNAL);
30 DCHECK_NE(block_type, RANKINGS);
31 if (block_count < 1 || block_count > kMaxNumBlocks)
35 return false; 32 return false;
36 33
37 thread_checker_.reset(new base::ThreadChecker); 34 int header_num = HeaderNumberForNewBlock(block_type, block_count);
38 35 if (header_num < 0)
39 block_files_.resize(kFirstAdditionalBlockFile);
40 for (int i = 0; i < kFirstAdditionalBlockFile; i++) {
41 if (create_files)
42 if (!CreateBlockFile(i, static_cast<FileType>(i + 1), true))
43 return false;
44
45 if (!OpenBlockFile(i))
46 return false;
47
48 // Walk this chain of files removing empty ones.
49 if (!RemoveEmptyFile(static_cast<FileType>(i + 1)))
50 return false;
51 }
52
53 init_ = true;
54 return true;
55 }
56
57 bool BlockFiles::CreateBlock(FileType block_type, int block_count,
58 Addr* block_address) {
59 DCHECK(thread_checker_->CalledOnValidThread());
60 if (block_type < RANKINGS || block_type > BLOCK_4K ||
61 block_count < 1 || block_count > 4)
62 return false;
63 if (!init_)
64 return false; 36 return false;
65 37
66 MappedFile* file = FileForNewBlock(block_type, block_count);
67 if (!file)
68 return false;
69
70 ScopedFlush flush(file);
71 BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer());
72
73 int target_size = 0; 38 int target_size = 0;
74 for (int i = block_count; i <= 4; i++) { 39 for (int i = block_count; i <= kMaxNumBlocks; i++) {
75 if (header->empty[i - 1]) { 40 if (bitmaps_[header_num].Header()->empty[i - 1]) {
76 target_size = i; 41 target_size = i;
77 break; 42 break;
78 } 43 }
79 } 44 }
80 45
81 DCHECK(target_size); 46 DCHECK(target_size);
82 int index; 47 int index;
83 if (!CreateMapBlock(target_size, block_count, header, &index)) 48 if (!bitmaps_[header_num].CreateMapBlock(target_size, block_count, &index))
84 return false; 49 return false;
85 50
86 Addr address(block_type, block_count, header->this_file, index); 51 if (!index && (block_type == BLOCK_ENTRIES || block_type == BLOCK_EVICTED) &&
52 !bitmaps_[header_num].CreateMapBlock(target_size, block_count, &index)) {
53 // index 0 for entries is a reserved value.
54 return false;
55 }
56
57 Addr address(block_type, block_count,
58 bitmaps_[header_num].Header()->this_file, index);
87 block_address->set_value(address.value()); 59 block_address->set_value(address.value());
88 Trace("CreateBlock 0x%x", address.value()); 60 Trace("CreateBlock 0x%x", address.value());
89 return true; 61 return true;
90 } 62 }
91 63
92 void BlockFiles::DeleteBlock(Addr address, bool deep) { 64 void BlockBitmaps::DeleteBlock(Addr address) {
93 DCHECK(thread_checker_->CalledOnValidThread());
94 if (!address.is_initialized() || address.is_separate_file()) 65 if (!address.is_initialized() || address.is_separate_file())
95 return; 66 return;
96 67
97 if (!zero_buffer_) { 68 int header_num = GetHeaderNumber(address);
98 zero_buffer_ = new char[Addr::BlockSizeForFileType(BLOCK_4K) * 4]; 69 if (header_num < 0)
99 memset(zero_buffer_, 0, Addr::BlockSizeForFileType(BLOCK_4K) * 4);
100 }
101 MappedFile* file = GetFile(address);
102 if (!file)
103 return; 70 return;
104 71
105 Trace("DeleteBlock 0x%x", address.value()); 72 Trace("DeleteBlock 0x%x", address.value());
106 73 bitmaps_[header_num].DeleteMapBlock(address.start_block(),
107 size_t size = address.BlockSize() * address.num_blocks(); 74 address.num_blocks());
108 size_t offset = address.start_block() * address.BlockSize() +
109 kBlockHeaderSize;
110 if (deep)
111 file->Write(zero_buffer_, size, offset);
112
113 BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer());
114 DeleteMapBlock(address.start_block(), address.num_blocks(), header);
115 file->Flush();
116
117 if (!header->num_entries) {
118 // This file is now empty. Let's try to delete it.
119 FileType type = Addr::RequiredFileType(header->entry_size);
120 if (Addr::BlockSizeForFileType(RANKINGS) == header->entry_size)
121 type = RANKINGS;
122 RemoveEmptyFile(type); // Ignore failures.
123 }
124 } 75 }
125 76
126 void BlockFiles::CloseFiles() { 77 void BlockBitmaps::Clear() {
127 if (init_) { 78 bitmaps_.clear();
128 DCHECK(thread_checker_->CalledOnValidThread());
129 }
130 init_ = false;
131 for (unsigned int i = 0; i < block_files_.size(); i++) {
132 if (block_files_[i]) {
133 block_files_[i]->Release();
134 block_files_[i] = NULL;
135 }
136 }
137 block_files_.clear();
138 } 79 }
139 80
140 void BlockFiles::ReportStats() { 81 void BlockBitmaps::ReportStats() {
141 DCHECK(thread_checker_->CalledOnValidThread());
142 int used_blocks[kFirstAdditionalBlockFile]; 82 int used_blocks[kFirstAdditionalBlockFile];
143 int load[kFirstAdditionalBlockFile]; 83 int load[kFirstAdditionalBlockFile];
144 for (int i = 0; i < kFirstAdditionalBlockFile; i++) { 84 for (int i = 0; i < kFirstAdditionalBlockFile; i++) {
145 GetFileStats(i, &used_blocks[i], &load[i]); 85 GetFileStats(i, &used_blocks[i], &load[i]);
146 } 86 }
147 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_0", used_blocks[0]); 87 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_0", used_blocks[0]);
148 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_1", used_blocks[1]); 88 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_1", used_blocks[1]);
149 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_2", used_blocks[2]); 89 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_2", used_blocks[2]);
150 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_3", used_blocks[3]); 90 UMA_HISTOGRAM_COUNTS("DiskCache.Blocks_3", used_blocks[3]);
151 91
152 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_0", load[0], 101); 92 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_0", load[0], 101);
153 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_1", load[1], 101); 93 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_1", load[1], 101);
154 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_2", load[2], 101); 94 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_2", load[2], 101);
155 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_3", load[3], 101); 95 UMA_HISTOGRAM_ENUMERATION("DiskCache.BlockLoad_3", load[3], 101);
156 } 96 }
157 97
158 bool BlockFiles::IsValid(Addr address) { 98 bool BlockBitmaps::IsValid(Addr address) {
159 #ifdef NDEBUG 99 #ifdef NDEBUG
160 return true; 100 return true;
161 #else 101 #else
162 if (!address.is_initialized() || address.is_separate_file()) 102 if (!address.is_initialized() || address.is_separate_file())
163 return false; 103 return false;
164 104
165 MappedFile* file = GetFile(address); 105 int header_num = GetHeaderNumber(address);
166 if (!file) 106 if (header_num < 0)
167 return false; 107 return false;
168 108
169 BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer()); 109 bool rv = bitmaps_[header_num].UsedMapBlock(address.start_block(),
170 bool rv = UsedMapBlock(address.start_block(), address.num_blocks(), header); 110 address.num_blocks());
171 DCHECK(rv); 111 DCHECK(rv);
172
173 static bool read_contents = false;
174 if (read_contents) {
175 scoped_ptr<char[]> buffer;
176 buffer.reset(new char[Addr::BlockSizeForFileType(BLOCK_4K) * 4]);
177 size_t size = address.BlockSize() * address.num_blocks();
178 size_t offset = address.start_block() * address.BlockSize() +
179 kBlockHeaderSize;
180 bool ok = file->Read(buffer.get(), size, offset);
181 DCHECK(ok);
182 }
183
184 return rv; 112 return rv;
185 #endif 113 #endif
186 } 114 }
187 115
188 MappedFile* BlockFiles::GetFile(Addr address) { 116 int BlockBitmaps::GetHeaderNumber(Addr address) {
189 DCHECK(thread_checker_->CalledOnValidThread()); 117 DCHECK_GE(bitmaps_.size(), static_cast<size_t>(kFirstAdditionalBlockFileV3));
190 DCHECK(block_files_.size() >= 4);
191 DCHECK(address.is_block_file() || !address.is_initialized()); 118 DCHECK(address.is_block_file() || !address.is_initialized());
192 if (!address.is_initialized()) 119 if (!address.is_initialized())
193 return NULL; 120 return -1;
194 121
195 int file_index = address.FileNumber(); 122 int file_index = address.FileNumber();
196 if (static_cast<unsigned int>(file_index) >= block_files_.size() || 123 if (static_cast<unsigned int>(file_index) >= bitmaps_.size() ||
197 !block_files_[file_index]) { 124 !bitmaps_[file_index].Header()) {
198 // We need to open the file 125 return -1;
199 if (!OpenBlockFile(file_index))
200 return NULL;
201 } 126 }
202 DCHECK(block_files_.size() >= static_cast<unsigned int>(file_index)); 127 DCHECK_GE(bitmaps_.size(), static_cast<unsigned int>(file_index));
203 return block_files_[file_index]; 128 return file_index;
204 } 129 }
205 130
206 bool BlockFiles::GrowBlockFile(MappedFile* file, BlockFileHeader* header) { 131 int BlockBitmaps::HeaderNumberForNewBlock(FileType block_type,
207 if (kMaxBlocks == header->max_entries) 132 int block_count) {
208 return false; 133 COMPILE_ASSERT(RANKINGS == 1, invalid_file_type);
134 int header_num = block_type - 1;
135 bool found = true;
209 136
210 ScopedFlush flush(file); 137 TimeTicks start = TimeTicks::Now();
211 DCHECK(!header->empty[3]); 138 while (bitmaps_[header_num].NeedToGrowBlockFile(block_count)) {
212 int new_size = header->max_entries + 1024; 139 header_num = bitmaps_[header_num].Header()->next_file;
213 if (new_size > kMaxBlocks) 140 if (!header_num) {
214 new_size = kMaxBlocks; 141 found = false;
215 142 break;
216 int new_size_bytes = new_size * header->entry_size + sizeof(*header);
217
218 if (!file->SetLength(new_size_bytes)) {
219 // Most likely we are trying to truncate the file, so the header is wrong.
220 if (header->updating < 10 && !FixBlockFileHeader(file)) {
221 // If we can't fix the file increase the lock guard so we'll pick it on
222 // the next start and replace it.
223 header->updating = 100;
224 return false;
225 } 143 }
226 return (header->max_entries >= new_size);
227 } 144 }
228 145
229 FileLock lock(header); 146 if (!found) {
230 header->empty[3] = (new_size - header->max_entries) / 4; // 4 blocks entries 147 // Restart the search, looking for any file with space.
231 header->max_entries = new_size; 148 header_num = block_type - 1;
232 149 do {
233 return true; 150 if (bitmaps_[header_num].CanAllocate(block_count))
234 } 151 found = true;
235 152 else
236 MappedFile* BlockFiles::FileForNewBlock(FileType block_type, int block_count) { 153 header_num = bitmaps_[header_num].Header()->next_file;
237 COMPILE_ASSERT(RANKINGS == 1, invalid_file_type); 154 } while (header_num && !found);
238 MappedFile* file = block_files_[block_type - 1]; 155 if (!found) {
239 BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer()); 156 NOTREACHED();
240 157 header_num = -1;
gavinp 2013/08/05 17:06:15 NOTREACHED() is a DCHECK which says this is imposs
rvargas (doing something else) 2013/08/05 19:50:45 See the other comment about crashing the browser.
gavinp 2013/08/06 01:11:02 You should not handle DCHECK() failures.
241 TimeTicks start = TimeTicks::Now();
242 while (NeedToGrowBlockFile(header, block_count)) {
243 if (kMaxBlocks == header->max_entries) {
244 file = NextFile(file);
245 if (!file)
246 return NULL;
247 header = reinterpret_cast<BlockFileHeader*>(file->buffer());
248 continue;
249 } 158 }
250
251 if (!GrowBlockFile(file, header))
252 return NULL;
253 break;
254 }
255 HISTOGRAM_TIMES("DiskCache.GetFileForNewBlock", TimeTicks::Now() - start);
256 return file;
257 }
258
259 // Note that we expect to be called outside of a FileLock... however, we cannot
260 // DCHECK on header->updating because we may be fixing a crash.
261 bool BlockFiles::FixBlockFileHeader(MappedFile* file) {
262 ScopedFlush flush(file);
263 BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer());
264 int file_size = static_cast<int>(file->GetLength());
265 if (file_size < static_cast<int>(sizeof(*header)))
266 return false; // file_size > 2GB is also an error.
267
268 const int kMinBlockSize = 36;
269 const int kMaxBlockSize = 4096;
270 if (header->entry_size < kMinBlockSize ||
271 header->entry_size > kMaxBlockSize || header->num_entries < 0)
272 return false;
273
274 // Make sure that we survive crashes.
275 header->updating = 1;
276 int expected = header->entry_size * header->max_entries + sizeof(*header);
277 if (file_size != expected) {
278 int max_expected = header->entry_size * kMaxBlocks + sizeof(*header);
279 if (file_size < expected || header->empty[3] || file_size > max_expected) {
280 NOTREACHED();
281 LOG(ERROR) << "Unexpected file size";
282 return false;
283 }
284 // We were in the middle of growing the file.
285 int num_entries = (file_size - sizeof(*header)) / header->entry_size;
286 header->max_entries = num_entries;
287 } 159 }
288 160
289 FixAllocationCounters(header); 161 HISTOGRAM_TIMES("DiskCache.GetFileForNewBlock", TimeTicks::Now() - start);
290 int empty_blocks = EmptyBlocks(header); 162 return header_num;
291 if (empty_blocks + header->num_entries > header->max_entries)
292 header->num_entries = header->max_entries - empty_blocks;
293
294 if (!ValidateCounters(header))
295 return false;
296
297 header->updating = 0;
298 return true;
299 } 163 }
300 164
301 // We are interested in the total number of blocks used by this file type, and 165 // We are interested in the total number of blocks used by this file type, and
302 // the max number of blocks that we can store (reported as the percentage of 166 // the max number of blocks that we can store (reported as the percentage of
303 // used blocks). In order to find out the number of used blocks, we have to 167 // used blocks). In order to find out the number of used blocks, we have to
304 // substract the empty blocks from the total blocks for each file in the chain. 168 // substract the empty blocks from the total blocks for each file in the chain.
305 void BlockFiles::GetFileStats(int index, int* used_count, int* load) { 169 void BlockBitmaps::GetFileStats(int index, int* used_count, int* load) {
306 int max_blocks = 0; 170 int max_blocks = 0;
307 *used_count = 0; 171 *used_count = 0;
308 *load = 0; 172 *load = 0;
309 for (;;) { 173 for (;;) {
310 if (!block_files_[index] && !OpenBlockFile(index)) 174 BlockFileHeader* header = bitmaps_[index].Header();
311 return;
312
313 BlockFileHeader* header =
314 reinterpret_cast<BlockFileHeader*>(block_files_[index]->buffer());
315 175
316 max_blocks += header->max_entries; 176 max_blocks += header->max_entries;
317 int used = header->max_entries; 177 int used = header->max_entries;
318 for (int i = 0; i < 4; i++) { 178 for (int i = 0; i < kMaxNumBlocks; i++) {
319 used -= header->empty[i] * (i + 1); 179 used -= header->empty[i] * (i + 1);
320 DCHECK_GE(used, 0); 180 DCHECK_GE(used, 0);
gavinp 2013/08/05 17:06:15 While we're here, let's fix this reversed DCHECK.
321 } 181 }
322 *used_count += used; 182 *used_count += used;
323 183
324 if (!header->next_file) 184 if (!header->next_file)
325 break; 185 break;
326 index = header->next_file; 186 index = header->next_file;
327 } 187 }
328 if (max_blocks) 188 if (max_blocks)
329 *load = *used_count * 100 / max_blocks; 189 *load = *used_count * 100 / max_blocks;
330 } 190 }
331 191
332 } // namespace disk_cache 192 } // namespace disk_cache
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698