#include "gnunet_container_lib.h"
#include "gnunet_disk_lib.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
struct GNUNET_CONTAINER_BloomFilter
{
* @param cls closure
* @param bf the filter to manipulate
* @param bit the current bit
+ * @return GNUNET_YES to continue, GNUNET_NO to stop early
*/
-typedef void (*BitIterator) (void *cls,
- const struct GNUNET_CONTAINER_BloomFilter * bf,
- unsigned int bit);
+typedef int (*BitIterator) (void *cls,
+ const struct GNUNET_CONTAINER_BloomFilter * bf,
+ unsigned int bit);
+
/**
* Call an iterator for each bit that the bloomfilter
{
GNUNET_HashCode tmp[2];
int bitCount;
- int round;
+ unsigned int round;
unsigned int slot = 0;
bitCount = bf->addressesPerElement;
- memcpy (&tmp[0], key, sizeof (GNUNET_HashCode));
+ tmp[0] = *key;
round = 0;
while (bitCount > 0)
{
while (slot < (sizeof (GNUNET_HashCode) / sizeof (uint32_t)))
{
- callback (arg, bf,
- (((uint32_t *) & tmp[round & 1])[slot]) &
- ((bf->bitArraySize * 8) - 1));
+ if (GNUNET_YES !=
+ callback (arg, bf,
+ (((uint32_t *) & tmp[round & 1])[slot]) &
+ ((bf->bitArraySize * 8) - 1)))
+ return;
slot++;
bitCount--;
if (bitCount == 0)
}
}
+
/**
* Callback: increment bit
*
* @param cls pointer to writeable form of bf
* @param bf the filter to manipulate
* @param bit the bit to increment
+ * @return GNUNET_YES
*/
-static void
+static int
incrementBitCallback (void *cls, const struct GNUNET_CONTAINER_BloomFilter *bf,
unsigned int bit)
{
struct GNUNET_CONTAINER_BloomFilter *b = cls;
incrementBit (b->bitArray, bit, bf->fh);
+ return GNUNET_YES;
}
+
/**
* Callback: decrement bit
*
* @param cls pointer to writeable form of bf
* @param bf the filter to manipulate
* @param bit the bit to decrement
+ * @return GNUNET_YES
*/
-static void
+static int
decrementBitCallback (void *cls, const struct GNUNET_CONTAINER_BloomFilter *bf,
unsigned int bit)
{
struct GNUNET_CONTAINER_BloomFilter *b = cls;
decrementBit (b->bitArray, bit, bf->fh);
+ return GNUNET_YES;
}
+
/**
* Callback: test if all bits are set
*
* @param cls pointer set to GNUNET_NO if bit is not set
* @param bf the filter
* @param bit the bit to test
+ * @return YES if the bit is set, NO if not
*/
-static void
+static int
testBitCallback (void *cls, const struct GNUNET_CONTAINER_BloomFilter *bf,
unsigned int bit)
{
int *arg = cls;
if (GNUNET_NO == testBit (bf->bitArray, bit))
+ {
*arg = GNUNET_NO;
+ return GNUNET_NO;
+ }
+ return GNUNET_YES;
}
/* *********************** INTERFACE **************** */
res = GNUNET_DISK_file_read (bf->fh, rbuff, BUFFSIZE);
if (res == -1)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "read",
- bf->filename);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "read", bf->filename);
}
if (res == 0)
break; /* is ok! we just did not use that many bits yet */
return GNUNET_OK;
}
+
/**
* Free the space associated with a filter
* in memory, flush to drive if needed (do not
GNUNET_free (bf);
}
+
/**
* Reset a bloom filter to empty. Clears the file on disk.
*
return res;
}
+
/**
* Add an element to the filter
*
GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf,
const GNUNET_HashCode * e)
{
-
if (NULL == bf)
return;
iterateBits (bf, &incrementBitCallback, bf, e);