diff options
author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 10:21:39 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 10:21:39 +0200 |
commit | de340a7f1a9cf21931d94ea8814545c4b2d172b0 (patch) | |
tree | 0a69eaed9d425a233d4213e3cb3e129d5d25796f /tests | |
parent | dfdbad53f9c5a7bc3f357b53f11a840c8fda3635 (diff) |
Add bucketsize parameter to all hash types
The parameter defines the upper limit in any hash bucket at adding new entries
from userspace - if the limit would be exceeded, ipset doubles the hash size
and rehashes. It means the set may consume more memory but gives faster
evaluation at matching in the set.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'tests')
65 files changed, 140 insertions, 141 deletions
diff --git a/tests/comment.t.list2 b/tests/comment.t.list2 index 90a7e9b..bf7837f 100644 --- a/tests/comment.t.list2 +++ b/tests/comment.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 comment -Size in memory: 1288 +Header: family inet hashsize 128 maxelem 65536 comment bucketsize 12 +Size in memory: 1190 References: 0 Number of entries: 4 Members: diff --git a/tests/comment.t.list21 b/tests/comment.t.list21 index 973b344..7a546f3 100644 --- a/tests/comment.t.list21 +++ b/tests/comment.t.list21 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 timeout x comment -Size in memory: 95168 +Header: family inet hashsize 1024 maxelem 65536 timeout x comment bucketsize 12 +Size in memory: 51092 References: 0 Number of entries: 512 Members: diff --git a/tests/comment.t.list22 b/tests/comment.t.list22 index 9215b0d..f24319e 100644 --- a/tests/comment.t.list22 +++ b/tests/comment.t.list22 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 timeout x comment -Size in memory: 57634 +Header: family inet hashsize 1024 maxelem 65536 timeout x comment bucketsize 12 +Size in memory: 40034 References: 0 Number of entries: 256 Members: diff --git a/tests/comment.t.list3 b/tests/comment.t.list3 index 673678a..528796f 100644 --- a/tests/comment.t.list3 +++ b/tests/comment.t.list3 @@ -1,23 +1,23 @@ Name: a Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 1 Number of entries: 0 Members: Name: b Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 1 Number of entries: 0 Members: Name: c Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 1 Number of entries: 0 Members: @@ -25,7 +25,7 @@ Members: Name: test Type: list:set Header: size 8 comment -Size in memory: 288 +Size in memory: 378 References: 0 Number of entries: 3 Members: diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 index 3866bf5..865ac1e 100644 --- a/tests/hash:ip,mark.t.list0 +++ b/tests/hash:ip,mark.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x -Size in memory: 640 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 592 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 index c959e4c..9c6a87d 100644 --- a/tests/hash:ip,mark.t.list1 +++ b/tests/hash:ip,mark.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 -Size in memory: 536 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 592 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:ip,port,ip.t.list0 b/tests/hash:ip,port,ip.t.list0 index 57adef1..ab68f02 100644 --- a/tests/hash:ip,port,ip.t.list0 +++ b/tests/hash:ip,port,ip.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout x -Size in memory: 840 +Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 664 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1 index 7c7d560..9011673 100644 --- a/tests/hash:ip,port,ip.t.list1 +++ b/tests/hash:ip,port,ip.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout 4 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 Size in memory: 664 References: 0 Number of entries: 0 diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0 index 44c53c5..ea46beb 100644 --- a/tests/hash:ip,port,net.t.list0 +++ b/tests/hash:ip,port,net.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,net -Header: family inet hashsize 1024 maxelem 65536 timeout x -Size in memory: 1096 +Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 840 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip,port.t.list0 b/tests/hash:ip,port.t.list0 index 49e3033..1693e85 100644 --- a/tests/hash:ip,port.t.list0 +++ b/tests/hash:ip,port.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout x -Size in memory: 640 +Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 592 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1 index 4b79124..eaf7ff5 100644 --- a/tests/hash:ip,port.t.list1 +++ b/tests/hash:ip,port.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout 4 -Size in memory: 528 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 592 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:ip,port.t.list2 b/tests/hash:ip,port.t.list2 index 624d050..75a5d23 100644 --- a/tests/hash:ip,port.t.list2 +++ b/tests/hash:ip,port.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 320 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 480 References: 0 Number of entries: 3 Members: diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0 index 1859015..908cd18 100644 --- a/tests/hash:ip.t.list0 +++ b/tests/hash:ip.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 timeout 4 -Size in memory: 336 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 464 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1 index 0977324..f67ec08 100644 --- a/tests/hash:ip.t.list1 +++ b/tests/hash:ip.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4 -Size in memory: 432 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4 bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:ip.t.list2 b/tests/hash:ip.t.list2 index 6cd2bf4..9446f21 100644 --- a/tests/hash:ip.t.list2 +++ b/tests/hash:ip.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 timeout x -Size in memory: 352 +Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 464 References: 0 Number of entries: 2 Members: diff --git a/tests/hash:ip.t.list3 b/tests/hash:ip.t.list3 index 500abbc..661fcf4 100644 --- a/tests/hash:ip.t.list3 +++ b/tests/hash:ip.t.list3 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x -Size in memory: 464 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 3 Members: diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 index be7c069..1a64487 100644 --- a/tests/hash:ip6,mark.t.list0 +++ b/tests/hash:ip6,mark.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x -Size in memory: 1088 +Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 736 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 index 5c7b730..7fef4a9 100644 --- a/tests/hash:ip6,mark.t.list1 +++ b/tests/hash:ip6,mark.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 -Size in memory: 800 +Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 736 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0 index 6fc6771..1594411 100644 --- a/tests/hash:ip6,port,ip6.t.list0 +++ b/tests/hash:ip6,port,ip6.t.list0 @@ -1,9 +1,8 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout x -Size in memory: 1608 +Header: family inet6 hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 880 References: 0 -Size in memory: 9104 Number of entries: 4 Members: 2:1::,tcp:128,2:2:2::2 timeout x diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1 index d3b61b7..afd5f68 100644 --- a/tests/hash:ip6,port,ip6.t.list1 +++ b/tests/hash:ip6,port,ip6.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 -Size in memory: 1072 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 880 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0 index ad8ea8f..e18056b 100644 --- a/tests/hash:ip6,port,net6.t.list0 +++ b/tests/hash:ip6,port,net6.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,net -Header: family inet6 hashsize 1024 maxelem 65536 -Size in memory: 1864 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 1808 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0 index 926c4ec..13a94eb 100644 --- a/tests/hash:ip6,port.t.list0 +++ b/tests/hash:ip6,port.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout x -Size in memory: 1088 +Header: family inet6 hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 736 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1 index d707af5..f956f3e 100644 --- a/tests/hash:ip6,port.t.list1 +++ b/tests/hash:ip6,port.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 -Size in memory: 800 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 736 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0 index 44b6fb4..8c8958a 100644 --- a/tests/hash:ip6.t.list0 +++ b/tests/hash:ip6.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 -Size in memory: 416 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 504 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1 index 838fa77..432f580 100644 --- a/tests/hash:ip6.t.list1 +++ b/tests/hash:ip6.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4 -Size in memory: 544 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4 bucketsize 12 +Size in memory: 584 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:ip6.t.list2 b/tests/hash:ip6.t.list2 index 46a92f7..f163697 100644 --- a/tests/hash:ip6.t.list2 +++ b/tests/hash:ip6.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout x -Size in memory: 512 +Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 504 References: 0 Number of entries: 2 Members: diff --git a/tests/hash:ip6.t.list3 b/tests/hash:ip6.t.list3 index c6e2990..574ebc1 100644 --- a/tests/hash:ip6.t.list3 +++ b/tests/hash:ip6.t.list3 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x -Size in memory: 704 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x bucketsize 12 +Size in memory: 584 References: 0 Number of entries: 3 Members: diff --git a/tests/hash:mac.t.list0 b/tests/hash:mac.t.list0 index 232b932..e444c48 100644 --- a/tests/hash:mac.t.list0 +++ b/tests/hash:mac.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 128 maxelem 65536 timeout 4 -Size in memory: 336 +Header: hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 464 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:mac.t.list1 b/tests/hash:mac.t.list1 index 0c971ff..1760e55 100644 --- a/tests/hash:mac.t.list1 +++ b/tests/hash:mac.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 1024 maxelem 65536 skbinfo -Size in memory: 1088 +Header: hashsize 1024 maxelem 65536 skbinfo bucketsize 12 +Size in memory: 816 References: 0 Number of entries: 6 Members: diff --git a/tests/hash:mac.t.list2 b/tests/hash:mac.t.list2 index 166f266..4c3707c 100644 --- a/tests/hash:mac.t.list2 +++ b/tests/hash:mac.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 128 maxelem 65536 timeout x -Size in memory: 384 +Header: hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 464 References: 0 Number of entries: 2 Members: diff --git a/tests/hash:mac.t.list3 b/tests/hash:mac.t.list3 index 4154342..233a56d 100644 --- a/tests/hash:mac.t.list3 +++ b/tests/hash:mac.t.list3 @@ -1,7 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 1024 maxelem 2 skbinfo -Size in memory: 448 +Header: hashsize 1024 maxelem 2 skbinfo bucketsize 12 +Size in memory: 496 References: 0 Number of entries: 2 Members: diff --git a/tests/hash:net,iface.t.list0 b/tests/hash:net,iface.t.list0 index e29a7d6..fa2e5ef 100644 --- a/tests/hash:net,iface.t.list0 +++ b/tests/hash:net,iface.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 128 maxelem 65536 -Size in memory: 928 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Size in memory: 976 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net,iface.t.list1 b/tests/hash:net,iface.t.list1 index 00f7d80..fabc3a7 100644 --- a/tests/hash:net,iface.t.list1 +++ b/tests/hash:net,iface.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 3872 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 3000 References: 0 Number of entries: 27 Members: diff --git a/tests/hash:net,iface.t.list2 b/tests/hash:net,iface.t.list2 index 4f5cc90..6185742 100644 --- a/tests/hash:net,iface.t.list2 +++ b/tests/hash:net,iface.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 928 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 976 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net,net.t.list0 b/tests/hash:net,net.t.list0 index 4b806ea..c2d00ad 100644 --- a/tests/hash:net,net.t.list0 +++ b/tests/hash:net,net.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 timeout x -Size in memory: 1288 +Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 1048 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net,net.t.list1 b/tests/hash:net,net.t.list1 index 99e62c1..8e97486 100644 --- a/tests/hash:net,net.t.list1 +++ b/tests/hash:net,net.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 timeout 4 -Size in memory: 920 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 1048 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:net,net.t.list2 b/tests/hash:net,net.t.list2 index 139b3e2..f47a7f5 100644 --- a/tests/hash:net,net.t.list2 +++ b/tests/hash:net,net.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 2056 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 1752 References: 0 Number of entries: 16 Members: diff --git a/tests/hash:net,port,net.t.list0 b/tests/hash:net,port,net.t.list0 index 9f20e7d..bc3e7fa 100644 --- a/tests/hash:net,port,net.t.list0 +++ b/tests/hash:net,port,net.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port,net -Header: family inet hashsize 1024 maxelem 65536 timeout x -Size in memory: 1288 +Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Size in memory: 1048 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net,port.t.list0 b/tests/hash:net,port.t.list0 index fbfab7f..727f07f 100644 --- a/tests/hash:net,port.t.list0 +++ b/tests/hash:net,port.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout x -Size in memory: 1024 +Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 912 References: 0 Number of entries: 5 Members: diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1 index 66f0955..4f17cf4 100644 --- a/tests/hash:net,port.t.list1 +++ b/tests/hash:net,port.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout 4 -Size in memory: 880 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 912 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:net.t.list0 b/tests/hash:net.t.list0 index e22f183..60fc10a 100644 --- a/tests/hash:net.t.list0 +++ b/tests/hash:net.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout x -Size in memory: 896 +Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 848 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1 index 6e74a1d..6409a7c 100644 --- a/tests/hash:net.t.list1 +++ b/tests/hash:net.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout 4 -Size in memory: 784 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 848 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:net.t.list2 b/tests/hash:net.t.list2 index 893ac9d..1ebef49 100644 --- a/tests/hash:net.t.list2 +++ b/tests/hash:net.t.list2 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 640 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 784 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net.t.list3 b/tests/hash:net.t.list3 index 265fcbd..8f3e6d8 100644 --- a/tests/hash:net.t.list3 +++ b/tests/hash:net.t.list3 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 504 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 688 References: 0 Number of entries: 2 Members: diff --git a/tests/hash:net6,net6.t.list0 b/tests/hash:net6,net6.t.list0 index 1f021e5..7456b6b 100644 --- a/tests/hash:net6,net6.t.list0 +++ b/tests/hash:net6,net6.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet6 hashsize 128 maxelem 65536 timeout x -Size in memory: 3144 +Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 2416 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net6,net6.t.list1 b/tests/hash:net6,net6.t.list1 index 2ccfd51..2fde68c 100644 --- a/tests/hash:net6,net6.t.list1 +++ b/tests/hash:net6,net6.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net,net -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 -Size in memory: 2608 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 2416 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:net6,port,net6.t.list0 b/tests/hash:net6,port,net6.t.list0 index 4b9f8f8..f8e091e 100644 --- a/tests/hash:net6,port,net6.t.list0 +++ b/tests/hash:net6,port,net6.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port,net -Header: family inet6 hashsize 1024 maxelem 65536 -Size in memory: 2440 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 2352 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0 index 2d3596c..6c80999 100644 --- a/tests/hash:net6,port.t.list0 +++ b/tests/hash:net6,port.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout x -Size in memory: 2352 +Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 1856 References: 0 Number of entries: 5 Members: diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1 index 788358b..a2044ce 100644 --- a/tests/hash:net6,port.t.list1 +++ b/tests/hash:net6,port.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 -Size in memory: 1984 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 1856 References: 0 Number of entries: 1 Members: diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0 index ad7133a..06530aa 100644 --- a/tests/hash:net6.t.list0 +++ b/tests/hash:net6.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout x -Size in memory: 2112 +Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Size in memory: 1760 References: 0 Number of entries: 4 Members: diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1 index bf7dd88..4d248d5 100644 --- a/tests/hash:net6.t.list1 +++ b/tests/hash:net6.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 -Size in memory: 1824 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Size in memory: 1760 References: 0 Number of entries: 0 Members: diff --git a/tests/iphash.t.large b/tests/iphash.t.large index 24cc125..73c61e4 100644 --- a/tests/iphash.t.large +++ b/tests/iphash.t.large @@ -1,4 +1,4 @@ -create test hash:ip family inet hashsize 1024 maxelem 65536 +create test hash:ip family inet hashsize 1024 maxelem 65536 bucketsize 12 add test 10.10.0.0 add test 10.10.0.1 add test 10.10.0.2 diff --git a/tests/iphash.t.list0 b/tests/iphash.t.list0 index 4d75711..b8e3496 100644 --- a/tests/iphash.t.list0 +++ b/tests/iphash.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 -Size in memory: 224 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Size in memory: 416 References: 0 Number of entries: 2 Members: diff --git a/tests/iphash.t.list1 b/tests/iphash.t.list1 index 18ec027..4a3c8d1 100644 --- a/tests/iphash.t.list1 +++ b/tests/iphash.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 -Size in memory: 224 +Header: family inet hashsize 128 maxelem 65536 netmask 24 bucketsize 12 +Size in memory: 416 References: 0 Number of entries: 2 Members: diff --git a/tests/iphash.t.restore.sorted b/tests/iphash.t.restore.sorted index e944061..4b7ff6d 100644 --- a/tests/iphash.t.restore.sorted +++ b/tests/iphash.t.restore.sorted @@ -1,4 +1,4 @@ -create test hash:ip family inet hashsize 128 maxelem 65536 +create test hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 add test 10.0.0.0 add test 10.0.0.1 add test 10.0.0.2 @@ -128,7 +128,7 @@ add test 10.0.0.125 add test 10.0.0.126 add test 10.0.0.127 add test 10.0.0.128 -create test2 hash:ip family inet hashsize 128 maxelem 65536 +create test2 hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 add test2 20.0.0.0 add test2 20.0.0.1 add test2 20.0.0.2 diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 index 9ebf116..a3bffcc 100644 --- a/tests/ipmarkhash.t.list0 +++ b/tests/ipmarkhash.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 -Size in memory: 384 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 4 Members: diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 index af39998..34a7207 100644 --- a/tests/ipmarkhash.t.list1 +++ b/tests/ipmarkhash.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 -Size in memory: 384 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 4 Members: diff --git a/tests/ipporthash.t.list0 b/tests/ipporthash.t.list0 index 902160f..e8a00b3 100644 --- a/tests/ipporthash.t.list0 +++ b/tests/ipporthash.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 384 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 4 Members: diff --git a/tests/ipporthash.t.list1 b/tests/ipporthash.t.list1 index d298cc0..7ba2900 100644 --- a/tests/ipporthash.t.list1 +++ b/tests/ipporthash.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 384 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 528 References: 0 Number of entries: 4 Members: diff --git a/tests/ipportiphash.t.list0 b/tests/ipportiphash.t.list0 index bde5356..b34c3a0 100644 --- a/tests/ipportiphash.t.list0 +++ b/tests/ipportiphash.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 456 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 568 References: 0 Number of entries: 4 Members: diff --git a/tests/ipportiphash.t.list1 b/tests/ipportiphash.t.list1 index d5cc29e..bce5314 100644 --- a/tests/ipportiphash.t.list1 +++ b/tests/ipportiphash.t.list1 @@ -1,7 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 296 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 456 References: 0 Number of entries: 2 Members: diff --git a/tests/nethash.t.list0 b/tests/nethash.t.list0 index 0aeb852..e927599 100644 --- a/tests/nethash.t.list0 +++ b/tests/nethash.t.list0 @@ -1,7 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 -Size in memory: 640 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Size in memory: 784 References: 0 Number of entries: 4 Members: diff --git a/tests/restore.t.list0 b/tests/restore.t.list0 index 3c73ab3..1177d6c 100644 --- a/tests/restore.t.list0 +++ b/tests/restore.t.list0 @@ -1,7 +1,7 @@ Name: a Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 -Size in memory: 416 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 536 References: 0 Number of entries: 3 Members: diff --git a/tests/restore.t.list1 b/tests/restore.t.list1 index e2c1f8e..f7e06b8 100644 --- a/tests/restore.t.list1 +++ b/tests/restore.t.list1 @@ -1,7 +1,7 @@ Name: b Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 -Size in memory: 416 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 536 References: 0 Number of entries: 3 Members: diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4 index 6b115d9..8767afe 100644 --- a/tests/setlist.t.list4 +++ b/tests/setlist.t.list4 @@ -1,31 +1,31 @@ Name: a Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 1 Number of entries: 0 Members: Name: b Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 0 Number of entries: 0 Members: Name: c Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 0 Number of entries: 0 Members: Name: d Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 -Size in memory: 152 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Size in memory: 336 References: 0 Number of entries: 0 Members: @@ -33,7 +33,7 @@ Members: Name: test Type: list:set Header: size 8 -Size in memory: 184 +Size in memory: 168 References: 0 Number of entries: 1 Members: |