X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=1d8e270b33b17d74b839ee73b33bdc3866d8e5bd;hb=3b23e9d5af4f02836b689286824c9217fa2aa19a;hp=d138a26d8cfa312bd3199fb97d24743fbe14cc74;hpb=473f46135c3fd77dad5614215cc279b1164e9a74;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index d138a26d8cf..1d8e270b33b 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -13,17 +13,6 @@
 
 lib_LTLIBRARIES += libvppinfra.la
 
-BUILT_SOURCES += vppinfra/config.h
-
-vppinfra/config.h:
-	@echo "/** Autogenerated by Autotools **/" > $@
-	@echo "#ifndef included_clib_config_h" >> $@
-	@echo "#define included_clib_config_h" >> $@
-	@echo "#ifndef CLIB_LOG2_CACHE_LINE_BYTES " >> $@
-	@echo "#define CLIB_LOG2_CACHE_LINE_BYTES " @LOG2_CACHE_LINE_BYTES@ >> $@
-	@echo "#endif " >> $@
-	@echo "#endif " >> $@
-
 TESTS = 
 
 if ENABLE_TESTS
@@ -52,6 +41,7 @@ TESTS  +=  test_bihash_template \
 	   test_slist \
 	   test_socket \
 	   test_time \
+	   test_time_range \
 	   test_timing_wheel \
 	   test_tw_timer \
 	   test_valloc \
@@ -87,6 +77,7 @@ test_serialize_SOURCES = vppinfra/test_serialize.c
 test_slist_SOURCES = vppinfra/test_slist.c
 test_socket_SOURCES = vppinfra/test_socket.c
 test_time_SOURCES = vppinfra/test_time.c
+test_time_range_SOURCES = vppinfra/test_time_range.c
 test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
 test_tw_timer_SOURCES = vppinfra/test_tw_timer.c
 test_valloc_SOURCES = vppinfra/test_valloc.c
@@ -126,7 +117,7 @@ test_valloc_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 
-test_bihash_template_LDADD =	libvppinfra.la
+test_bihash_template_LDADD =	libvppinfra.la -lpthread 
 test_bihash_vec88_LDADD =	libvppinfra.la
 test_cuckoo_template_LDADD =	libvppinfra.la
 test_cuckoo_bihash_LDADD =	libvppinfra.la
@@ -151,6 +142,7 @@ test_serialize_LDADD =	libvppinfra.la
 test_slist_LDADD =	libvppinfra.la
 test_socket_LDADD =	libvppinfra.la
 test_time_LDADD =	libvppinfra.la -lm
+test_time_range_LDADD =	libvppinfra.la -lm
 test_timing_wheel_LDADD =	libvppinfra.la -lm
 test_tw_timer_LDADD =	libvppinfra.la
 test_valloc_LDADD =	libvppinfra.la
@@ -182,6 +174,7 @@ test_serialize_LDFLAGS = -static
 test_slist_LDFLAGS = -static
 test_socket_LDFLAGS = -static
 test_time_LDFLAGS = -static
+test_time_range_LDFLAGS = -static
 test_timing_wheel_LDFLAGS = -static
 test_tw_timer_LDFLAGS = -static
 test_valloc_LDFLAGS = -static
@@ -201,6 +194,7 @@ nobase_include_HEADERS = \
   vppinfra/bihash_vec8_8.h \
   vppinfra/bihash_16_8.h \
   vppinfra/bihash_24_8.h \
+  vppinfra/bihash_40_8.h \
   vppinfra/bihash_48_8.h \
   vppinfra/bihash_template.h \
   vppinfra/bihash_template.c \
@@ -258,6 +252,7 @@ nobase_include_HEADERS = \
   vppinfra/sparse_vec.h \
   vppinfra/string.h \
   vppinfra/time.h \
+  vppinfra/time_range.h \
   vppinfra/timing_wheel.h \
   vppinfra/timer.h \
   vppinfra/tw_timer_2t_1w_2048sl.h \
@@ -284,6 +279,14 @@ nobase_include_HEADERS = \
   vppinfra/xy.h \
   vppinfra/zvec.h
 
+if ENABLE_DLMALLOC
+  nobase_include_HEADERS += \
+  vppinfra/dlmalloc.h
+else
+  nobase_include_HEADERS +=  \
+  vppinfra/mheap_bootstrap.h 
+endif
+
 CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \
@@ -308,8 +311,6 @@ CLIB_CORE = \
   vppinfra/longjmp.S \
   vppinfra/macros.c \
   vppinfra/mhash.c \
-  vppinfra/mheap.c \
-  vppinfra/mem_mheap.c \
   vppinfra/ptclosure.c \
   vppinfra/random.c \
   vppinfra/random_buffer.c \
@@ -319,6 +320,7 @@ CLIB_CORE = \
   vppinfra/std-formats.c \
   vppinfra/string.c \
   vppinfra/time.c \
+  vppinfra/time_range.c \
   vppinfra/timing_wheel.c \
   vppinfra/tw_timer_template.h \
   vppinfra/tw_timer_2t_1w_2048sl.h \
@@ -337,6 +339,17 @@ CLIB_CORE = \
   vppinfra/vector.c \
   vppinfra/zvec.c
 
+if ENABLE_DLMALLOC
+  CLIB_CORE += \
+  vppinfra/mem_dlmalloc.c \
+  vppinfra/dlmalloc.c \
+  vppinfra/dlmalloc.h
+else
+  CLIB_CORE += \
+  vppinfra/mheap.c \
+  vppinfra/mem_mheap.c 
+endif
+
 # Core plus Unix additions
 libvppinfra_la_SOURCES =			\
   $(CLIB_CORE)					\