Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 699724 - Shrink js::HashTable. r=luke.

Browse Source
This commit is contained in:
Nicholas Nethercote 2011-11-08 21:02:11 -08:00
parent 7764c01ec2
commit 14543f2542
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/public/HashTable.h
View File

@ -260,7 +260,6 @@ class HashTable : private AllocPolicy
private:
uint32 hashShift; /* multiplicative hash shift */
uint32 tableCapacity; /* = JS_BIT(sHashBits - hashShift) */
uint32 entryCount; /* number of entries in table */
uint32 gen; /* entry storage generation number */
uint32 removedCount; /* removed entry sentinels in table */
@ -268,7 +267,6 @@ class HashTable : private AllocPolicy
void setTableSizeLog2(unsigned sizeLog2) {
hashShift = sHashBits - sizeLog2;
tableCapacity = JS_BIT(sizeLog2);
}
#ifdef DEBUG
@ -414,7 +412,7 @@ class HashTable : private AllocPolicy
~HashTable()
{
if (table)
destroyTable(*this, table, tableCapacity);
destroyTable(*this, table, capacity());
}
private:
@ -427,10 +425,11 @@ class HashTable : private AllocPolicy
}
bool overloaded() {
return entryCount + removedCount >= ((sMaxAlphaFrac * tableCapacity) >> 8);
return entryCount + removedCount >= ((sMaxAlphaFrac * capacity()) >> 8);
}
bool underloaded() {
uint32 tableCapacity = capacity();
return tableCapacity > sMinSize &&
entryCount <= ((sMinAlphaFrac * tableCapacity) >> 8);
}
@ -546,7 +545,7 @@ class HashTable : private AllocPolicy
{
/* Look, but don't touch, until we succeed in getting new entry store. */
Entry *oldTable = table;
uint32 oldCap = tableCapacity;
uint32 oldCap = capacity();
uint32 newLog2 = sHashBits - hashShift + deltaLog2;
uint32 newCapacity = JS_BIT(newLog2);
if (newCapacity > sMaxCapacity) {
@ -604,8 +603,9 @@ class HashTable : private AllocPolicy
void clear()
{
if (tl::IsPodType<Entry>::result) {
memset(table, 0, sizeof(*table) * tableCapacity);
memset(table, 0, sizeof(*table) * capacity());
} else {
uint32 tableCapacity = capacity();
for (Entry *e = table, *end = table + tableCapacity; e != end; ++e)
*e = Move(Entry());
}
@ -623,7 +623,7 @@ class HashTable : private AllocPolicy
if (!table)
return;
destroyTable(*this, table, tableCapacity);
destroyTable(*this, table, capacity());
table = NULL;
gen++;
entryCount = 0;
@ -634,7 +634,7 @@ class HashTable : private AllocPolicy
}
Range all() const {
return Range(table, table + tableCapacity);
return Range(table, table + capacity());
}
bool empty() const {
@ -646,7 +646,7 @@ class HashTable : private AllocPolicy
}
uint32 capacity() const {
return tableCapacity;
return JS_BIT(sHashBits - hashShift);
}
uint32 generation() const {
@ -660,7 +660,7 @@ class HashTable : private AllocPolicy
size_t sizeOf(JSUsableSizeFun usf, bool countMe) const {
size_t usable = usf(table) + (countMe ? usf((void*)this) : 0);
return usable ? usable
: (tableCapacity * sizeof(Entry)) + (countMe ? sizeof(HashTable) : 0);
: (capacity() * sizeof(Entry)) + (countMe ? sizeof(HashTable) : 0);
}
Ptr lookup(const Lookup &l) const {
@ -701,7 +701,7 @@ class HashTable : private AllocPolicy
if (overloaded()) {
/* Compress if a quarter or more of all entries are removed. */
int deltaLog2;
if (removedCount >= (tableCapacity >> 2)) {
if (removedCount >= (capacity() >> 2)) {
METER(stats.compresses++);
deltaLog2 = 0;
} else {