Merge branch 'release-1.1'

Author: fredrikwidlund

CHANGES

@@ -4,3 +4,13 @@ Version 1.0
 Released 2017-01-03
 
 * Initial release
+
+Version 1.1
+===========
+
+Released 2017-12-17
+
+* New features:
+
+  - List type
+  - More uniform interfaces

Makefile.am

@@ -2,26 +2,28 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 AM_CFLAGS = -std=gnu11 -g -O3 -flto -fuse-linker-plugin
 AM_LDFLAGS = -static
 
-DIST_SUBDIRS = docs benchmark
+DIST_SUBDIRS = docs benchmark examples
 
 EXTRA_DIST = \
 CHANGES \
 LICENSE \
 README.rst
 
 SOURCE_FILES = \
+src/dynamic/hash.c \
+src/dynamic/buffer.c \
+src/dynamic/list.c \
 src/dynamic/vector.c \
 src/dynamic/string.c \
-src/dynamic/buffer.c \
-src/dynamic/map.c \
-src/dynamic/hash.c
+src/dynamic/map.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/buffer.h \
-src/dynamic/map.h \
-src/dynamic/hash.h
+src/dynamic/map.h
 
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LTLIBRARIES= libdynamic.la
@@ -36,7 +38,7 @@ mainheader_HEADERS = src/dynamic.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libdynamic.pc
 
-MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in docs/Makefile.in benchmark/Makefile.in libdynamic-?.?.?.tar.gz
+MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in docs/Makefile.in benchmark/Makefile.in examples/Makefile.in libdynamic-?.?.?.tar.gz
 maintainer-clean-local:; rm -rf autotools m4 libdynamic-?.?.?
 
 ### unit tests ###
@@ -49,12 +51,25 @@ check_LIBRARIES = libdynamic_test.a
 libdynamic_test_a_CFLAGS = $(CHECK_CFLAGS)
 libdynamic_test_a_SOURCES = $(SOURCE_FILES) $(HEADER_FILES)
 
-check_PROGRAMS = test/buffer
+
+check_PROGRAMS = test/hash
+test_hash_CFLAGS = $(CHECK_CFLAGS)
+test_hash_LDADD = $(CHECK_LDADD)
+test_hash_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
+test_hash_SOURCES = test/hash.c test/mock.c
+
+check_PROGRAMS += test/buffer
 test_buffer_CFLAGS = $(CHECK_CFLAGS)
 test_buffer_LDADD = $(CHECK_LDADD)
 test_buffer_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
 test_buffer_SOURCES = test/buffer.c test/mock.c
 
+check_PROGRAMS += test/list
+test_list_CFLAGS = $(CHECK_CFLAGS)
+test_list_LDADD = $(CHECK_LDADD)
+test_list_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
+test_list_SOURCES = test/list.c test/mock.c
+
 check_PROGRAMS += test/vector
 test_vector_CFLAGS = $(CHECK_CFLAGS)
 test_vector_LDADD = $(CHECK_LDADD)
@@ -67,12 +82,6 @@ test_string_LDADD = $(CHECK_LDADD)
 test_string_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
 test_string_SOURCES = test/string.c test/mock.c
 
-check_PROGRAMS += test/hash
-test_hash_CFLAGS = $(CHECK_CFLAGS)
-test_hash_LDADD = $(CHECK_LDADD)
-test_hash_LDFLAGS = $(CHECK_LDFLAGS_EXTRA)
-test_hash_SOURCES = test/hash.c test/mock.c
-
 check_PROGRAMS += test/map
 test_map_CFLAGS = $(CHECK_CFLAGS)
 test_map_LDADD = $(CHECK_LDADD)

benchmark/map.c

@@ -73,21 +73,18 @@ static void shuffle(int *array, size_t n)
 
 static int set_int_empty = -1;
 
-static size_t set_int_hash(map *m, void *e)
+static size_t set_int_hash(void *e)
 {
-  (void) m;
   return *(int *) e;
 }
 
-static int set_int_equal(map *m, void *e1, void *e2)
+static int set_int_equal(void *e1, void *e2)
 {
-  (void) m;
   return *(int *) e1 == *(int *) e2;
 }
 
-static void set_int_set(map *m, void *e1, void *e2)
+static void set_int_set(void *e1, void *e2)
 {
-  (void) m;
   *(int *) e1 = *(int *) e2;
 }
 
@@ -182,5 +179,5 @@ int main()
       (void) fprintf(stdout, "%s,%lu,%f,%f,%f,%lu\n", mp->name, mp->size, mp->insert, mp->lookup, mp->delete, mp->sum);
     }
 
-  vector_destruct(&metrics);
+  vector_destruct(&metrics, NULL);
 }

benchmark/map_libdynamic.c

@@ -15,21 +15,18 @@ struct map_element
   uint32_t value;
 };
 
-static size_t hash(map *m, void *e)
+static size_t hash(void *e)
 {
-  (void) m;
   return *(uint32_t *) e;
 }
 
-static int equal(map *m, void *e1, void *e2)
+static int equal(void *e1, void *e2)
 {
-  (void) m;
   return *(uint32_t *) e1 == *(uint32_t *) e2;
 }
 
-static void set(map *m, void *e1, void *e2)
+static void set(void *e1, void *e2)
 {
-  (void) m;
   *(uint64_t *) e1 = *(uint64_t *) e2;
 }
 

benchmark/map_libdynamic_subclass.c

@@ -19,21 +19,18 @@ struct map_int_pair_element
 
 static map_int_pair_element empty = {.key = -1};
 
-static size_t hash(map *m, void *e)
+static size_t hash(void *e)
 {
-  (void) m;
   return *(uint32_t *) e;
 }
 
-static void set(map *m, void *dst, void *src)
+static void set(void *dst, void *src)
 {
-  (void) m;
   *(uint64_t *) dst = *(uint64_t *) src;
 }
 
-static int equal(map *m, void *e1, void *e2)
+static int equal(void *e1, void *e2)
 {
-  (void) m;
   return *(uint32_t *) e1 == *(uint32_t *) e2;
 }
 

benchmark/vector_dynamic.c

@@ -21,5 +21,5 @@ void vector_dynamic(vector_metric *metric, size_t n)
   t2 = ntime();
   metric->insert = (double) (t2 - t1) / n;
 
-  vector_destruct(&v);
+  vector_destruct(&v, NULL);
 }

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libdynamic], [1.0.0], [fredrik.widlund@gmail.com])
+AC_INIT([libdynamic], [1.1.0], [fredrik.widlund@gmail.com])
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-define])
@@ -11,5 +11,5 @@ AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 AC_PROG_CXX
 
-AC_CONFIG_FILES([Makefile docs/Makefile benchmark/Makefile libdynamic.pc])
+AC_CONFIG_FILES([Makefile docs/Makefile benchmark/Makefile examples/Makefile libdynamic.pc])
 AC_OUTPUT