Disk cache: Update Addr to handle file format version 3.

net/disk_cache/addr.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is an internal class that handles the address of a cache record.
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
 #ifndef NET_DISK_CACHE_ADDR_H_
 #define NET_DISK_CACHE_ADDR_H_
 
 #include "net/base/net_export.h"
 #include "net/disk_cache/disk_format_base.h"
 
 namespace disk_cache {
 
 enum FileType {
   EXTERNAL = 0,
   RANKINGS = 1,
-  BLOCK_256,
-  BLOCK_1K,
-  BLOCK_4K,
+  BLOCK_256 = 2,
+  BLOCK_1K = 3,
+  BLOCK_4K = 4,
+  BLOCK_FILES = 5,
+  BLOCK_ENTRIES = 6,
+  BLOCK_EVICTED = 7
 };
 
 const int kMaxBlockSize = 4096 * 4;
 const int kMaxBlockFile = 255;
 const int kMaxNumBlocks = 4;
 const int kFirstAdditionalBlockFile = 4;
+const int kFirstAdditionalBlockFileV3 = 7;
 
 // Defines a storage address for a cache record
 //
 // Header:
 //   1000 0000 0000 0000 0000 0000 0000 0000 : initialized bit
 //   0111 0000 0000 0000 0000 0000 0000 0000 : file type
 //
 // File type values:
 //   0 = separate file on disk
 //   1 = rankings block file
 //   2 = 256 byte block file
 //   3 = 1k byte block file
 //   4 = 4k byte block file
+//   5 = external files block file
+//   6 = active entries block file
+//   7 = evicted entries block file
 //
 // If separate file:
 //   0000 1111 1111 1111 1111 1111 1111 1111 : file#  0 - 268,435,456 (2^28)
 //
 // If block file:
 //   0000 1100 0000 0000 0000 0000 0000 0000 : reserved bits
 //   0000 0011 0000 0000 0000 0000 0000 0000 : number of contiguous blocks 1-4
 //   0000 0000 1111 1111 0000 0000 0000 0000 : file selector 0 - 255
 //   0000 0000 0000 0000 1111 1111 1111 1111 : block#  0 - 65,535 (2^16)
 class NET_EXPORT_PRIVATE Addr {
  public:
   Addr() : value_(0) {}
   explicit Addr(CacheAddr address) : value_(address) {}
   Addr(FileType file_type, int max_blocks, int block_file, int index) {
     value_ = ((file_type << kFileTypeOffset) & kFileTypeMask) |

[gavinp, 2013/06/12 21:06:50]

While we're here, what do you think of this idea:

union NewCacheAddr {
  struct {
    uint32 : 28;
    uint32 file_type : 3;
    uint32 is_initialized : 1;
  } common;

  struct {
    uint32 file_number : 28;
  } separate_file;

  struct {
    uint32 start_block : 16;
    uint32 file_selector : 8;
    uint32 block_count : 2;
    uint32 : 2;
  } blockfile;
};

I think this would really make the rest of the methods in this class a lot more
readable.

[rvargas (doing something else), 2013/06/12 21:25:27]

I hope you don't mind, but I don't like the union part and I would prefer not
going to a struct with a bitfield... first, I don't want to rewrite this class;
second, one objective of this class was for it to be a wrapper around a single
int32, and while the struct and bitfield don't really change that, they obscure
that fact too much.

              (((max_blocks - 1) << kNumBlocksOffset) & kNumBlocksMask) |
              ((block_file << kFileSelectorOffset) & kFileSelectorMask) |
              (index  & kStartBlockMask) | kInitializedMask;
   }
 
   CacheAddr value() const { return value_; }
   void set_value(CacheAddr address) {
     value_ = address;
   }
 
@@ skipping 28 matching lines @@
   }
 
   bool operator==(Addr other) const {
     return value_ == other.value_;
   }
 
   bool operator!=(Addr other) const {
     return value_ != other.value_;
   }
 
+  // Conversions between the address of an external file and the address of the
+  // control block of that external file.
+  Addr AsExternal() const;
+  Addr AsBlockFile() const;
+
+  static Addr FromEntryAddress(uint32 value) {
+    return Addr(((8 + BLOCK_ENTRIES) << kFileTypeOffset) + value);

[gavinp, 2013/06/13 13:10:58]

8?

[rvargas (doing something else), 2013/06/13 19:07:25]

Rewrote it on a more explicit way.

+  }
+
+  static Addr FromEvictedAddress(uint32 value) {
+    return Addr(((8 + BLOCK_EVICTED) << kFileTypeOffset) + value);
+  }
+
   static int BlockSizeForFileType(FileType file_type) {
     switch (file_type) {
       case RANKINGS:
         return 36;
       case BLOCK_256:
         return 256;
       case BLOCK_1K:
         return 1024;
       case BLOCK_4K:
         return 4096;
+      case BLOCK_FILES:
+        return 8;
+      case BLOCK_ENTRIES:
+        return 104;

[gavinp, 2013/06/13 13:10:58]

These magic numbers are killing me. Why 104?

[rvargas (doing something else), 2013/06/13 19:07:25]

Because there is a COMPILE_ASSERT(sizeof(EntryRecord) == 104) at line 172 of the
file format definition, and BLOCK_ENTRIES is the file that stores regular
entries (aka, entry records).

Sure, this could be sizeof() (at the cost of a cast), but that means that this
file would have to include v3/disk_format_.h, but it only includes
disk_format_base because it is used by both v2 and v3, and there is no way to
include both definitions on a single compilation unit.

+      case BLOCK_EVICTED:
+        return 48;
       default:
         return 0;
     }
   }
 
   static FileType RequiredFileType(int size) {
     if (size < 1024)
       return BLOCK_256;
     else if (size < 4096)
       return BLOCK_1K;
     else if (size <= 4096 * 4)
       return BLOCK_4K;
     else
       return EXTERNAL;
   }
 
   static int RequiredBlocks(int size, FileType file_type) {
     int block_size = BlockSizeForFileType(file_type);
     return (size + block_size - 1) / block_size;
   }
 
   // Returns true if this address looks like a valid one.
-  bool SanityCheck() const;
+  bool SanityCheckV2() const;
+  bool SanityCheckV3() const;
   bool SanityCheckForEntryV2() const;
+  bool SanityCheckForEntryV3() const;
   bool SanityCheckForRankings() const;
 
  private:
   static const uint32 kInitializedMask    = 0x80000000;
   static const uint32 kFileTypeMask       = 0x70000000;
   static const uint32 kFileTypeOffset     = 28;
   static const uint32 kNumBlocksMask      = 0x03000000;
   static const uint32 kNumBlocksOffset    = 24;
   static const uint32 kFileSelectorMask   = 0x00ff0000;
   static const uint32 kFileSelectorOffset = 16;
   static const uint32 kStartBlockMask     = 0x0000FFFF;
   static const uint32 kFileNameMask       = 0x0FFFFFFF;
 
   CacheAddr value_;
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_ADDR_H_