thinp_xml 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI2YmNiNDk0MDVmYWRmMTE1ZWU3MTM4NGQ2NjM4MzAwY2IxNTYyMw==
+    MTA2MWY0ZGYyYWVlYTc2ZGRmMzM4ZTE2Y2FjNGZlZmM1NDliOWRlMA==
   data.tar.gz: !binary |-
-    ZDI0YzI0OWJjNTdhZmVmMmQ2ZmU5NmFhOWU1NjJjZWJhYWQ5NzNiOQ==
+    MDk1MDhkMjFiZmI5MzY0NGQxOWJhYTBjNTgyNjFmYzhmY2U3MTA3Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODliNDQ3MDBlNzIxOTMyODc5YzBhNjczYjJmMjg2Y2M5MzJiNTYwMzYyODc0
-    ZWMwY2U5OTJiYTBiM2I5OWQ4ZDNkZGMxNTE4NGNlZjhiYzRlYTBmNTdmYTM3
-    NTNiM2M3Y2MxOTNlNTBhZTc5ZWVjY2JhNDMyZjgxYmU4Yjg0ODA=
+    ZDMzZTdiZWU5ZTA3NmU5YzJlYzYxZjkyY2E4OTEyZTE0YjA2ZmFiZjg1ZmI3
+    OGNkNmEzOTdjMjhlZDE2NjdjYTBkNzE2MTI0YzI3MmUxMDgxNGRjODcxZjFj
+    ZTk4M2JmZTg5ODhiNmMwZmMxOGRhMGU3OWVjMTg4Yzg4YTQ3NjE=
   data.tar.gz: !binary |-
-    M2I3NDM3Mjc2MzE4YjY1M2UwYmMxZTUyMWYyYWI0MDczODY2ZTcwM2YwMDI3
-    MGM5NmQ3MTBiNzA3OGZmNjhmZDMwMzJhYzQxYTFhODI4NThhZGQ1ZTViYTcy
-    Yjk1NjY0NDkzNDBmMTVhN2ZiNDc5NmFkZGE1ZGUwNTI0MmY3YjQ=
+    OWUyNGVkZTNhNzQ1MDEzMjQ3ZWI4MGYxZmQzNTY5YjZkN2ZkZDE1NDMzMWMy
+    YzIxYWMxMjMwZDQxZjQ2M2QxNDQwMDY2Y2E5MTAzZjFjZDkxMjJkZjVhY2E4
+    OGU4NGU4ZWJmN2E3MDgwMjI0OTUxNmMxNDlhNWRiMmJhZjRjYzU=

data/bin/cache_xml

@@ -48,6 +48,7 @@ CacheCommandLine = CommandLine::Parser.new do
   value_switch :mapping_policy, :layout, '--layout'
   value_switch :dirty_percentage, :percentage, '--dirty-percent'
   value_switch :policy, :string, '--policy'
+  value_switch :hint_width, :int, '--hint-width'
 
   global do
     switches :help
@@ -55,7 +56,7 @@ CacheCommandLine = CommandLine::Parser.new do
 
   command :create do
     switches :nr_cache_blocks, :uuid, :block_size, :nr_mappings,
-             :mapping_policy, :dirty_percentage, :policy
+             :mapping_policy, :dirty_percentage, :policy, :hint_width
   end
 end
 
@@ -85,6 +86,7 @@ class Dispatcher
     b.mapping_policy = opts.fetch(:mapping_policy, :random)
     b.dirty_percentage = opts.fetch(:dirty_percentage, 0)
     b.policy_name = opts.fetch(:policy, 'mq')
+    b.hint_width = opts.fetch(:hint_width, 4)
     md = b.generate
     write_xml(md, STDOUT)
   end

data/features/cache_create.feature

@@ -4,7 +4,7 @@ Feature: I can create new metadata
     When I cache_xml create
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="0" policy="mq">
+    <superblock uuid="" block_size="128" nr_cache_blocks="0" policy="mq" hint_width="4">
     </superblock>
     """
 
@@ -12,7 +12,7 @@ Feature: I can create new metadata
     When I cache_xml create --uuid 'one two three'
     Then the stdout should contain:
     """
-    <superblock uuid="one two three" block_size="128" nr_cache_blocks="0" policy="mq">
+    <superblock uuid="one two three" block_size="128" nr_cache_blocks="0" policy="mq" hint_width="4">
     </superblock>
     """
 
@@ -20,7 +20,7 @@ Feature: I can create new metadata
     When I cache_xml create --block-size 512
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="512" nr_cache_blocks="0" policy="mq">
+    <superblock uuid="" block_size="512" nr_cache_blocks="0" policy="mq" hint_width="4">
     </superblock>
     """
 
@@ -28,7 +28,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 345
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="345" policy="mq">
+    <superblock uuid="" block_size="128" nr_cache_blocks="345" policy="mq" hint_width="4">
     </superblock>
     """
 
@@ -36,7 +36,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks uniform[123..124]
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="123" policy="mq">
+    <superblock uuid="" block_size="128" nr_cache_blocks="123" policy="mq" hint_width="4">
     </superblock>
     """
 
