Donate power-of-2-aligned ranges instead of just slicing at the mid-point.

Also fix up space tests to match.
This commit is contained in:
Bryan Boreham committed 2016-05-13 16:27:28 +01:00
1 parent f37e742536
commit 64dc7a1f69
5 files changed
+99 -37

No files matched your search

+29
View File
@@ -35,6 +35,35 @@ func (r Range) AsCIDRString() string {
return CIDR{Addr: r.Start, PrefixLen: prefixLen}.String()
}
// return the highest bit set in a
// algorithm from http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
func msb(v Count) Count {
v |= v >> 1
v |= v >> 2
v |= v >> 4
v |= v >> 8
v |= v >> 16
// Cast to 64-bit to avoid overflow when original v >= 0x80000000
return Count((uint64(v) + 1) / 2)
}
func (r Range) BiggestPow2AlignedRange() Range {
sizeMsb := Offset(msb(r.Size()))
maskedSize := Offset(r.Size()) & (sizeMsb - 1)
maskedStart := Offset(r.Start) & (sizeMsb - 1)
if maskedStart == 0 {
return NewRange(r.Start, sizeMsb)
}
if sizeMsb-maskedStart <= maskedSize {
return NewRange(Add(r.Start, sizeMsb-maskedStart), sizeMsb)
}
size := sizeMsb / 2
if size >= maskedStart {
return NewRange(Add(r.Start, size-maskedStart), size)
}
return NewRange(Add(r.Start, sizeMsb-maskedStart), size)
}
func MakeCIDR(subnet CIDR, addr Address) CIDR {
return CIDR{Addr: addr, PrefixLen: subnet.PrefixLen}
}
+26
View File
@@ -0,0 +1,26 @@
package address
import (
"testing"
"github.com/stretchr/testify/require"
)
func TestBiggestPow2AlignedRange(t *testing.T) {
require.Equal(t, NewRange(0, 1), NewRange(0, 1).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0, 2), NewRange(0, 2).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0, 2), NewRange(0, 3).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0, 4), NewRange(0, 7).BiggestPow2AlignedRange())
require.Equal(t, NewRange(1, 1), NewRange(1, 1).BiggestPow2AlignedRange())
require.Equal(t, NewRange(1, 1), NewRange(1, 2).BiggestPow2AlignedRange())
require.Equal(t, NewRange(2, 2), NewRange(1, 3).BiggestPow2AlignedRange())
require.Equal(t, NewRange(2, 2), NewRange(1, 4).BiggestPow2AlignedRange())
require.Equal(t, NewRange(4, 4), NewRange(1, 8).BiggestPow2AlignedRange())
require.Equal(t, NewRange(4, 4), NewRange(2, 8).BiggestPow2AlignedRange())
require.Equal(t, NewRange(4, 4), NewRange(4, 8).BiggestPow2AlignedRange())
require.Equal(t, NewRange(8, 4), NewRange(8, 7).BiggestPow2AlignedRange())
require.Equal(t, NewRange(8, 8), NewRange(8, 8).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0, 0x4000), NewRange(0, 0x7fff).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0x2000, 2), NewRange(0x2000, 3).BiggestPow2AlignedRange())
require.Equal(t, NewRange(0xffff, 1), NewRange(0xffff, 1).BiggestPow2AlignedRange())
}