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
test_slist \
test_socket \
test_time \
+ test_time_range \
test_timing_wheel \
test_tw_timer \
test_valloc \
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
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
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
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
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 \
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 \
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 \
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 \
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 \
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) \