OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

better multihash insertion strategy (make sure elements with equal keys always form a sequence in a bucket)

master
Daniel Kolesa 2015-07-21 01:37:02 +01:00
parent 8e40fca1ce
commit 71f5df79ce
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ostd/internal/hashtable.hh
View File

@ -258,7 +258,7 @@ private:
return c;
}
Chain *insert(Size h) {
Chain *request_node() {
if (!p_unused) {
Chunk *chunk = allocator_allocate(get_challoc(), 1);
allocator_construct(get_challoc(), chunk);
@ -272,7 +272,11 @@ private:
++p_len;
Chain *c = p_unused;
p_unused = p_unused->next;
return insert_node(h, c);
return c;
}
Chain *insert(Size h) {
return insert_node(h, request_node());
}
void delete_chunks(Chunk *chunks) {
@ -511,13 +515,27 @@ public:
Pair<Range, bool> emplace(Args &&...args) {
rehash_ahead(1);
E elem(forward<Args>(args)...);
Size h = bucket(B::get_key(elem));
if (Multihash) {
/* multihash: always insert */
Chain *ch = insert(h);
/* multihash: always insert
* gotta make sure that equal keys always come after
* each other (this is then used by other APIs)
*/
Size h = 0;
Chain *found = find(B::get_key(elem), h);
if (!found) {
Chain *ch = insert(h);
B::swap_elem(ch->value, elem);
return make_pair(Range(ch), true);
}
Chain *ch = request_node();
B::swap_elem(ch->value, elem);
return make_pair(Range(ch), true);
Chain *next = found->next;
found->next = ch;
ch->prev = found;
ch->next = next;
if (next) next->prev = ch;
}
Size h = bucket(B::get_key(elem));
Chain *found = nullptr;
bool ins = true;
Chain **cp = p_data.first();