fix padding

used to be that type and layout were hidden
now type is gone and layout is an explicit instance, so 0 overhead
This commit is contained in:
Torsten Ruger 2015-11-04 10:34:03 +02:00
parent 5bddbfbb62
commit c87682b77f
2 changed files with 5 additions and 7 deletions

View File

@ -2,10 +2,8 @@
module Padding module Padding
# objects only come in lengths of multiple of 8 words # objects only come in lengths of multiple of 8 words
# but there is a constant overhead of 1 words for layout
# and as we would have to subtract 1 to make it work without overhead, we now have to add 7
def padded len def padded len
a = 32 * (1 + (len + 3)/32 ) a = 32 * (1 + (len - 1)/32 )
#puts "#{a} for #{len}" #puts "#{a} for #{len}"
a a
end end
@ -15,7 +13,7 @@ module Padding
end end
def padding_for length def padding_for length
pad = padded(length) - length - 4 # for header, layout pad = padded(length) - length # for header, layout
pad pad
end end
end end

View File

@ -10,17 +10,17 @@ class TestPadding < MiniTest::Test
@pad = Padded.new @pad = Padded.new
end end
def test_small def test_small
[6,20,27,28].each do |p| [6,27,28,32].each do |p|
assert_equal 32 , @pad.padded(p) , "Expecting 32 for #{p}" assert_equal 32 , @pad.padded(p) , "Expecting 32 for #{p}"
end end
end end
def test_medium def test_medium
[29,40,57,60].each do |p| [33,40,57,60,64].each do |p|
assert_equal 64 , @pad.padded(p) , "Expecting 64 for #{p}" assert_equal 64 , @pad.padded(p) , "Expecting 64 for #{p}"
end end
end end
def test_large def test_large
[61,88].each do |p| [65,88].each do |p|
assert_equal 96 , @pad.padded(p) , "Expecting 96 for #{p}" assert_equal 96 , @pad.padded(p) , "Expecting 96 for #{p}"
end end
end end