Muldersoft/LibHashSet
Muldersoft/LibHashSet
1
0
Fork 0
Code Releases 4 Activity

Re-organized "example" and "test" projects.

Browse Source
This commit is contained in:
LoRd_MuldeR 2022-11-30 14:40:43 +01:00
parent aa8d45936c
commit c4a98bfb48
26 changed files with 221 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
example/Makefile
View File

@ -1,52 +1,16 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine) SUBDIRS := hash-set
ifneq ($(DEBUG),) BUILD_ALL := $(patsubst %,build\:%,$(SUBDIRS))
XCFLAGS = -Og -g CLEAN_ALL := $(patsubst %,clean\:%,$(SUBDIRS))
else
ifneq ($(ASAN),)
XCFLAGS = -O1 -g -fsanitize=address -fno-omit-frame-pointer -static-libasan
else
XCFLAGS = -Ofast -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -march=pentiumpro -mtune=intel
endif
ifneq ($(FLTO),)
XCFLAGS += -flto
endif
XCFLAGS += -s -static
endif
endif
ifneq ($(firstword $(filter %-mingw32 %-cygwin,$(DUMPMACHINE))),) .PHONY: all clean $(BUILD_ALL) $(CLEAN_ALL)
EXE_SUFFIX := .exe
ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -Wl,--large-address-aware
endif
endif
CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../libhashset/include $(XCFLAGS) all: $(BUILD_ALL)
SRC_PATH := src clean: $(CLEAN_ALL)
BIN_PATH := bin
ALL_PATH := $(SRC_PATH) $(BIN_PATH)
BIN_FILE := $(BIN_PATH)/hashset-example$(EXE_SUFFIX) $(BUILD_ALL):
SRC_FILE := $(wildcard $(SRC_PATH)/*.c) $(MAKE) -C $(patsubst build:%,%,$@)
LIB_FILE := ../libhashset/lib/libhashset-1.a
.PHONY: all build clean $(CLEAN_ALL):
$(MAKE) -C $(patsubst clean:%,%,$@) clean
all: clean build
build: $(ALL_PATH) $(BIN_FILE)
$(BIN_FILE): $(SRC_FILE) $(LIB_FILE)
$(CC) $(CFLAGS) -o $@ $^
$(ALL_PATH):
mkdir -p $@
clean:
rm -f $(BIN_FILE)

52
example/hash-set/Makefile Normal file
View File

@ -0,0 +1,52 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine)
ifneq ($(DEBUG),)
XCFLAGS = -Og -g
else
ifneq ($(ASAN),)
XCFLAGS = -O1 -g -fsanitize=address -fno-omit-frame-pointer -static-libasan
else
XCFLAGS = -Ofast -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -march=pentiumpro -mtune=intel
endif
ifneq ($(FLTO),)
XCFLAGS += -flto
endif
XCFLAGS += -s -static
endif
endif
ifneq ($(firstword $(filter %-mingw32 %-cygwin,$(DUMPMACHINE))),)
EXE_SUFFIX := .exe
ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -Wl,--large-address-aware
endif
endif
CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../../libhashset/include $(XCFLAGS)
SRC_PATH := src
BIN_PATH := bin
ALL_PATH := $(SRC_PATH) $(BIN_PATH)
BIN_FILE := $(BIN_PATH)/hashset-example$(EXE_SUFFIX)
SRC_FILE := $(wildcard $(SRC_PATH)/*.c)
LIB_FILE := ../../libhashset/lib/libhashset-1.a
.PHONY: all build clean
all: clean build
build: $(ALL_PATH) $(BIN_FILE)
$(BIN_FILE): $(SRC_FILE) $(LIB_FILE)
$(CC) $(CFLAGS) -o $@ $^
$(ALL_PATH):
mkdir -p $@
clean:
rm -f $(BIN_FILE)

12
example/hashset-example.vcxproj → example/hash-set/hashset-example.vcxproj
View File

@ -43,20 +43,20 @@
<ClCompile Include="src\main.c" /> <ClCompile Include="src\main.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\libhashset\libhashset.vcxproj"> <ClInclude Include="src\input.h" />
<Project>{8cf3bd19-28b1-435d-b719-e00b052dfc3a}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\input.h" /> <ProjectReference Include="..\..\libhashset\libhashset.vcxproj">
<Project>{8cf3bd19-28b1-435d-b719-e00b052dfc3a}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<ProjectGuid>{8FB9B9DE-DC49-4224-892B-589422484766}</ProjectGuid> <ProjectGuid>{8FB9B9DE-DC49-4224-892B-589422484766}</ProjectGuid>
<RootNamespace>hashset-example</RootNamespace> <RootNamespace>example-hash-set</RootNamespace>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<ProjectName>hashset-example</ProjectName> <ProjectName>example-hash-set</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

0
example/hashset-example.vcxproj.filters → example/hash-set/hashset-example.vcxproj.filters
View File

0
example/src/input.c → example/hash-set/src/input.c
View File

0
example/src/input.h → example/hash-set/src/input.h
View File

0
example/src/main.c → example/hash-set/src/main.c
View File

50
hashset.sln
View File

@ -3,11 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.33027.164 VisualStudioVersion = 16.0.33027.164
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashset-test", "test\hashset-test.vcxproj", "{0B7ABB95-B60F-418B-8386-930B1629058F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhashset", "libhashset\libhashset.vcxproj", "{8CF3BD19-28B1-435D-B719-E00B052DFC3A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhashset", "libhashset\libhashset.vcxproj", "{8CF3BD19-28B1-435D-B719-E00B052DFC3A}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashset-example", "example\hashset-example.vcxproj", "{8FB9B9DE-DC49-4224-892B-589422484766}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-hash-set", "example\hash-set\hashset-example.vcxproj", "{8FB9B9DE-DC49-4224-892B-589422484766}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{1EFCA710-2528-41D7-B757-F4615301DCA2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{42437750-05E3-4DB6-AADA-FB44E73729B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-hash-set", "test\hash-set\hashset-test.vcxproj", "{0B7ABB95-B60F-418B-8386-930B1629058F}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -22,24 +26,6 @@ Global
Static|x86 = Static|x86 Static|x86 = Static|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.Build.0 = Debug|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.ActiveCfg = Debug|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.Build.0 = Debug|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.ActiveCfg = Debug|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.Build.0 = Debug|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.ActiveCfg = Shared|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.Build.0 = Shared|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.ActiveCfg = Shared|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.Build.0 = Shared|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.ActiveCfg = Shared|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.Build.0 = Shared|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.ActiveCfg = Static|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.Build.0 = Static|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.ActiveCfg = Static|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.Build.0 = Static|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.ActiveCfg = Static|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.Build.0 = Static|Win32
{8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.Build.0 = Debug|ARM64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.Build.0 = Debug|ARM64
{8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x64.ActiveCfg = Debug|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x64.ActiveCfg = Debug|x64
@ -76,10 +62,32 @@ Global
{8FB9B9DE-DC49-4224-892B-589422484766}.Static|x64.Build.0 = Static|x64 {8FB9B9DE-DC49-4224-892B-589422484766}.Static|x64.Build.0 = Static|x64
{8FB9B9DE-DC49-4224-892B-589422484766}.Static|x86.ActiveCfg = Static|Win32 {8FB9B9DE-DC49-4224-892B-589422484766}.Static|x86.ActiveCfg = Static|Win32
{8FB9B9DE-DC49-4224-892B-589422484766}.Static|x86.Build.0 = Static|Win32 {8FB9B9DE-DC49-4224-892B-589422484766}.Static|x86.Build.0 = Static|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.Build.0 = Debug|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.ActiveCfg = Debug|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.Build.0 = Debug|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.ActiveCfg = Debug|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.Build.0 = Debug|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.ActiveCfg = Shared|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.Build.0 = Shared|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.ActiveCfg = Shared|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.Build.0 = Shared|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.ActiveCfg = Shared|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.Build.0 = Shared|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.ActiveCfg = Static|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.Build.0 = Static|ARM64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.ActiveCfg = Static|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.Build.0 = Static|x64
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.ActiveCfg = Static|Win32
{0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.Build.0 = Static|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8FB9B9DE-DC49-4224-892B-589422484766} = {1EFCA710-2528-41D7-B757-F4615301DCA2}
{0B7ABB95-B60F-418B-8386-930B1629058F} = {42437750-05E3-4DB6-AADA-FB44E73729B0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DC8E0EA3-7ABA-4BA8-B2E1-D9A43934BA40} SolutionGuid = {DC8E0EA3-7ABA-4BA8-B2E1-D9A43934BA40}
EndGlobalSection EndGlobalSection

19
libhashset/include/hash_map.h
View File

@ -46,8 +46,8 @@ HASHSET_API hash_map64_t *hash_map_create64(const size_t initial_capacity, const
HASHSET_API void hash_map_destroy32(hash_map32_t *const instance); HASHSET_API void hash_map_destroy32(hash_map32_t *const instance);
HASHSET_API void hash_map_destroy64(hash_map64_t *const instance); HASHSET_API void hash_map_destroy64(hash_map64_t *const instance);
HASHSET_API errno_t hash_map_insert32(hash_map32_t *const instance, const uint32_t key, const uintptr_t value); HASHSET_API errno_t hash_map_insert32(hash_map32_t *const instance, const uint32_t key, const uint32_t value);
HASHSET_API errno_t hash_map_insert64(hash_map64_t *const instance, const uint64_t key, const uintptr_t value); HASHSET_API errno_t hash_map_insert64(hash_map64_t *const instance, const uint64_t key, const uint64_t value);
HASHSET_API errno_t hash_map_remove32(hash_map32_t *const instance, const uint32_t key); HASHSET_API errno_t hash_map_remove32(hash_map32_t *const instance, const uint32_t key);
HASHSET_API errno_t hash_map_remove64(hash_map64_t *const instance, const uint64_t key); HASHSET_API errno_t hash_map_remove64(hash_map64_t *const instance, const uint64_t key);
@ -58,11 +58,11 @@ HASHSET_API errno_t hash_map_clear64(hash_map64_t *const instance);
HASHSET_API errno_t hash_map_contains32(const hash_map32_t *const instance, const uint32_t key); HASHSET_API errno_t hash_map_contains32(const hash_map32_t *const instance, const uint32_t key);
HASHSET_API errno_t hash_map_contains64(const hash_map64_t *const instance, const uint64_t key); HASHSET_API errno_t hash_map_contains64(const hash_map64_t *const instance, const uint64_t key);
HASHSET_API errno_t hash_map_get32(const hash_map32_t *const instance, const uint32_t key, uintptr_t *const value); HASHSET_API errno_t hash_map_get32(const hash_map32_t *const instance, const uint32_t key, uint32_t *const value);
HASHSET_API errno_t hash_map_get64(const hash_map64_t *const instance, const uint64_t key, uintptr_t *const value); HASHSET_API errno_t hash_map_get64(const hash_map64_t *const instance, const uint64_t key, uint64_t *const value);
HASHSET_API errno_t hash_map_iterate32(const hash_map32_t *const instance, size_t *const cursor, uint32_t *const key, uintptr_t *const value); HASHSET_API errno_t hash_map_iterate32(const hash_map32_t *const instance, size_t *const cursor, uint32_t *const key, uint32_t *const value);
HASHSET_API errno_t hash_map_iterate64(const hash_map64_t *const instance, size_t *const cursor, uint64_t *const key, uintptr_t *const value); HASHSET_API errno_t hash_map_iterate64(const hash_map64_t *const instance, size_t *const cursor, uint64_t *const key, uint64_t *const value);
HASHSET_API size_t hash_map_size32(const hash_map32_t *const instance); HASHSET_API size_t hash_map_size32(const hash_map32_t *const instance);
HASHSET_API size_t hash_map_size64(const hash_map64_t *const instance); HASHSET_API size_t hash_map_size64(const hash_map64_t *const instance);
@ -70,8 +70,11 @@ HASHSET_API size_t hash_map_size64(const hash_map64_t *const instance);
HASHSET_API errno_t hash_map_info32(const hash_map32_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit); HASHSET_API errno_t hash_map_info32(const hash_map32_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit);
HASHSET_API errno_t hash_map_info64(const hash_map64_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit); HASHSET_API errno_t hash_map_info64(const hash_map64_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit);
HASHSET_API errno_t hash_map_dump32(const hash_map32_t *const instance, int (*const callback)(const size_t index, const char status, const uint32_t key, const uintptr_t value)); typedef int (*hash_map_callback32_t)(const size_t index, const char status, const uint32_t key, const uint32_t value);
HASHSET_API errno_t hash_map_dump64(const hash_map64_t *const instance, int (*const callback)(const size_t index, const char status, const uint64_t key, const uintptr_t value)); typedef int (*hash_map_callback64_t)(const size_t index, const char status, const uint64_t key, const uint64_t value);
HASHSET_API errno_t hash_map_dump32(const hash_map32_t *const instance, const hash_map_callback32_t callback);
HASHSET_API errno_t hash_map_dump64(const hash_map64_t *const instance, const hash_map_callback64_t callback);
#ifdef __cplusplus #ifdef __cplusplus
} }

7
libhashset/include/hash_set.h
View File

@ -67,8 +67,11 @@ HASHSET_API size_t hash_set_size64(const hash_set64_t *const instance);
HASHSET_API errno_t hash_set_info32(const hash_set32_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit); HASHSET_API errno_t hash_set_info32(const hash_set32_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit);
HASHSET_API errno_t hash_set_info64(const hash_set64_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit); HASHSET_API errno_t hash_set_info64(const hash_set64_t *const instance, size_t *const capacity, size_t *const valid, size_t *const deleted, size_t *const limit);
HASHSET_API errno_t hash_set_dump32(const hash_set32_t *const instance, int (*const callback)(const size_t index, const char status, const uint32_t item)); typedef int (*hash_set_callback32_t)(const size_t index, const char status, const uint32_t item);
HASHSET_API errno_t hash_set_dump64(const hash_set64_t *const instance, int (*const callback)(const size_t index, const char status, const uint64_t item)); typedef int (*hash_set_callback64_t)(const size_t index, const char status, const uint64_t item);
HASHSET_API errno_t hash_set_dump32(const hash_set32_t *const instance, const hash_set_callback32_t callback);
HASHSET_API errno_t hash_set_dump64(const hash_set64_t *const instance, const hash_set_callback64_t callback);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
libhashset/src/common.h
View File

@ -44,6 +44,9 @@ static const double DEFAULT_LOADFCTR = 0.8;
#define SAFE_FREE(X) do { if ((X)) { free((X)); (X) = NULL; } } while(0) #define SAFE_FREE(X) do { if ((X)) { free((X)); (X) = NULL; } } while(0)
#define _CONCAT(X,Y) X##Y
#define CONCAT(X,Y) _CONCAT(X,Y)
/* ------------------------------------------------- */ /* ------------------------------------------------- */
/* Math */ /* Math */
/* ------------------------------------------------- */ /* ------------------------------------------------- */

33
libhashset/src/generic_hash_map.h
View File

@ -12,9 +12,6 @@
#error NAME_SUFFIX must be defined! #error NAME_SUFFIX must be defined!
#endif #endif
#define _CONCAT(X,Y) X##Y
#define CONCAT(X,Y) _CONCAT(X,Y)
#define DECLARE(X) CONCAT(X,NAME_SUFFIX) #define DECLARE(X) CONCAT(X,NAME_SUFFIX)
/* ------------------------------------------------- */ /* ------------------------------------------------- */
@ -23,8 +20,7 @@
typedef struct DECLARE(_hash_map_data) typedef struct DECLARE(_hash_map_data)
{ {
key_t *keys; value_t *keys, *values;
uintptr_t *values;
uint8_t *used, *deleted; uint8_t *used, *deleted;
size_t capacity; size_t capacity;
} }
@ -45,13 +41,13 @@ static INLINE bool_t alloc_data(hash_data_t *const data, const size_t capacity)
{ {
zero_memory(data, 1U, sizeof(hash_data_t)); zero_memory(data, 1U, sizeof(hash_data_t));
data->keys = (key_t*) calloc(capacity, sizeof(key_t)); data->keys = (value_t*) calloc(capacity, sizeof(value_t));
if (!data->values) if (!data->values)
{ {
return FALSE; return FALSE;
} }
data->values = (uintptr_t*) calloc(capacity, sizeof(uintptr_t)); data->values = (value_t*) calloc(capacity, sizeof(value_t));
if (!data->values) if (!data->values)
{ {
return FALSE; return FALSE;
@ -94,7 +90,7 @@ static INLINE void free_data(hash_data_t *const data)
#define INDEX(X) ((size_t)((X) % data->capacity)) #define INDEX(X) ((size_t)((X) % data->capacity))
static INLINE bool_t find_slot(const hash_data_t *const data, const key_t key, size_t *const index_out, bool_t *const reused_out) static INLINE bool_t find_slot(const hash_data_t *const data, const value_t key, size_t *const index_out, bool_t *const reused_out)
{ {
uint64_t loop = 0U; uint64_t loop = 0U;
bool_t is_saved = FALSE; bool_t is_saved = FALSE;
@ -131,7 +127,7 @@ static INLINE bool_t find_slot(const hash_data_t *const data, const key_t key, s
return FALSE; return FALSE;
} }
static INLINE void put_value(hash_data_t *const data, const size_t index, const key_t key, const uintptr_t value, const bool_t reusing) static INLINE void put_value(hash_data_t *const data, const size_t index, const value_t key, const value_t value, const bool_t reusing)
{ {
data->keys[index] = key; data->keys[index] = key;
data->values[index] = value; data->values[index] = value;
@ -179,8 +175,7 @@ static INLINE errno_t rebuild_map(hash_map_t *const instance, const size_t new_c
{ {
if (IS_VALID(instance->data, k)) if (IS_VALID(instance->data, k))
{ {
const key_t key = instance->data.keys[k]; const value_t key = instance->data.keys[k], value = instance->data.values[k];
const uintptr_t value = instance->data.values[k];
if (find_slot(&temp, key, &index, NULL)) if (find_slot(&temp, key, &index, NULL))
{ {
free_data(&temp); free_data(&temp);
@ -232,7 +227,7 @@ void DECLARE(hash_map_destroy)(hash_map_t *instance)
} }
} }
errno_t DECLARE(hash_map_insert)(hash_map_t *const instance, const key_t key, const uintptr_t value) errno_t DECLARE(hash_map_insert)(hash_map_t *const instance, const value_t key, const value_t value)
{ {
size_t index; size_t index;
bool_t slot_reused; bool_t slot_reused;
@ -244,7 +239,7 @@ errno_t DECLARE(hash_map_insert)(hash_map_t *const instance, const key_t key, co
if (find_slot(&instance->data, key, &index, &slot_reused)) if (find_slot(&instance->data, key, &index, &slot_reused))
{ {
instance->data.values[index] = index; instance->data.values[index] = value;
return EEXIST; return EEXIST;
} }
@ -272,7 +267,7 @@ errno_t DECLARE(hash_map_insert)(hash_map_t *const instance, const key_t key, co
return 0; return 0;
} }
errno_t DECLARE(hash_map_contains)(const hash_map_t *const instance, const key_t key) errno_t DECLARE(hash_map_contains)(const hash_map_t *const instance, const value_t key)
{ {
if ((!instance) || (!instance->data.keys)) if ((!instance) || (!instance->data.keys))
{ {
@ -282,7 +277,7 @@ errno_t DECLARE(hash_map_contains)(const hash_map_t *const instance, const key_t
return (instance->valid && find_slot(&instance->data, key, NULL, NULL)) ? 0 : ENOENT; return (instance->valid && find_slot(&instance->data, key, NULL, NULL)) ? 0 : ENOENT;
} }
errno_t DECLARE(hash_map_get)(const hash_map_t *const instance, const key_t key, uintptr_t *const value) errno_t DECLARE(hash_map_get)(const hash_map_t *const instance, const value_t key, value_t *const value)
{ {
size_t index; size_t index;
@ -300,7 +295,7 @@ errno_t DECLARE(hash_map_get)(const hash_map_t *const instance, const key_t key,
return 0; return 0;
} }
errno_t DECLARE(hash_map_remove)(hash_map_t *const instance, const key_t key) errno_t DECLARE(hash_map_remove)(hash_map_t *const instance, const value_t key)
{ {
size_t index; size_t index;
@ -367,7 +362,7 @@ errno_t DECLARE(hash_map_clear)(hash_map_t *const instance)
return 0; return 0;
} }
errno_t DECLARE(hash_map_iterate)(const hash_map_t *const instance, size_t *const cursor, key_t *const key, uintptr_t *const value) errno_t DECLARE(hash_map_iterate)(const hash_map_t *const instance, size_t *const cursor, value_t *const key, value_t *const value)
{ {
size_t index; size_t index;
@ -429,11 +424,11 @@ errno_t DECLARE(hash_map_info)(const hash_map_t *const instance, size_t *const c
return 0; return 0;
} }
HASHSET_API errno_t DECLARE(hash_map_dump)(const hash_map_t *const instance, int (*const callback)(const size_t index, const char status, const key_t key, const uintptr_t value)) HASHSET_API errno_t DECLARE(hash_map_dump)(const hash_map_t *const instance, const hash_map_callback_t callback)
{ {
size_t index; size_t index;
if ((!instance) || (!instance->data.values)) if ((!instance) || (!instance->data.values) || (!callback))
{ {
return EINVAL; return EINVAL;
} }

25
libhashset/src/generic_hash_set.h
View File

@ -12,9 +12,6 @@
#error NAME_SUFFIX must be defined! #error NAME_SUFFIX must be defined!
#endif #endif
#define _CONCAT(X,Y) X##Y
#define CONCAT(X,Y) _CONCAT(X,Y)
#define DECLARE(X) CONCAT(X,NAME_SUFFIX) #define DECLARE(X) CONCAT(X,NAME_SUFFIX)
/* ------------------------------------------------- */ /* ------------------------------------------------- */
@ -23,7 +20,7 @@
typedef struct DECLARE(_hash_set_data) typedef struct DECLARE(_hash_set_data)
{ {
item_t *items; value_t *items;
uint8_t *used, *deleted; uint8_t *used, *deleted;
size_t capacity; size_t capacity;
} }
@ -44,7 +41,7 @@ static INLINE bool_t alloc_data(hash_data_t *const data, const size_t capacity)
{ {
zero_memory(data, 1U, sizeof(hash_data_t)); zero_memory(data, 1U, sizeof(hash_data_t));
data->items = (item_t*) calloc(capacity, sizeof(item_t)); data->items = (value_t*) calloc(capacity, sizeof(value_t));
if (!data->items) if (!data->items)
{ {
return FALSE; return FALSE;
@ -86,7 +83,7 @@ static INLINE void free_data(hash_data_t *const data)
#define INDEX(X) ((size_t)((X) % data->capacity)) #define INDEX(X) ((size_t)((X) % data->capacity))
static INLINE bool_t find_slot(const hash_data_t *const data, const item_t item, size_t *const index_out, bool_t *const reused_out) static INLINE bool_t find_slot(const hash_data_t *const data, const value_t item, size_t *const index_out, bool_t *const reused_out)
{ {
uint64_t loop = 0U; uint64_t loop = 0U;
bool_t is_saved = FALSE; bool_t is_saved = FALSE;
@ -123,7 +120,7 @@ static INLINE bool_t find_slot(const hash_data_t *const data, const item_t item,
return FALSE; return FALSE;
} }
static INLINE void put_item(hash_data_t *const data, const size_t index, const item_t item, const bool_t reusing) static INLINE void put_item(hash_data_t *const data, const size_t index, const value_t item, const bool_t reusing)
{ {
data->items[index] = item; data->items[index] = item;
@ -170,7 +167,7 @@ static INLINE errno_t rebuild_set(hash_set_t *const instance, const size_t new_c
{ {
if (IS_VALID(instance->data, k)) if (IS_VALID(instance->data, k))
{ {
const item_t item = instance->data.items[k]; const value_t item = instance->data.items[k];
if (find_slot(&temp, item, &index, NULL)) if (find_slot(&temp, item, &index, NULL))
{ {
free_data(&temp); free_data(&temp);
@ -222,7 +219,7 @@ void DECLARE(hash_set_destroy)(hash_set_t *instance)
} }
} }
errno_t DECLARE(hash_set_insert)(hash_set_t *const instance, const item_t item) errno_t DECLARE(hash_set_insert)(hash_set_t *const instance, const value_t item)
{ {
size_t index; size_t index;
bool_t slot_reused; bool_t slot_reused;
@ -261,7 +258,7 @@ errno_t DECLARE(hash_set_insert)(hash_set_t *const instance, const item_t item)
return 0; return 0;
} }
errno_t DECLARE(hash_set_contains)(const hash_set_t *const instance, const item_t item) errno_t DECLARE(hash_set_contains)(const hash_set_t *const instance, const value_t item)
{ {
if ((!instance) || (!instance->data.items)) if ((!instance) || (!instance->data.items))
{ {
@ -271,7 +268,7 @@ errno_t DECLARE(hash_set_contains)(const hash_set_t *const instance, const item_
return (instance->valid && find_slot(&instance->data, item, NULL, NULL)) ? 0 : ENOENT; return (instance->valid && find_slot(&instance->data, item, NULL, NULL)) ? 0 : ENOENT;
} }
errno_t DECLARE(hash_set_remove)(hash_set_t *const instance, const item_t item) errno_t DECLARE(hash_set_remove)(hash_set_t *const instance, const value_t item)
{ {
size_t index; size_t index;
@ -338,7 +335,7 @@ errno_t DECLARE(hash_set_clear)(hash_set_t *const instance)
return 0; return 0;
} }
errno_t DECLARE(hash_set_iterate)(const hash_set_t *const instance, size_t *const cursor, item_t *const item) errno_t DECLARE(hash_set_iterate)(const hash_set_t *const instance, size_t *const cursor, value_t *const item)
{ {
size_t index; size_t index;
@ -396,11 +393,11 @@ errno_t DECLARE(hash_set_info)(const hash_set_t *const instance, size_t *const c
return 0; return 0;
} }
HASHSET_API errno_t DECLARE(hash_set_dump)(const hash_set_t *const instance, int (*const callback)(const size_t index, const char status, const item_t item)) HASHSET_API errno_t DECLARE(hash_set_dump)(const hash_set_t *const instance, const hash_set_callback_t callback)
{ {
size_t index; size_t index;
if ((!instance) || (!instance->data.items)) if ((!instance) || (!instance->data.items) || (!callback))
{ {
return EINVAL; return EINVAL;
} }

3
libhashset/src/hash_map_32.c
View File

@ -7,6 +7,7 @@
#define NAME_SUFFIX 32 #define NAME_SUFFIX 32
typedef hash_map32_t hash_map_t; typedef hash_map32_t hash_map_t;
typedef uint32_t key_t; typedef hash_map_callback32_t hash_map_callback_t;
typedef uint32_t value_t;
#include "generic_hash_map.h" #include "generic_hash_map.h"

3
libhashset/src/hash_map_64.c
View File

@ -7,6 +7,7 @@
#define NAME_SUFFIX 64 #define NAME_SUFFIX 64
typedef hash_map64_t hash_map_t; typedef hash_map64_t hash_map_t;
typedef uint64_t key_t; typedef hash_map_callback64_t hash_map_callback_t;
typedef uint64_t value_t;
#include "generic_hash_map.h" #include "generic_hash_map.h"

3
libhashset/src/hash_set_32.c
View File

@ -7,6 +7,7 @@
#define NAME_SUFFIX 32 #define NAME_SUFFIX 32
typedef hash_set32_t hash_set_t; typedef hash_set32_t hash_set_t;
typedef uint32_t item_t; typedef hash_set_callback32_t hash_set_callback_t;
typedef uint32_t value_t;
#include "generic_hash_set.h" #include "generic_hash_set.h"

3
libhashset/src/hash_set_64.c
View File

@ -7,6 +7,7 @@
#define NAME_SUFFIX 64 #define NAME_SUFFIX 64
typedef hash_set64_t hash_set_t; typedef hash_set64_t hash_set_t;
typedef uint64_t item_t; typedef hash_set_callback64_t hash_set_callback_t;
typedef uint64_t value_t;
#include "generic_hash_set.h" #include "generic_hash_set.h"

56
test/Makefile
View File

@ -1,52 +1,16 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine) SUBDIRS := hash-set
ifneq ($(DEBUG),) BUILD_ALL := $(patsubst %,build\:%,$(SUBDIRS))
XCFLAGS = -Og -g CLEAN_ALL := $(patsubst %,clean\:%,$(SUBDIRS))
else
ifneq ($(ASAN),)
XCFLAGS = -O1 -g -fsanitize=address -fno-omit-frame-pointer -static-libasan
else
XCFLAGS = -Ofast -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -march=pentiumpro -mtune=intel
endif
ifneq ($(FLTO),)
XCFLAGS += -flto
endif
XCFLAGS += -s -static
endif
endif
ifneq ($(firstword $(filter %-mingw32 %-cygwin,$(DUMPMACHINE))),) .PHONY: all clean $(BUILD_ALL) $(CLEAN_ALL)
EXE_SUFFIX := .exe
ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -Wl,--large-address-aware
endif
endif
CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../libhashset/include $(XCFLAGS) all: $(BUILD_ALL)
SRC_PATH := src clean: $(CLEAN_ALL)
BIN_PATH := bin
ALL_PATH := $(SRC_PATH) $(BIN_PATH)
BIN_FILE := $(BIN_PATH)/hashset-test$(EXE_SUFFIX) $(BUILD_ALL):
SRC_FILE := $(wildcard $(SRC_PATH)/*.c) $(MAKE) -C $(patsubst build:%,%,$@)
LIB_FILE := ../libhashset/lib/libhashset-1.a
.PHONY: all build clean $(CLEAN_ALL):
$(MAKE) -C $(patsubst clean:%,%,$@) clean
all: clean build
build: $(ALL_PATH) $(BIN_FILE)
$(BIN_FILE): $(SRC_FILE) $(LIB_FILE)
$(CC) $(CFLAGS) -o $@ $^
$(ALL_PATH):
mkdir -p $@
clean:
rm -f $(BIN_FILE)

52
test/hash-set/Makefile Normal file
View File

@ -0,0 +1,52 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine)
ifneq ($(DEBUG),)
XCFLAGS = -Og -g
else
ifneq ($(ASAN),)
XCFLAGS = -O1 -g -fsanitize=address -fno-omit-frame-pointer -static-libasan
else
XCFLAGS = -Ofast -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -march=pentiumpro -mtune=intel
endif
ifneq ($(FLTO),)
XCFLAGS += -flto
endif
XCFLAGS += -s -static
endif
endif
ifneq ($(firstword $(filter %-mingw32 %-cygwin,$(DUMPMACHINE))),)
EXE_SUFFIX := .exe
ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -Wl,--large-address-aware
endif
endif
CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../../libhashset/include $(XCFLAGS)
SRC_PATH := src
BIN_PATH := bin
ALL_PATH := $(SRC_PATH) $(BIN_PATH)
BIN_FILE := $(BIN_PATH)/hashset-test$(EXE_SUFFIX)
SRC_FILE := $(wildcard $(SRC_PATH)/*.c)
LIB_FILE := ../../libhashset/lib/libhashset-1.a
.PHONY: all build clean
all: clean build
build: $(ALL_PATH) $(BIN_FILE)
$(BIN_FILE): $(SRC_FILE) $(LIB_FILE)
$(CC) $(CFLAGS) -o $@ $^
$(ALL_PATH):
mkdir -p $@
clean:
rm -f $(BIN_FILE)

14
test/hashset-test.vcxproj → test/hash-set/hashset-test.vcxproj
View File

@ -43,22 +43,22 @@
<ClCompile Include="src\random.c" /> <ClCompile Include="src\random.c" />
<ClCompile Include="src\tests.c" /> <ClCompile Include="src\tests.c" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\libhashset\libhashset.vcxproj">
<Project>{8cf3bd19-28b1-435d-b719-e00b052dfc3a}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\random.h" /> <ClInclude Include="src\random.h" />
<ClInclude Include="src\tests.h" /> <ClInclude Include="src\tests.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\libhashset\libhashset.vcxproj">
<Project>{8cf3bd19-28b1-435d-b719-e00b052dfc3a}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<ProjectGuid>{0b7abb95-b60f-418b-8386-930b1629058f}</ProjectGuid> <ProjectGuid>{0b7abb95-b60f-418b-8386-930b1629058f}</ProjectGuid>
<RootNamespace>hashset-test</RootNamespace> <RootNamespace>test-hash-set</RootNamespace>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<ProjectName>hashset-test</ProjectName> <ProjectName>test-hash-set</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

0
test/hashset-test.vcxproj.filters → test/hash-set/hashset-test.vcxproj.filters
View File

0
test/src/main.c → test/hash-set/src/main.c
View File

0
test/src/random.c → test/hash-set/src/random.c
View File

0
test/src/random.h → test/hash-set/src/random.h
View File

6
test/src/tests.c → test/hash-set/src/tests.c
View File

@ -38,12 +38,12 @@ while(0)
#define MAXIMUM 425984U #define MAXIMUM 425984U
static int dump_callback(const size_t index, const char status, const uint64_t value) static int dump_callback(const size_t index, const char status, const uint64_t item)
{ {
#ifndef NDEBUG #ifndef NDEBUG
printf("%016zX: %c -> %016" PRIX64 "\n", index, status, value); printf("%016zX: %c -> %016" PRIX64 "\n", index, status, item);
#else #else
UNUSED(index); UNUSED(status); UNUSED(value); UNUSED(index); UNUSED(status); UNUSED(item);
#endif #endif
return 1; return 1;
} }

0
test/src/tests.h → test/hash-set/src/tests.h
View File