doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add clear function to hashtable

Browse Source
This commit is contained in:
Doyle Thai 2018-01-21 21:18:34 +11:00
parent 0468024f35
commit 1464181cc2
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dqn.h
View File

@ -902,6 +902,7 @@ struct DqnHashTable
void Remove (DqnString const key); void Remove (DqnString const key);
void Remove (char const *const key, i32 keyLen = -1); void Remove (char const *const key, i32 keyLen = -1);
void Clear ();
void Free (); void Free ();
// num: If num > 0, allocate num entries to free list. If num < 0, remove num entries from free list. // num: If num > 0, allocate num entries to free list. If num < 0, remove num entries from free list.
@ -1036,7 +1037,8 @@ DqnHashTableInternal_Get(DqnHashTable<T> const *table, char const *const key, i3
if (entry) if (entry)
{ {
DqnHashTable<T>::Entry *matchingEntry = DqnHashTableInternal_FindMatchingKey<T>(entry, key, (i64)keyLen); DqnHashTable<T>::Entry *matchingEntry = DqnHashTableInternal_FindMatchingKey<T>(entry, key, (i64)keyLen);
if (matchingEntry) return matchingEntry; if (matchingEntry)
return matchingEntry;
} }
return nullptr; return nullptr;
@ -1120,7 +1122,6 @@ void DqnHashTable<T>::Remove(char const *const key, i32 keyLen)
i64 hashIndex = DqnHashTableInternal_GetHashIndex(this, key, keyLen); i64 hashIndex = DqnHashTableInternal_GetHashIndex(this, key, keyLen);
Entry *entry = this->entries[hashIndex]; Entry *entry = this->entries[hashIndex];
// TODO(doyle): This is wrong, doesn't update before pointers
if (entry) if (entry)
{ {
Entry prevEntry_; Entry prevEntry_;
@ -1144,7 +1145,7 @@ void DqnHashTable<T>::Remove(char const *const key, i32 keyLen)
if (prevEntry) if (prevEntry)
{ {
prevEntry->next = nullptr; prevEntry->next = entryToFree->next;
} }
entryToFree->key.Clear(); entryToFree->key.Clear();
@ -1163,6 +1164,32 @@ void DqnHashTable<T>::Remove(DqnString key)
Entry result = this->Remove(key.str, key.len); Entry result = this->Remove(key.str, key.len);
} }
template <typename T>
void DqnHashTable<T>::Clear()
{
for (auto usedIndex = 0; usedIndex < this->usedEntriesIndex; usedIndex++)
{
auto entryIndex = this->usedEntries[usedIndex];
Entry *baseEntry = this->entries[entryIndex];
for (Entry *entry = baseEntry; entry;)
{
Entry *entryToFree = entry;
entry = entryToFree->next;
entryToFree->key.Clear();
entryToFree->data = {};
entryToFree->next = this->freeList;
this->freeList = entryToFree;
this->numFreeEntries++;
}
this->entries[entryIndex] = nullptr;
}
this->usedEntriesIndex = 0;
}
template <typename T> template <typename T>
void DqnHashTable<T>::Free() void DqnHashTable<T>::Free()
{ {