Moving inline functions to the .h files, so gcc can inline them correctly

remotes/origin/master-1.0.x
Pablo Rincon 16 years ago committed by Victor Julien
parent 224a33f19e
commit a429192507

@ -77,22 +77,6 @@ int BloomFilterAdd(BloomFilter *bf, void *data, uint16_t datalen) {
return 0;
}
inline int BloomFilterTest(BloomFilter *bf, void *data, uint16_t datalen) {
uint8_t iter = 0;
uint32_t hash = 0;
int hit = 1;
for (iter = 0; iter < bf->hash_iterations; iter++) {
hash = bf->Hash(data, datalen, iter, bf->bitarray_size);
if (!(bf->bitarray[hash/8] & (1<<hash%8))) {
hit = 0;
break;
}
}
return hit;
}
uint32_t BloomFilterMemoryCnt(BloomFilter *bf) {
if (bf == NULL)
return 0;

@ -16,11 +16,30 @@ BloomFilter *BloomFilterInit(uint32_t, uint8_t, uint32_t (*Hash)(void *, uint16_
void BloomFilterFree(BloomFilter *);
void BloomFilterPrint(BloomFilter *);
int BloomFilterAdd(BloomFilter *, void *, uint16_t);
inline int BloomFilterTest(BloomFilter *, void *, uint16_t);
uint32_t BloomFilterMemoryCnt(BloomFilter *);
uint32_t BloomFilterMemorySize(BloomFilter *);
void BloomFilterRegisterTests(void);
/** ----- Inline functions ---- */
static inline int BloomFilterTest(BloomFilter *, void *, uint16_t);
static inline int BloomFilterTest(BloomFilter *bf, void *data, uint16_t datalen) {
uint8_t iter = 0;
uint32_t hash = 0;
int hit = 1;
for (iter = 0; iter < bf->hash_iterations; iter++) {
hash = bf->Hash(data, datalen, iter, bf->bitarray_size);
if (!(bf->bitarray[hash/8] & (1<<hash%8))) {
hit = 0;
break;
}
}
return hit;
}
#endif /* __BLOOMFILTER_H__ */

Loading…
Cancel
Save