diff options
| author |   Dave Barach <dave@barachs.net> | 2016-06-14 18:38:02 -0400 |
|---|---|---|
| committer |   Keith Burns <alagalah@gmail.com> | 2016-06-17 16:24:16 +0000 |
| commit | d65346098daf8967e882d0299679a131769c9be9 (patch) | |
| tree | 50a9bb16a3f2c1ef8a9ef6b5e2623564a8453a5d /vppinfra/Makefile.am | |
| parent | 378893a485d0e0dd331cebcb2ebefdeca073b1ab (diff) | |
Dynamically compute ip feature subgraph order
This change-set enables plugins to add themselves to the ip4/ip6
feature subgraphs without having to modify core vpp engine code
at all. Add VNET_IP4/IP6_UNICAST/MULTICAST_FEATURE_INIT macros
which express the required ordering constraints, and off you go.
Along the way, added an implementation of Warshall's algorithm to
vppinfra; to compute the positive transitive closure of a relation. In
this case, the relation is "feature A runs before feature B."
With that in hand, ip_feature_init_cast(...) computes a partial order
across the set of configured feature subgraph nodes.
In unit-testing, we discovered VPP-145 - ip4/6 inacl wiped out
vnet_buffer(b)->ip>current_config_index, which exists in main. So, we
fixed that by moving b->trace_index, adding b->current_config_index,
and removing the ip opaque union current_config_index.
Change-Id: Iff132116f66413dc6b31ac3377198c7a32d51f48
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vppinfra/Makefile.am')
| -rw-r--r-- | vppinfra/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vppinfra/Makefile.am b/vppinfra/Makefile.am index 1b4d627dfb6..b99f3d53716 100644 --- a/vppinfra/Makefile.am +++ b/vppinfra/Makefile.am @@ -20,7 +20,7 @@ endif lib_LIBRARIES = -TESTS = +TESTS = if ENABLE_TESTS TESTS += test_bihash_template \ @@ -37,6 +37,7 @@ TESTS += test_bihash_template \ test_pfhash \ test_phash \ test_pool_iterate \ + test_ptclosure \ test_qhash \ test_random \ test_random_isaac \ @@ -66,6 +67,7 @@ test_mheap_SOURCES = vppinfra/test_mheap.c test_pfhash_SOURCES = vppinfra/test_pfhash.c test_phash_SOURCES = vppinfra/test_phash.c test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c +test_ptclosure_SOURCES = vppinfra/test_ptclosure.c test_qhash_SOURCES = vppinfra/test_qhash.c test_random_SOURCES = vppinfra/test_random.c test_random_isaac_SOURCES = vppinfra/test_random_isaac.c @@ -93,6 +95,7 @@ test_mheap_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_pfhash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_phash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_pool_iterate_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG +test_ptclosure_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_qhash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG @@ -118,6 +121,7 @@ test_mheap_LDADD = libvppinfra.la test_pfhash_LDADD = libvppinfra.la test_phash_LDADD = libvppinfra.la test_pool_iterate_LDADD = libvppinfra.la +test_ptclosure_LDADD = libvppinfra.la test_qhash_LDADD = libvppinfra.la test_random_LDADD = libvppinfra.la test_random_isaac_LDADD = libvppinfra.la @@ -143,6 +147,7 @@ test_mheap_LDFLAGS = -static test_pfhash_LDFLAGS = -static test_phash_LDFLAGS = -static test_pool_iterate_LDFLAGS = -static +test_ptclosure_LDFLAGS = -static test_qhash_LDFLAGS = -static test_random_LDFLAGS = -static test_random_isaac_LDFLAGS = -static @@ -199,6 +204,7 @@ nobase_include_HEADERS = \ vppinfra/phash.h \ vppinfra/pipeline.h \ vppinfra/pool.h \ + vppinfra/ptclosure.h \ vppinfra/qhash.h \ vppinfra/random.h \ vppinfra/random_buffer.h \ @@ -249,6 +255,7 @@ CLIB_CORE = \ vppinfra/mem_mheap.c \ vppinfra/pfhash.c \ vppinfra/phash.c \ + vppinfra/ptclosure.c \ vppinfra/qhash.c \ vppinfra/random.c \ vppinfra/random_buffer.c \ |