lib: hashmap: Move hash table files lib/hashmap

Moves the hashmap related files into their own directory Signed-off-by: Joshua Lilly <jgl@fb.com>
2023-02-24 16:09:42 -05:00 · 2023-02-24 16:09:42 -05:00 · 69966dd452
parent 8333b12da7
commit 69966dd452
13 changed files with 17 additions and 10 deletions
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@ -5,6 +5,7 @@ add_subdirectory(libc)
 add_subdirectory(posix)
 endif()
 add_subdirectory_ifdef(CONFIG_CPP                  cpp)
+add_subdirectory(hash)
 add_subdirectory(os)
 add_subdirectory(util)
 add_subdirectory_ifdef(CONFIG_SMF smf)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@ -7,6 +7,8 @@ source "lib/cpp/Kconfig"

 menu "Additional libraries"

+source "lib/hash/Kconfig"
+
 source "lib/os/Kconfig"

 source "lib/posix/Kconfig"
--- a/lib/hash/CMakeLists.txt
+++ b/lib/hash/CMakeLists.txt
@ -0,0 +1,9 @@
+# Copyright (c) 2022 Meta
+#
+# SPDX-License-Identifier: Apache-2.0
+zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_DJB2 hash_func32_djb2.c)
+zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_MURMUR3 hash_func32_murmur3.c)
+
+zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_SC hash_map_sc.c)
+zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_OA_LP hash_map_oa_lp.c)
+zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_CXX hash_map_cxx.cpp)
--- a/lib/hash/Kconfig
+++ b/lib/hash/Kconfig
@ -0,0 +1,5 @@
+# Copyright (c) 2022 Meta
+#
+# SPDX-License-Identifier: Apache-2.0
+rsource "Kconfig.hash_func"
+rsource "Kconfig.hash_map"
--- a/lib/hash/Kconfig.hash_func
+++ b/lib/hash/Kconfig.hash_func
--- a/lib/hash/Kconfig.hash_map
+++ b/lib/hash/Kconfig.hash_map
--- a/lib/hash/hash_func32_djb2.c
+++ b/lib/hash/hash_func32_djb2.c
--- a/lib/hash/hash_func32_murmur3.c
+++ b/lib/hash/hash_func32_murmur3.c
--- a/lib/hash/hash_map_cxx.cpp
+++ b/lib/hash/hash_map_cxx.cpp
--- a/lib/hash/hash_map_oa_lp.c
+++ b/lib/hash/hash_map_oa_lp.c
--- a/lib/hash/hash_map_sc.c
+++ b/lib/hash/hash_map_sc.c
--- a/lib/os/CMakeLists.txt
+++ b/lib/os/CMakeLists.txt
@ -64,13 +64,6 @@ zephyr_sources_ifdef(CONFIG_SYS_MEM_BLOCKS mem_blocks.c)

 zephyr_sources_ifdef(CONFIG_WINSTREAM winstream.c)

-zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_DJB2 hash_func32_djb2.c)
-zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_MURMUR3 hash_func32_murmur3.c)
-
-zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_SC hash_map_sc.c)
-zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_OA_LP hash_map_oa_lp.c)
-zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_CXX hash_map_cxx.cpp)
-
 zephyr_library_include_directories(
  ${ZEPHYR_BASE}/kernel/include
  ${ZEPHYR_BASE}/arch/${ARCH}/include
--- a/lib/os/Kconfig
+++ b/lib/os/Kconfig
@ -176,7 +176,4 @@ rsource "Kconfig.cbprintf"

 rsource "Kconfig.heap"

-rsource "Kconfig.hash_func"
-rsource "Kconfig.hash_map"
-
 endmenu