X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=3939d3ceba8c6c8ffbc0ebc95ba87428136ca895;hb=refs%2Fchanges%2F53%2F6653%2F4;hp=724f21c9705a1b6ddaf9ae8626fd1ad2b3e29d78;hpb=32e1c010b0c34fd0984f7fc45fae648a182025c5;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 724f21c9705..3939d3ceba8 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -37,6 +37,7 @@ TESTS  +=  test_bihash_template \
 	   test_socket \
 	   test_time \
 	   test_timing_wheel \
+	   test_tw_timer \
 	   test_vec \
 	   test_zvec
 endif
@@ -65,6 +66,7 @@ test_slist_SOURCES = vppinfra/test_slist.c
 test_socket_SOURCES = vppinfra/test_socket.c
 test_time_SOURCES = vppinfra/test_time.c
 test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
+test_tw_timer_SOURCES = vppinfra/test_tw_timer.c
 test_vec_SOURCES = vppinfra/test_vec.c
 test_zvec_SOURCES = vppinfra/test_zvec.c
 
@@ -91,6 +93,7 @@ test_serialize_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_slist_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_time_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_timing_wheel_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_tw_timer_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 
@@ -115,6 +118,7 @@ test_slist_LDADD =	libvppinfra.la
 test_socket_LDADD =	libvppinfra.la
 test_time_LDADD =	libvppinfra.la -lm
 test_timing_wheel_LDADD =	libvppinfra.la -lm
+test_tw_timer_LDADD =	libvppinfra.la
 test_vec_LDADD =	libvppinfra.la
 test_zvec_LDADD =	libvppinfra.la
 
@@ -139,6 +143,7 @@ test_slist_LDFLAGS = -static
 test_socket_LDFLAGS = -static
 test_time_LDFLAGS = -static
 test_timing_wheel_LDFLAGS = -static
+test_tw_timer_LDFLAGS = -static
 test_vec_LDFLAGS = -static
 test_zvec_LDFLAGS = -static
 
@@ -152,7 +157,9 @@ nobase_include_HEADERS = \
   vppinfra/asm_mips.h \
   vppinfra/asm_x86.h \
   vppinfra/bihash_8_8.h \
+  vppinfra/bihash_16_8.h \
   vppinfra/bihash_24_8.h \
+  vppinfra/bihash_48_8.h \
   vppinfra/bihash_template.h \
   vppinfra/bihash_template.c \
   vppinfra/bitmap.h \
@@ -161,6 +168,7 @@ nobase_include_HEADERS = \
   vppinfra/cache.h \
   vppinfra/clib.h \
   vppinfra/cpu.h \
+  vppinfra/crc32.h \
   vppinfra/dlist.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
@@ -173,6 +181,7 @@ nobase_include_HEADERS = \
   vppinfra/graph.h \
   vppinfra/hash.h \
   vppinfra/heap.h \
+  vppinfra/lock.h \
   vppinfra/longjmp.h \
   vppinfra/macros.h \
   vppinfra/math.h \
@@ -199,6 +208,11 @@ nobase_include_HEADERS = \
   vppinfra/time.h \
   vppinfra/timing_wheel.h \
   vppinfra/timer.h \
+  vppinfra/tw_timer_2t_1w_2048sl.h \
+  vppinfra/tw_timer_16t_2w_512sl.h \
+  vppinfra/tw_timer_16t_1w_2048sl.h \
+  vppinfra/tw_timer_template.h \
+  vppinfra/tw_timer_template.c \
   vppinfra/types.h \
   vppinfra/unix.h \
   vppinfra/vec.h \
@@ -247,6 +261,13 @@ CLIB_CORE = \
   vppinfra/string.c \
   vppinfra/time.c \
   vppinfra/timing_wheel.c \
+  vppinfra/tw_timer_template.h \
+  vppinfra/tw_timer_2t_1w_2048sl.h \
+  vppinfra/tw_timer_2t_1w_2048sl.c \
+  vppinfra/tw_timer_16t_2w_512sl.h \
+  vppinfra/tw_timer_16t_2w_512sl.c \
+  vppinfra/tw_timer_16t_1w_2048sl.h \
+  vppinfra/tw_timer_16t_1w_2048sl.c \
   vppinfra/unformat.c \
   vppinfra/vec.c \
   vppinfra/vector.c \