xnoe/xnoe-os
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated Hashtable to use xnoe::Maybe, fixed many bugs within hashtable, updated hash

Browse Source
This commit is contained in:
Xnoe 2021-11-21 16:40:16 +00:00
parent f581e6b6fe
commit b79ae4ec95
Signed by: xnoe
GPG Key ID: 45AC398F44F0DAFE
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/datatypes/hash.cpp
View File

@ -8,4 +8,9 @@ namespace xnoe {
uint32_t hash<void*>(void* t) { uint32_t hash<void*>(void* t) {
return (uint32_t) t; return (uint32_t) t;
} }
template<>
uint32_t hash<uint32_t>(uint32_t t) {
return t;
}
} }

2
src/kernel/datatypes/hash.h
View File

@ -9,6 +9,8 @@ namespace xnoe {
template<> template<>
uint32_t hash<void*>(void* t); uint32_t hash<void*>(void* t);
template<>
uint32_t hash<uint32_t>(uint32_t t);
} }
#endif #endif

32
src/kernel/datatypes/hashtable.h
View File

@ -4,6 +4,7 @@
#include "hash.h" #include "hash.h"
#include "linkedlist.h" #include "linkedlist.h"
#include "../memory.h" #include "../memory.h"
#include "maybe.h"
namespace xnoe { namespace xnoe {
template <class key, class value> template <class key, class value>
@ -17,32 +18,35 @@ namespace xnoe {
} }
void set(key k, value v) { void set(key k, value v) {
xnoe::linkedlist<xnoe::tuple<key, value>> list = table[xnoe::hash<k>(k) % 4096]; xnoe::linkedlist<xnoe::tuple<key, value>> list = table[xnoe::hash<key>(k) % 4096];
xnoe::linkedlistelem<xnoe::tuple<key, value>> current = list.start; xnoe::linkedlistelem<xnoe::tuple<key, value>>* current = list.start;
bool exists = false; bool exists = false;
while (current->next) { if (current) {
if (xnoe::get<0>(current->elem) == k) { while (current->next) {
exists = true; if (xnoe::get<0>(current->elem) == k) {
break; exists = true;
break;
}
} }
} }
if (exists) if (exists)
current = xnoe::tuple<key, value>(k, v); current->elem = xnoe::tuple<key, value>(k, v);
else else
list.append(xnoe::tuple<key, value>(k, v)); list.append(xnoe::tuple<key, value>(k, v));
} }
value* get(key k) { xnoe::Maybe<value> get(key k) {
xnoe::linkedlist<xnoe::tuple<key, value>> list = table[xnoe::hash<k>(k) % 4096]; xnoe::linkedlist<xnoe::tuple<key, value>> list = table[xnoe::hash<key>(k) % 4096];
xnoe::linkedlistelem<xnoe::tuple<key, value>> current = list.start; xnoe::linkedlistelem<xnoe::tuple<key, value>>* current = list.start;
while (current->next) if (current)
if (xnoe::get<0>(current->elem) == k) while (current->next)
return &(xnoe::get<1>(current->elem)); if (xnoe::get<0>(current->elem) == k)
return xnoe::Maybe<value>(xnoe::get<1>(current->elem));
return 0; return xnoe::Maybe<value>();
} }
}; };
} }