External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add count argument to compact_hash_table::rehash/reserve

Browse Source 
This allows us to do a single reserve for a known amount of assignments
that is larger than the default minimum per reserve (16).
This commit is contained in:
Arseny Kapoulkine 2017-11-13 08:37:34 -08:00
parent 6fe31d1477
commit 91a3c28862
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pugixml.cpp
View File

@ -327,10 +327,10 @@ PUGI__NS_BEGIN
item->value = value; item->value = value;
} }
bool reserve() bool reserve(size_t extra = 16)
{ {
if (_count + 16 >= _capacity - _capacity / 4) if (_count + extra >= _capacity - _capacity / 4)
return rehash(); return rehash(_count + extra);
return true; return true;
} }
@ -347,7 +347,7 @@ PUGI__NS_BEGIN
size_t _count; size_t _count;
bool rehash(); bool rehash(size_t count);
item_t* get_item(const void* key) item_t* get_item(const void* key)
{ {
@ -387,16 +387,20 @@ PUGI__NS_BEGIN
} }
}; };
PUGI__FN_NO_INLINE bool compact_hash_table::rehash() PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
{ {
size_t capacity = 32;
while (count >= capacity - capacity / 4)
capacity *= 2;
compact_hash_table rt; compact_hash_table rt;
rt._capacity = (_capacity == 0) ? 32 : _capacity * 2; rt._capacity = capacity;
rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * rt._capacity)); rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
if (!rt._items) if (!rt._items)
return false; return false;
memset(rt._items, 0, sizeof(item_t) * rt._capacity); memset(rt._items, 0, sizeof(item_t) * capacity);
for (size_t i = 0; i < _capacity; ++i) for (size_t i = 0; i < _capacity; ++i)
if (_items[i].key) if (_items[i].key)
@ -405,7 +409,7 @@ PUGI__NS_BEGIN
if (_items) if (_items)
xml_memory::deallocate(_items); xml_memory::deallocate(_items);
_capacity = rt._capacity; _capacity = capacity;
_items = rt._items; _items = rt._items;
assert(_count == rt._count); assert(_count == rt._count);