Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use ZEEK_DICT_DEBUG more in Dict.cc instead of DEBUG

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-04-08 18:17:26 +00:00 • committed by Tim Wojtulewicz
parent eeebf8a429
commit 3397beabf7
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Dict.cc
View file

@ -18,8 +18,10 @@
#if defined(DEBUG) && defined(ZEEK_DICT_DEBUG) #if defined(DEBUG) && defined(ZEEK_DICT_DEBUG)
#define ASSERT_VALID(o) o->AssertValid() #define ASSERT_VALID(o) o->AssertValid()
#define ASSERT_EQUAL(a, b) ASSERT(a == b)
#else #else
#define ASSERT_VALID(o) #define ASSERT_VALID(o)
#define ASSERT_EQUAL(a, b)
#endif // DEBUG #endif // DEBUG
namespace zeek namespace zeek
@ -749,7 +751,7 @@ int Dictionary::Next(int position) const
#define DUMPIF(f) \ #define DUMPIF(f) \
if ( f ) \ if ( f ) \
Dump(1) Dump(1)
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
void Dictionary::AssertValid() const void Dictionary::AssertValid() const
{ {
bool valid = true; bool valid = true;
@ -797,7 +799,7 @@ void Dictionary::AssertValid() const
} }
} }
} }
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
size_t Dictionary::MemoryAllocation() const size_t Dictionary::MemoryAllocation() const
{ {
@ -1057,14 +1059,14 @@ int Dictionary::LookupIndex(const void* key, int key_size, detail::hash_t hash,
return -1; return -1;
int bucket = BucketByHash(hash, log2_buckets); int bucket = BucketByHash(hash, log2_buckets);
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
int linear_position = LinearLookupIndex(key, key_size, hash); int linear_position = LinearLookupIndex(key, key_size, hash);
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
int position = LookupIndex(key, key_size, hash, bucket, Capacity(), insert_position, int position = LookupIndex(key, key_size, hash, bucket, Capacity(), insert_position,
insert_distance); insert_distance);
if ( position >= 0 ) if ( position >= 0 )
{ {
ASSERT(position == linear_position); // same as linearLookup ASSERT_EQUAL(position, linear_position); // same as linearLookup
return position; return position;
} }
@ -1078,26 +1080,26 @@ int Dictionary::LookupIndex(const void* key, int key_size, detail::hash_t hash,
position = LookupIndex(key, key_size, hash, prev_bucket, remap_end + 1); position = LookupIndex(key, key_size, hash, prev_bucket, remap_end + 1);
if ( position >= 0 ) if ( position >= 0 )
{ {
ASSERT(position == linear_position); // same as linearLookup ASSERT_EQUAL(position, linear_position); // same as linearLookup
// remap immediately if no iteration is on. // remap immediately if no iteration is on.
if ( ! num_iterators ) if ( ! num_iterators )
{ {
Remap(position, &position); Remap(position, &position);
ASSERT(position == LookupIndex(key, key_size, hash)); ASSERT_EQUAL(position, LookupIndex(key, key_size, hash));
} }
return position; return position;
} }
} }
} }
// not found // not found
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
if ( linear_position >= 0 ) if ( linear_position >= 0 )
{ // different. stop and try to see whats happending. { // different. stop and try to see whats happending.
ASSERT(false); ASSERT(false);
// rerun the function in debugger to track down the bug. // rerun the function in debugger to track down the bug.
LookupIndex(key, key_size, hash); LookupIndex(key, key_size, hash);
} }
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
return -1; return -1;
} }
@ -1229,9 +1231,9 @@ void* Dictionary::Insert(void* key, int key_size, detail::hash_t hash, void* val
/// e.distance is adjusted to be the one at insert_position. /// e.distance is adjusted to be the one at insert_position.
void Dictionary::InsertRelocateAndAdjust(detail::DictEntry& entry, int insert_position) void Dictionary::InsertRelocateAndAdjust(detail::DictEntry& entry, int insert_position)
{ {
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
entry.bucket = BucketByHash(entry.hash, log2_buckets); entry.bucket = BucketByHash(entry.hash, log2_buckets);
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
int last_affected_position = insert_position; int last_affected_position = insert_position;
InsertAndRelocate(entry, insert_position, &last_affected_position); InsertAndRelocate(entry, insert_position, &last_affected_position);
@ -1403,11 +1405,11 @@ detail::DictEntry Dictionary::RemoveRelocateAndAdjust(int position)
int last_affected_position = position; int last_affected_position = position;
detail::DictEntry entry = RemoveAndRelocate(position, &last_affected_position); detail::DictEntry entry = RemoveAndRelocate(position, &last_affected_position);
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
// validation: index to i-1 should be continuous without empty spaces. // validation: index to i-1 should be continuous without empty spaces.
for ( int k = position; k < last_affected_position; k++ ) for ( int k = position; k < last_affected_position; k++ )
ASSERT(! table[k].Empty()); ASSERT(! table[k].Empty());
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
if ( cookies && ! cookies->empty() ) if ( cookies && ! cookies->empty() )
for ( auto c : *cookies ) for ( auto c : *cookies )
@ -1552,9 +1554,9 @@ bool Dictionary::Remap(int position, int* new_position)
return false; return false;
detail::DictEntry entry = RemoveAndRelocate( detail::DictEntry entry = RemoveAndRelocate(
position); // no iteration cookies to adjust, no need for last_affected_position. position); // no iteration cookies to adjust, no need for last_affected_position.
#ifdef DEBUG #ifdef ZEEK_DICT_DEBUG
entry.bucket = expected; entry.bucket = expected;
#endif // DEBUG #endif // ZEEK_DICT_DEBUG
// find insert position. // find insert position.
int insert_position = EndOfClusterByBucket(expected); int insert_position = EndOfClusterByBucket(expected);