hash map refactoring

Author: Fredrik Widlund

CHANGES

@@ -14,3 +14,13 @@ Released 2017-12-17
 
   - List type
   - More uniform interfaces
+
+Version 1.2
+===========
+
+Released 2019-04-19
+
+* New features:
+
+  - Add maps (string map) and mapi (uint64_t) abstractions
+  - Refactor map interface

Makefile.am

@@ -15,15 +15,19 @@ src/dynamic/buffer.c \
 src/dynamic/list.c \
 src/dynamic/vector.c \
 src/dynamic/string.c \
-src/dynamic/map.c
+src/dynamic/map.c \
+src/dynamic/maps.c \
+src/dynamic/mapi.c
 
 HEADER_FILES = \
 src/dynamic/hash.h \
 src/dynamic/buffer.h \
 src/dynamic/list.h \
 src/dynamic/vector.h \
 src/dynamic/string.h \
-src/dynamic/map.h
+src/dynamic/map.h \
+src/dynamic/maps.h \
+src/dynamic/mapi.h
 
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LTLIBRARIES= libdynamic.la
@@ -43,14 +47,13 @@ maintainer-clean-local:; rm -rf autotools m4 libdynamic-?.?.?
 
 ### unit tests ###
 
-CHECK_CFLAGS = -std=gnu11 -O0 -g -ftest-coverage -fprofile-arcs
-CHECK_LDADD = -L. -ldynamic_test -lcmocka
-CHECK_LDFLAGS_EXTRA = -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=aligned_alloc -Wl,--wrap=abort
-
 check_LIBRARIES = libdynamic_test.a
 libdynamic_test_a_CFLAGS = $(CHECK_CFLAGS)
 libdynamic_test_a_SOURCES = $(SOURCE_FILES) $(HEADER_FILES)
 
+CHECK_CFLAGS = -std=gnu11 -O0 -g -ftest-coverage -fprofile-arcs
+CHECK_LDADD = libdynamic_test.a -lcmocka
+CHECK_LDFLAGS_EXTRA = -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=aligned_alloc -Wl,--wrap=abort
 
 check_PROGRAMS = test/hash
 test_hash_CFLAGS = $(CHECK_CFLAGS)
@@ -82,6 +85,18 @@ test_string_LDADD = $(CHECK_LDADD)
 test_string_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
 test_string_SOURCES = test/string.c test/mock.c
 
+check_PROGRAMS += test/maps
+test_maps_CFLAGS = $(CHECK_CFLAGS)
+test_maps_LDADD = $(CHECK_LDADD)
+test_maps_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
+test_maps_SOURCES = test/maps.c test/mock.c
+
+check_PROGRAMS += test/mapi
+test_mapi_CFLAGS = $(CHECK_CFLAGS)
+test_mapi_LDADD = $(CHECK_LDADD)
+test_mapi_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
+test_mapi_SOURCES = test/mapi.c test/mock.c
+
 check_PROGRAMS += test/map
 test_map_CFLAGS = $(CHECK_CFLAGS)
 test_map_LDADD = $(CHECK_LDADD)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libdynamic], [1.1.0], [fredrik.widlund@gmail.com])
+AC_INIT([libdynamic], [1.2.0], [fredrik.widlund@gmail.com])
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-define])

examples/Makefile.am

@@ -5,13 +5,17 @@ AM_CXXFLAGS = -std=gnu++11
 AM_CPPFLAGS = $(COMMON_FLAGS)
 AM_LDFLAGS = $(COMMON_FLAGS)
 
-bin_PROGRAMS = string_map list
+bin_PROGRAMS = maps mapi list
 
-string_map_SOURCES = \
-map_str_ptr.c \
-string_map.c
+maps_SOURCES = \
+maps.c
 
-string_map_LDADD = ../libdynamic.la
+maps_LDADD = ../libdynamic.la
+
+mapi_SOURCES = \
+mapi.c
+
+mapi_LDADD = ../libdynamic.la
 
 list_SOURCES = \
 list.c

examples/string_map.c

