From 8d7c29c4684f807d5e9a3004bbbab132b158c5aa Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 26 Feb 2017 22:42:40 +0100 Subject: ensure all plugins properly use BF, move shared logic to shared library --- src/fs/plugin_block_fs.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'src/fs') diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index 996c06dcb..b6749b418 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c @@ -38,37 +38,6 @@ #define BLOOMFILTER_K 16 -/** - * How many bytes should a bloomfilter be if we have already seen - * entry_count responses? Note that #GNUNET_CONSTANTS_BLOOMFILTER_K - * gives us the number of bits set per entry. Furthermore, we should - * not re-size the filter too often (to keep it cheap). - * - * Since other peers will also add entries but not resize the filter, - * we should generally pick a slightly larger size than what the - * strict math would suggest. - * - * @param entry_count expected number of entries in the Bloom filter - * @return must be a power of two and smaller or equal to 2^15. - */ -static size_t -compute_bloomfilter_size (unsigned int entry_count) -{ - size_t size; - unsigned int ideal = (entry_count * BLOOMFILTER_K) / 4; - uint16_t max = 1 << 15; - - if (entry_count > max) - return max; - size = 8; - while ((size < max) && (size < ideal)) - size *= 2; - if (size > max) - return max; - return size; -} - - /** * Create a new block group. * @@ -111,7 +80,8 @@ block_plugin_fs_create_group (void *cls, } else { - size = compute_bloomfilter_size (va_arg (va, unsigned int)); + size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int), + BLOOMFILTER_K); } if (0 == size) size = raw_data_size; /* not for us to determine, use what we got! */ -- cgit v1.2.3