X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=57f7a1f7e3b35a55827db1a2e75ebf536e464656;hb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;hp=6555528317d2beca47cc22b599a39b3b57029ace;hpb=c576622667199db906efa3110ad25e552b3a0890;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 6555528317d..57f7a1f7e3b 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -41,6 +41,7 @@ TESTS  +=  test_bihash_template \
 	   test_slist \
 	   test_socket \
 	   test_time \
+	   test_time_range \
 	   test_timing_wheel \
 	   test_tw_timer \
 	   test_valloc \
@@ -76,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
@@ -140,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
@@ -171,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
@@ -190,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 \
@@ -197,10 +202,12 @@ nobase_include_HEADERS = \
   vppinfra/bitops.h \
   vppinfra/byte_order.h \
   vppinfra/cache.h \
+  vppinfra/config.h \
   vppinfra/clib.h \
   vppinfra/clib_error.h \
   vppinfra/cpu.h \
   vppinfra/crc32.h \
+  vppinfra/lb_hash_hash.h \
   vppinfra/dlist.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
@@ -245,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 \
@@ -271,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 \
@@ -295,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 \
@@ -306,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 \
@@ -324,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)					\