@@ -1,9 +1,9 @@
 #ifndef DYNAMIC_H_INCLUDED
 #define DYNAMIC_H_INCLUDED
 
-#define DYNAMIC_VERSION "1.1.0"
+#define DYNAMIC_VERSION "1.2.0"
 #define DYNAMIC_VERSION_MAJOR 1
-#define DYNAMIC_VERSION_MINOR 1
+#define DYNAMIC_VERSION_MINOR 2
 #define DYNAMIC_VERSION_PATCH 0
 
 #ifdef __cplusplus
@@ -16,6 +16,8 @@ extern "C" {
 #include <dynamic/vector.h>
 #include <dynamic/string.h>
 #include <dynamic/map.h>
+#include <dynamic/maps.h>
+#include <dynamic/mapi.h>
 
 #ifdef __cplusplus
 }

src/dynamic.h

@@ -220,3 +220,13 @@ uint64_t hash_string(char *s)
 {
   return hash_data(s, strlen(s));
 }
+
+uint64_t hash_uint64(uint64_t v)
+{
+  v ^= v >> 33;
+  v *= 0xff51afd7ed558ccdULL;
+  v ^= v >> 33;
+  v *= 0xc4ceb9fe1a85ec53ULL;
+  v ^= v >> 33;
+  return v;
+}

src/dynamic/hash.c

@@ -3,5 +3,6 @@
 
 uint64_t hash_string(char *);
 uint64_t hash_data(void *, size_t);
+uint64_t hash_uint64(uint64_t);
 
 #endif /* HASH_H_INCLUDED */

src/dynamic/hash.h

@@ -38,7 +38,7 @@ void list_construct(list *l)
   l->previous = (list_item *) l;
 }
 
-void list_destruct(list *l, list_release_callback *release)
+void list_destruct(list *l, list_release *release)
 {
   list_clear(l, release);
 }
@@ -104,7 +104,7 @@ void list_insert(void *list_object, void *object, size_t size)
   item->list.next->list.previous = item;
 }
 
-void list_erase(void *object, list_release_callback *release)
+void list_erase(void *object, list_release *release)
 {
   list_item *item = list_object_item(object);
 
@@ -117,15 +117,15 @@ void list_erase(void *object, list_release_callback *release)
   free(item);
 }
 
-void list_clear(list *l, list_release_callback *release)
+void list_clear(list *l, list_release *release)
 {
   while (!list_empty(l))
     list_erase(list_front(l), release);
 }
 
 /* operations */
 
-void *list_find(list *l, list_compare_callback *compare, void *object)
+void *list_find(list *l, list_compare *compare, void *object)
 {
   void *list_object;
 

src/dynamic/list.c

@@ -4,8 +4,8 @@
 #define list_foreach(l, o)         for ((o) = list_front(l); (o) != list_end(l); (o) = list_next(o))
 #define list_foreach_reverse(l, o) for ((o) = list_back(l); (o) != list_end(l); (o) = list_previous(o))
 
-typedef void             list_release_callback(void *);
-typedef int              list_compare_callback(void *, void *);
+typedef void             list_release(void *);
+typedef int              list_compare(void *, void *);
 typedef struct list_item list_item;
 typedef struct list      list;
 
@@ -23,7 +23,7 @@ struct list_item
 
 /* constructor/destructor */
 void    list_construct(list *);
-void    list_destruct(list *, list_release_callback *);
+void    list_destruct(list *, list_release *);
 
 /* iterators */
 void   *list_next(void *);
@@ -41,10 +41,10 @@ void   *list_end(list *);
 void    list_push_front(list *, void *, size_t);
 void    list_push_back(list *, void *, size_t);
 void    list_insert(void *, void *, size_t);
-void    list_erase(void *, list_release_callback *);
-void    list_clear(list *, list_release_callback *);
+void    list_erase(void *, list_release *);
+void    list_clear(list *, list_release *);
 
 /* operations */
-void   *list_find(list *, list_compare_callback *, void *);
+void   *list_find(list *, list_compare *, void *);
 
 #endif /* LIST_H_INCLUDED */