X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=8f01114c12a585172f101b7485f5a633bdfeadb5;hb=33e002b168a211b1d620f4fffbd3752c8f1f2129;hp=836c7213d6287a178e650670a6148d99fa08775d;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 836c7213d62..8f01114c12a 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -11,23 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-libvppinfradir = ${libdir}
-
-if WITH_UNIX
-  libvppinfra_LTLIBRARIES = libvppinfra.la
-endif
-
-lib_LIBRARIES =
+lib_LTLIBRARIES += libvppinfra.la
 
 TESTS =
 
 if ENABLE_TESTS
 TESTS  +=  test_bihash_template \
 	   test_dlist \
-	   test_elog \
 	   test_elf \
+	   test_elog \
 	   test_fifo \
 	   test_format \
+	   test_fpool \
 	   test_hash \
 	   test_heap \
 	   test_longjmp \
@@ -43,8 +38,9 @@ TESTS  +=  test_bihash_template \
 	   test_socket \
 	   test_time \
 	   test_timing_wheel \
+	   test_tw_timer \
 	   test_vec \
-	   test_zvec 
+	   test_zvec
 endif
 
 noinst_PROGRAMS = $(TESTS)
@@ -52,10 +48,11 @@ check_PROGRAMS	= $(TESTS)
 
 test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
 test_dlist_SOURCES = vppinfra/test_dlist.c
-test_elog_SOURCES = vppinfra/test_elog.c
 test_elf_SOURCES = vppinfra/test_elf.c
+test_elog_SOURCES = vppinfra/test_elog.c
 test_fifo_SOURCES = vppinfra/test_fifo.c
 test_format_SOURCES = vppinfra/test_format.c
+test_fpool_SOURCES = vppinfra/test_fpool.c
 test_hash_SOURCES = vppinfra/test_hash.c
 test_heap_SOURCES = vppinfra/test_heap.c
 test_longjmp_SOURCES = vppinfra/test_longjmp.c
@@ -64,13 +61,14 @@ test_md5_SOURCES = vppinfra/test_md5.c
 test_mheap_SOURCES = vppinfra/test_mheap.c
 test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
 test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
-test_random_SOURCES = vppinfra/test_random.c
 test_random_isaac_SOURCES = vppinfra/test_random_isaac.c
+test_random_SOURCES = vppinfra/test_random.c
 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_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
 
@@ -78,10 +76,11 @@ test_zvec_SOURCES = vppinfra/test_zvec.c
 # So we'll need -DDEBUG to enable ASSERTs
 test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_format_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_fpool_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_hash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_heap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -92,20 +91,22 @@ test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_serialize_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_slist_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_socket_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
 
 test_bihash_template_LDADD =	libvppinfra.la
 test_dlist_LDADD =	libvppinfra.la
-test_elog_LDADD =	libvppinfra.la
 test_elf_LDADD =	libvppinfra.la
+test_elog_LDADD =	libvppinfra.la
 test_fifo_LDADD =	libvppinfra.la
 test_format_LDADD =	libvppinfra.la
+test_fpool_LDADD =	libvppinfra.la
 test_hash_LDADD =	libvppinfra.la
 test_heap_LDADD =	libvppinfra.la
 test_longjmp_LDADD =	libvppinfra.la
@@ -114,22 +115,24 @@ test_md5_LDADD =	libvppinfra.la
 test_mheap_LDADD =	libvppinfra.la
 test_pool_iterate_LDADD =	libvppinfra.la
 test_ptclosure_LDADD =	libvppinfra.la
-test_random_LDADD =	libvppinfra.la
 test_random_isaac_LDADD =	libvppinfra.la
+test_random_LDADD =	libvppinfra.la
 test_serialize_LDADD =	libvppinfra.la
 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
 
 test_bihash_template_LDFLAGS = -static
 test_dlist_LDFLAGS = -static
-test_elog_LDFLAGS = -static
 test_elf_LDFLAGS = -static
+test_elog_LDFLAGS = -static
 test_fifo_LDFLAGS = -static
 test_format_LDFLAGS = -static
+test_fpool_LDFLAGS = -static
 test_hash_LDFLAGS = -static
 test_heap_LDFLAGS = -static
 test_longjmp_LDFLAGS = -static
@@ -138,13 +141,14 @@ test_md5_LDFLAGS = -static
 test_mheap_LDFLAGS = -static
 test_pool_iterate_LDFLAGS = -static
 test_ptclosure_LDFLAGS = -static
-test_random_LDFLAGS = -static
 test_random_isaac_LDFLAGS = -static
+test_random_LDFLAGS = -static
 test_serialize_LDFLAGS = -static
 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
 
@@ -158,7 +162,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 \
@@ -166,7 +172,9 @@ nobase_include_HEADERS = \
   vppinfra/byte_order.h \
   vppinfra/cache.h \
   vppinfra/clib.h \
+  vppinfra/clib_error.h \
   vppinfra/cpu.h \
+  vppinfra/crc32.h \
   vppinfra/dlist.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
@@ -179,6 +187,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 \
@@ -205,6 +214,13 @@ 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_4t_3w_256sl.h \
+  vppinfra/tw_timer_1t_3w_1024sl_ov.h \
+  vppinfra/tw_timer_template.h \
+  vppinfra/tw_timer_template.c \
   vppinfra/types.h \
   vppinfra/unix.h \
   vppinfra/vec.h \
@@ -234,6 +250,7 @@ CLIB_CORE = \
   vppinfra/fifo.c \
   vppinfra/fheap.c \
   vppinfra/format.c \
+  vppinfra/pool.c \
   vppinfra/graph.c \
   vppinfra/hash.c \
   vppinfra/heap.c \
@@ -253,6 +270,17 @@ 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/tw_timer_4t_3w_256sl.h \
+  vppinfra/tw_timer_4t_3w_256sl.c \
+  vppinfra/tw_timer_1t_3w_1024sl_ov.h \
+  vppinfra/tw_timer_1t_3w_1024sl_ov.c \
   vppinfra/unformat.c \
   vppinfra/vec.c \
   vppinfra/vector.c \