diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| m--------- | hashmap | 0 | ||||
| -rw-r--r-- | src/hashm.h | 47 |
4 files changed, 56 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index de4d60e..981d9ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "mimalloc"] path = mimalloc url = https://github.com/microsoft/mimalloc.git +[submodule "hashmap"] + path = hashmap + url = https://github.com/tidwall/hashmap.c.git @@ -28,7 +28,10 @@ MI_FLAGS = \ -DMI_XMALLOC=YES \ -DMI_OVERRIDE=YES -CSH_FLAGS += -I$(MI_INCLUDE) +HASHMAP_DIR = $(WORK_DIR)/hashmap +HASHMAP_SOURCE = $(HASHMAP_DIR)/hashmap.c + +CSH_FLAGS += -I$(MI_INCLUDE) -I$(HASHMAP_DIR) MI_GENERATOR = "Unix Makefiles" @@ -40,7 +43,8 @@ SOURCES = \ $(SRC_DIR)/xdg-shell.c \ $(SRC_DIR)/wlstate.c \ $(SRC_DIR)/vec.c \ - $(SRC_DIR)/events.c + $(SRC_DIR)/events.c \ + $(HASHMAP_SOURCE) OBJECTS := $(SOURCES:.cc=.o) OBJECTS := $(OBJECTS:.c=.o) diff --git a/hashmap b/hashmap new file mode 160000 +Subproject 5e475b4662622c51b8f375e7b2013e25f3c77b5 diff --git a/src/hashm.h b/src/hashm.h new file mode 100644 index 0000000..67bb3e0 --- /dev/null +++ b/src/hashm.h @@ -0,0 +1,47 @@ +#pragma once + +#include "hashmap.h" +#include "utils.h" +#include <cstring> +#include <mimalloc.h> + +#define WAYC_HASHMAP_SEED 0 +#define WAYC_HASHMAP_CAP 16 + +template <typename T> struct hashmap_s { + struct hashmap *inner; +}; + +template <typename T> +static inline i32 wayc_hashmap_hash(const void *item, uint64_t seed0, + uint64_t seed1) { + wayc_notnull(item); + return hashmap_xxhash3(item, sizeof(T), seed0, seed1); +} + +template <typename T> +static inline bool wayc_hashmap_compare(const void *a, const void *b, + void *udata) { + (void)udata; + + wayc_notnull(a); + wayc_notnull(b); + return memcmp(a, b, sizeof(T)) == 0; +} + +template <typename T> inline hashmap_s<T> wayc_hashmap_init(void) { + struct hashmap *map = hashmap_new_with_allocator( + mi_malloc, mi_realloc, mi_free, sizeof(T), WAYC_HASHMAP_CAP, + WAYC_HASHMAP_SEED, WAYC_HASHMAP_SEED, wayc_hashmap_hash<T>, + wayc_hashmap_compare<T>, nullptr, nullptr); + + hashmap_s<T> result; + result.inner = map; + + return result; +} + +template <typename T> inline void wayc_hashmap_deinit(hashmap_s<T> *map) { + hashmap_free(map->inner); + map->inner = nullptr; +}
\ No newline at end of file |