Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: HashMap uses LinkedList as bucket, so kmalloc_fixed can be used

This commit is contained in:
Bananymous 2023-02-22 21:46:41 +02:00
parent a845f8696c
commit f98f3d851c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BAN/include/BAN/HashMap.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <BAN/Hash.h> #include <BAN/Hash.h>
#include <BAN/LinkedList.h>
#include <BAN/Vector.h> #include <BAN/Vector.h>
namespace BAN namespace BAN
@ -56,11 +57,11 @@ namespace BAN
private: private:
ErrorOr<void> rebucket(size_type); ErrorOr<void> rebucket(size_type);
Vector<Entry>& get_bucket(const Key&); LinkedList<Entry>& get_bucket(const Key&);
const Vector<Entry>& get_bucket(const Key&) const; const LinkedList<Entry>& get_bucket(const Key&) const;
private: private:
Vector<Vector<Entry>> m_buckets; Vector<LinkedList<Entry>> m_buckets;
size_type m_size = 0; size_type m_size = 0;
}; };
@ -209,7 +210,7 @@ namespace BAN
return {}; return {};
size_type new_bucket_count = BAN::Math::max<size_type>(bucket_count, m_buckets.size() * 2); size_type new_bucket_count = BAN::Math::max<size_type>(bucket_count, m_buckets.size() * 2);
Vector<Vector<Entry>> new_buckets; Vector<LinkedList<Entry>> new_buckets;
if (new_buckets.resize(new_bucket_count).is_error()) if (new_buckets.resize(new_bucket_count).is_error())
return Error::from_string("HashMap: Could not allocate memory"); return Error::from_string("HashMap: Could not allocate memory");
@ -230,7 +231,7 @@ namespace BAN
} }
template<typename Key, typename T, typename HASH> template<typename Key, typename T, typename HASH>
Vector<typename HashMap<Key, T, HASH>::Entry>& HashMap<Key, T, HASH>::get_bucket(const Key& key) LinkedList<typename HashMap<Key, T, HASH>::Entry>& HashMap<Key, T, HASH>::get_bucket(const Key& key)
{ {
ASSERT(!m_buckets.empty()); ASSERT(!m_buckets.empty());
auto index = HASH()(key) % m_buckets.size(); auto index = HASH()(key) % m_buckets.size();
@ -238,7 +239,7 @@ namespace BAN
} }
template<typename Key, typename T, typename HASH> template<typename Key, typename T, typename HASH>
const Vector<typename HashMap<Key, T, HASH>::Entry>& HashMap<Key, T, HASH>::get_bucket(const Key& key) const const LinkedList<typename HashMap<Key, T, HASH>::Entry>& HashMap<Key, T, HASH>::get_bucket(const Key& key) const
{ {
ASSERT(!m_buckets.empty()); ASSERT(!m_buckets.empty());
auto index = HASH()(key) % m_buckets.size(); auto index = HASH()(key) % m_buckets.size();