@@ -44,7 +44,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq">
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq" hint_width="4">
       <mapping cache_block="0" origin_block="0" dirty="false"/>
       <mapping cache_block="1" origin_block="1" dirty="false"/>
       <mapping cache_block="2" origin_block="2" dirty="false"/>
@@ -55,7 +55,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear --dirty-percent 100
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq">
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq" hint_width="4">
       <mapping cache_block="0" origin_block="0" dirty="true"/>
       <mapping cache_block="1" origin_block="1" dirty="true"/>
       <mapping cache_block="2" origin_block="2" dirty="true"/>
@@ -66,11 +66,20 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear --policy fred
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="fred">
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="fred" hint_width="4">
       <mapping cache_block="0" origin_block="0" dirty="false"/>
       <mapping cache_block="1" origin_block="1" dirty="false"/>
       <mapping cache_block="2" origin_block="2" dirty="false"/>
     </superblock>
     """
-    
-    
+
+  Scenario: Take the hint width
+    When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear --hint-width 8
+    Then the stdout should contain:
+    """
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq" hint_width="8">
+      <mapping cache_block="0" origin_block="0" dirty="false"/>
+      <mapping cache_block="1" origin_block="1" dirty="false"/>
+      <mapping cache_block="2" origin_block="2" dirty="false"/>
+    </superblock>
+    """

data/lib/thinp_xml/cache/builder.rb

@@ -5,7 +5,7 @@ require 'thinp_xml/cache/metadata'
 module CacheXML
   class Builder
     attr_accessor :uuid, :block_size, :nr_cache_blocks, :policy_name
-    attr_reader :mapping_policy, :nr_mappings, :dirty_percentage
+    attr_reader :mapping_policy, :nr_mappings, :dirty_percentage, :hint_width
 
     def initialize
       @uuid = ''
@@ -15,10 +15,13 @@ module CacheXML
       @mapping_policy = :random
       @nr_mappings = 0
       @dirty_percentage = 0
+      @hint_width = 4
     end
 
     def generate
-      superblock = Superblock.new(@uuid, @block_size.to_i, @nr_cache_blocks.to_i, @policy_name)
+      superblock = Superblock.new(@uuid, @block_size.to_i,
+                                  @nr_cache_blocks.to_i,
+                                  @policy_name, @hint_width)
       mappings = []
 
       case @mapping_policy
@@ -78,6 +81,11 @@ module CacheXML
       @dirty_percentage = n
     end
 
+    def hint_width=(n)
+      raise "invalid hint width (#{n})" if n > 128 || ((n % 4) != 0)
+      @hint_width = n
+    end
+
     private
     def valid_policy(sym)
       [:random, :linear].member?(sym)

data/lib/thinp_xml/cache/emit.rb

@@ -11,7 +11,7 @@ module CacheXML
       end
 
       def emit_superblock(sb, &block)
-        @e.emit_tag(sb, 'superblock', :uuid, :block_size, :nr_cache_blocks, :policy, &block)
+        @e.emit_tag(sb, 'superblock', :uuid, :block_size, :nr_cache_blocks, :policy, :hint_width, &block)
       end
 
       def emit_mapping(m)

data/lib/thinp_xml/cache/metadata.rb

@@ -2,7 +2,8 @@ module CacheXML
   SUPERBLOCK_FIELDS = [[:uuid, :string],
                        [:block_size, :int],
                        [:nr_cache_blocks, :int],
-                       [:policy, :string]]
+                       [:policy, :string],
+                       [:hint_width, :int]]
 
   MAPPING_FIELDS = [[:cache_block, :int],
                     [:origin_block, :int],

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/cache_builder_spec.rb

@@ -70,14 +70,43 @@ describe "CacheXML::Builder" do
   describe "policy name" do
     it "should be 'mq' by default" do
       @b.policy_name.should == 'mq'
-      @b.generate.superblock.policy_name.should == 'mq'
+      @b.generate.superblock.policy.should == 'mq'
     end
 
     it "should reflect changes" do
       n = 'most_recently_not_used_least'
       @b.policy_name = n
       @b.policy_name.should == n
-      @b.generate.superblock.policy_name.should == n
+      @b.generate.superblock.policy.should == n
+    end
+  end
+
+  describe "hint width" do
+    it "should be '4' by default" do
+      @b.hint_width.should == 4
+      @b.generate.superblock.hint_width.should == 4
+    end
+
+    it "should allow a hint size between 4 and 128, mod 4" do
+      0.upto(132) do |n|
+        if (((n % 4) == 0) && n <= 128)
+          @b.hint_width = n
+          @b.hint_width.should == n
+        end
+      end
+    end
+
+    it "should disallow other hint sizes" do
+      [3, 7, 23, 93, 129].each do |n|
+        expect do
+          @b.hint_width = n
+        end.to raise_error
+      end
+    end
+
+    it "should reflect changes" do
+      @b.hint_width = 12
+      @b.generate.superblock.hint_width.should == 12
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinp_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejt_command_line