townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hashtable: change keys from uint32_t to uint64_t to cater for TBID

Browse Source
This commit is contained in:
Crypto City 2020-09-15 12:46:08 +00:00
parent 0539ada932
commit e4774687fa
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tb/tb_hashtable.cpp
View File

@ -93,7 +93,7 @@ uint32_t TBHashTable::GetSuitableBucketsCount() const
return m_num_items * 2;
}
void *TBHashTable::Get(uint32_t key) const
void *TBHashTable::Get(uint64_t key) const
{
if (!m_num_buckets)
return nullptr;
@ -108,7 +108,7 @@ void *TBHashTable::Get(uint32_t key) const
return nullptr;
}
bool TBHashTable::Add(uint32_t key, void *content)
bool TBHashTable::Add(uint64_t key, void *content)
{
if (NeedRehash() && !Rehash(GetSuitableBucketsCount()))
return false;
@ -126,7 +126,7 @@ bool TBHashTable::Add(uint32_t key, void *content)
return false;
}
void *TBHashTable::Remove(uint32_t key)
void *TBHashTable::Remove(uint64_t key)
{
if (!m_num_buckets)
return nullptr;
@ -152,7 +152,7 @@ void *TBHashTable::Remove(uint32_t key)
return nullptr;
}
void TBHashTable::Delete(uint32_t key)
void TBHashTable::Delete(uint64_t key)
{
DeleteContent(Remove(key));
}

16
src/tb/tb_hashtable.h
View File

@ -11,7 +11,7 @@
namespace tb {
/** TBHashTable is a minimal hash table, for hashing anything using a uint32_t key. */
/** TBHashTable is a minimal hash table, for hashing anything using a uint64_t key. */
class TBHashTable
{
@ -28,17 +28,17 @@ public:
void DeleteAll() { RemoveAll(true); }
/** Get the content for the given key, or nullptr if not found. */
void *Get(uint32_t key) const;
void *Get(uint64_t key) const;
/** Add content with the given key.
Returns false if out of memory. */
bool Add(uint32_t key, void *content);
bool Add(uint64_t key, void *content);
/** Remove the content with the given key. */
void *Remove(uint32_t key);
void *Remove(uint64_t key);
/** Delete the content with the given key. */
void Delete(uint32_t key);
void Delete(uint64_t key);
/** Rehash the table so use the given number of buckets.
Returns false if out of memory. */
@ -64,7 +64,7 @@ private:
friend class TBHashTableIterator;
void RemoveAll(bool delete_content);
struct ITEM {
uint32_t key;
uint64_t key;
ITEM *next;
void *content;
} **m_buckets;
@ -100,7 +100,7 @@ class TBHashTableOf : public TBHashTable
{
// FIX: Don't do public inheritance! Either inherit privately and forward, or use a private member backend!
public:
T *Get(uint32_t key) const { return (T*) TBHashTable::Get(key); }
T *Get(uint64_t key) const { return (T*) TBHashTable::Get(key); }
protected:
virtual void DeleteContent(void *content) { delete (T*) content; }
@ -114,7 +114,7 @@ class TBHashTableAutoDeleteOf : public TBHashTable
public:
~TBHashTableAutoDeleteOf() { DeleteAll(); }
T *Get(uint32_t key) const { return (T*) TBHashTable::Get(key); }
T *Get(uint64_t key) const { return (T*) TBHashTable::Get(key); }
protected:
virtual void DeleteContent(void *content) { delete (T*) content; }

2
src/tb/tb_id.cpp
View File

@ -90,7 +90,7 @@ void TBID::Set(const char *string)
const char * TBID::c_str() const
{
if (debug_string.IsEmpty())
debug_string.SetFormatted("%d",id);
debug_string.SetFormatted("%llu", (unsigned long long)id);
return debug_string.CStr();
}
#endif // TB_RUNTIME_DEBUG_INFO