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

Side by Side Diff: net/disk_cache/blockfile/disk_format_v3.h

Issue 826973002: replace COMPILE_ASSERT with static_assert in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply fixups Created 5 years, 11 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
« no previous file with comments | « net/disk_cache/blockfile/disk_format_base.h ('k') | net/disk_cache/blockfile/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 // The cache is stored on disk as a collection of block-files, plus an index 5 // The cache is stored on disk as a collection of block-files, plus an index
6 // plus a collection of external files. 6 // plus a collection of external files.
7 // 7 //
8 // Any data blob bigger than kMaxBlockSize (disk_cache/addr.h) will be stored in 8 // Any data blob bigger than kMaxBlockSize (disk_cache/addr.h) will be stored in
9 // a separate file named f_xxx where x is a hexadecimal number. Shorter data 9 // a separate file named f_xxx where x is a hexadecimal number. Shorter data
10 // will be stored as a series of blocks on a block-file. In any case, CacheAddr 10 // will be stored as a series of blocks on a block-file. In any case, CacheAddr
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 }; 90 };
91 91
92 const int kBaseBitmapBytes = 3968; 92 const int kBaseBitmapBytes = 3968;
93 // The IndexBitmap is directly saved to a file named index. The file grows in 93 // The IndexBitmap is directly saved to a file named index. The file grows in
94 // page increments (4096 bytes), but all bits don't have to be in use at any 94 // page increments (4096 bytes), but all bits don't have to be in use at any
95 // given time. The required file size can be computed from header.table_len. 95 // given time. The required file size can be computed from header.table_len.
96 struct IndexBitmap { 96 struct IndexBitmap {
97 IndexHeaderV3 header; 97 IndexHeaderV3 header;
98 uint32 bitmap[kBaseBitmapBytes / 4]; // First page of the bitmap. 98 uint32 bitmap[kBaseBitmapBytes / 4]; // First page of the bitmap.
99 }; 99 };
100 COMPILE_ASSERT(sizeof(IndexBitmap) == 4096, bad_IndexHeader); 100 static_assert(sizeof(IndexBitmap) == 4096, "bad IndexHeader");
101 101
102 // Possible states for a given entry. 102 // Possible states for a given entry.
103 enum EntryState { 103 enum EntryState {
104 ENTRY_FREE = 0, // Available slot. 104 ENTRY_FREE = 0, // Available slot.
105 ENTRY_NEW, // The entry is being created. 105 ENTRY_NEW, // The entry is being created.
106 ENTRY_OPEN, // The entry is being accessed. 106 ENTRY_OPEN, // The entry is being accessed.
107 ENTRY_MODIFIED, // The entry is being modified. 107 ENTRY_MODIFIED, // The entry is being modified.
108 ENTRY_DELETED, // The entry is being deleted. 108 ENTRY_DELETED, // The entry is being deleted.
109 ENTRY_FIXING, // Inconsistent state. The entry is being verified. 109 ENTRY_FIXING, // Inconsistent state. The entry is being verified.
110 ENTRY_USED // The slot is in use (entry is present). 110 ENTRY_USED // The slot is in use (entry is present).
111 }; 111 };
112 COMPILE_ASSERT(ENTRY_USED <= 7, state_uses_3_bits); 112 static_assert(ENTRY_USED <= 7, "state uses 3 bits");
113 113
114 enum EntryGroup { 114 enum EntryGroup {
115 ENTRY_NO_USE = 0, // The entry has not been reused. 115 ENTRY_NO_USE = 0, // The entry has not been reused.
116 ENTRY_LOW_USE, // The entry has low reuse. 116 ENTRY_LOW_USE, // The entry has low reuse.
117 ENTRY_HIGH_USE, // The entry has high reuse. 117 ENTRY_HIGH_USE, // The entry has high reuse.
118 ENTRY_RESERVED, // Reserved for future use. 118 ENTRY_RESERVED, // Reserved for future use.
119 ENTRY_EVICTED // The entry was deleted. 119 ENTRY_EVICTED // The entry was deleted.
120 }; 120 };
121 COMPILE_ASSERT(ENTRY_USED <= 7, group_uses_3_bits); 121 static_assert(ENTRY_USED <= 7, "group uses 3 bits");
122 122
123 #pragma pack(push, 1) 123 #pragma pack(push, 1)
124 struct IndexCell { 124 struct IndexCell {
125 void Clear() { memset(this, 0, sizeof(*this)); } 125 void Clear() { memset(this, 0, sizeof(*this)); }
126 126
127 // A cell is a 9 byte bit-field that stores 7 values: 127 // A cell is a 9 byte bit-field that stores 7 values:
128 // location : 22 bits 128 // location : 22 bits
129 // id : 18 bits 129 // id : 18 bits
130 // timestamp : 20 bits 130 // timestamp : 20 bits
131 // reuse : 4 bits 131 // reuse : 4 bits
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // to a deleted entry, the regular cache address may look something like 176 // to a deleted entry, the regular cache address may look something like
177 // BLOCK_EVICTED + 1 block + file number 6 + entry number 0x1234 177 // BLOCK_EVICTED + 1 block + file number 6 + entry number 0x1234
178 // so Addr = 0xf0061234 178 // so Addr = 0xf0061234
179 // 179 //
180 // If that same Addr is stored on a large table, the location field would be 180 // If that same Addr is stored on a large table, the location field would be
181 // 0x61234 181 // 0x61234
182 182
183 uint64 first_part; 183 uint64 first_part;
184 uint8 last_part; 184 uint8 last_part;
185 }; 185 };
186 COMPILE_ASSERT(sizeof(IndexCell) == 9, bad_IndexCell); 186 static_assert(sizeof(IndexCell) == 9, "bad IndexCell");
187 187
188 const int kCellsPerBucket = 4; 188 const int kCellsPerBucket = 4;
189 struct IndexBucket { 189 struct IndexBucket {
190 IndexCell cells[kCellsPerBucket]; 190 IndexCell cells[kCellsPerBucket];
191 int32 next; 191 int32 next;
192 uint32 hash; // The high order byte is reserved (should be zero). 192 uint32 hash; // The high order byte is reserved (should be zero).
193 }; 193 };
194 COMPILE_ASSERT(sizeof(IndexBucket) == 44, bad_IndexBucket); 194 static_assert(sizeof(IndexBucket) == 44, "bad IndexBucket");
195 const int kBytesPerCell = 44 / kCellsPerBucket; 195 const int kBytesPerCell = 44 / kCellsPerBucket;
196 196
197 // The main cache index. Backed by a file named index_tb1. 197 // The main cache index. Backed by a file named index_tb1.
198 // The extra table (index_tb2) has a similar format, but different size. 198 // The extra table (index_tb2) has a similar format, but different size.
199 struct Index { 199 struct Index {
200 // Default size. Actual size controlled by header.table_len. 200 // Default size. Actual size controlled by header.table_len.
201 IndexBucket table[kBaseTableLen / kCellsPerBucket]; 201 IndexBucket table[kBaseTableLen / kCellsPerBucket];
202 }; 202 };
203 #pragma pack(pop) 203 #pragma pack(pop)
204 204
(...skipping 13 matching lines...) Expand all
218 int32 key_len; 218 int32 key_len;
219 int32 data_size[4]; // We can store up to 4 data streams for each 219 int32 data_size[4]; // We can store up to 4 data streams for each
220 CacheAddr data_addr[4]; // entry. 220 CacheAddr data_addr[4]; // entry.
221 uint32 data_hash[4]; 221 uint32 data_hash[4];
222 uint64 creation_time; 222 uint64 creation_time;
223 uint64 last_modified_time; 223 uint64 last_modified_time;
224 uint64 last_access_time; 224 uint64 last_access_time;
225 int32 pad[3]; 225 int32 pad[3];
226 uint32 self_hash; 226 uint32 self_hash;
227 }; 227 };
228 COMPILE_ASSERT(sizeof(EntryRecord) == 104, bad_EntryRecord); 228 static_assert(sizeof(EntryRecord) == 104, "bad EntryRecord");
229 229
230 struct ShortEntryRecord { 230 struct ShortEntryRecord {
231 uint32 hash; 231 uint32 hash;
232 uint32 pad1; 232 uint32 pad1;
233 uint8 reuse_count; 233 uint8 reuse_count;
234 uint8 refetch_count; 234 uint8 refetch_count;
235 int8 state; // Current EntryState. 235 int8 state; // Current EntryState.
236 uint8 flags; 236 uint8 flags;
237 int32 key_len; 237 int32 key_len;
238 uint64 last_access_time; 238 uint64 last_access_time;
239 uint32 long_hash[5]; 239 uint32 long_hash[5];
240 uint32 self_hash; 240 uint32 self_hash;
241 }; 241 };
242 COMPILE_ASSERT(sizeof(ShortEntryRecord) == 48, bad_ShortEntryRecord); 242 static_assert(sizeof(ShortEntryRecord) == 48, "bad ShortEntryRecord");
243 243
244 } // namespace disk_cache 244 } // namespace disk_cache
245 245
246 #endif // NET_DISK_CACHE_BLOCKFILE_DISK_FORMAT_V3_H_ 246 #endif // NET_DISK_CACHE_BLOCKFILE_DISK_FORMAT_V3_H_
OLDNEW
« no previous file with comments | « net/disk_cache/blockfile/disk_format_base.h ('k') | net/disk_cache/blockfile/entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698