mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 11:42:57 +01:00
add new ShouldRehash method to factor out common code. Fix the dtor to not
delete tombstones. llvm-svn: 34189
This commit is contained in:
parent
88ba48fcec
commit
d61a01003b
@ -58,6 +58,16 @@ protected:
|
||||
StringMapImpl(unsigned InitSize, unsigned ItemSize);
|
||||
void RehashTable();
|
||||
|
||||
/// ShouldRehash - Return true if the table should be rehashed after a new
|
||||
/// element was recently inserted.
|
||||
bool ShouldRehash() const {
|
||||
// If the hash table is now more than 3/4 full, or if fewer than 1/8 of
|
||||
// the buckets are empty (meaning that many are filled with tombstones),
|
||||
// grow the table.
|
||||
return NumItems*4 > NumBuckets*3 ||
|
||||
NumBuckets-(NumItems+NumTombstones) < NumBuckets/8;
|
||||
}
|
||||
|
||||
/// LookupBucketFor - Look up the bucket that the specified string should end
|
||||
/// up in. If it already exists as a key in the map, the Item pointer for the
|
||||
/// specified bucket will be non-null. Otherwise, it will be null. In either
|
||||
@ -218,11 +228,7 @@ public:
|
||||
Bucket.Item = KeyValue;
|
||||
++NumItems;
|
||||
|
||||
// If the hash table is now more than 3/4 full, or if fewer than 1/8 of
|
||||
// the buckets are empty (meaning that many are filled with tombstones),
|
||||
// grow the table.
|
||||
if (NumItems*4 > NumBuckets*3 ||
|
||||
NumBuckets-(NumItems+NumTombstones) < NumBuckets/8)
|
||||
if (ShouldRehash())
|
||||
RehashTable();
|
||||
return true;
|
||||
}
|
||||
@ -247,11 +253,7 @@ public:
|
||||
// filled in by LookupBucketFor.
|
||||
Bucket.Item = NewItem;
|
||||
|
||||
// If the hash table is now more than 3/4 full, or if fewer than 1/8 of
|
||||
// the buckets are empty (meaning that many are filled with tombstones),
|
||||
// grow the table.
|
||||
if (NumItems*4 > NumBuckets*3 ||
|
||||
NumBuckets-(NumItems+NumTombstones) < NumBuckets/8)
|
||||
if (ShouldRehash())
|
||||
RehashTable();
|
||||
return *NewItem;
|
||||
}
|
||||
@ -264,8 +266,8 @@ public:
|
||||
|
||||
~StringMap() {
|
||||
for (ItemBucket *I = TheTable, *E = TheTable+NumBuckets; I != E; ++I) {
|
||||
if (MapEntryTy *Id = static_cast<MapEntryTy*>(I->Item))
|
||||
Id->Destroy(Allocator);
|
||||
if (I->Item && I->Item != getTombstoneVal())
|
||||
static_cast<MapEntryTy*>(I->Item)->Destroy(Allocator);
|
||||
}
|
||||
delete [] TheTable;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user