diff options
| author |   Dave Barach <dave@barachs.net> | 2017-03-08 19:08:56 -0500 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2017-03-09 19:07:17 +0000 |
| commit | 80f54e20270ed0628ee725e3e3c515731a0188f2 (patch) | |
| tree | fa06d939942af6f5126ee645c38cb787814bfb6f /src/vpp/api | |
| parent | b3b2de71ceea0cc7ce18f89cc8180ed4a42e355d (diff) | |
vlib_mains == 0 special cases be gone
Clean up spurious binary API client link dependency on libvlib.so,
which managed to hide behind vlib_mains == 0 checks reached by
VLIB_xxx_FUNCTION macros.
Change-Id: I5df1f8ab07dca1944250e643ccf06e60a8462325
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vpp/api')
| -rw-r--r-- | src/vpp/api/api.c | 1 | ||||
| -rw-r--r-- | src/vpp/api/gmon.c | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c index 828394ed..c85dc680 100644 --- a/src/vpp/api/api.c +++ b/src/vpp/api/api.c @@ -2143,7 +2143,6 @@ vpe_api_init (vlib_main_t * vm) am->oam_events_registration_hash = hash_create (0, sizeof (uword)); am->bfd_events_registration_hash = hash_create (0, sizeof (uword)); - vl_api_init (vm); vl_set_memory_region_name ("/vpe-api"); vl_enable_disable_memory_api (vm, 1 /* enable it */ ); diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c index 610f40ed..277be8c0 100644 --- a/src/vpp/api/gmon.c +++ b/src/vpp/api/gmon.c @@ -122,13 +122,8 @@ gmon_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) /* Initial wait for the world to settle down */ vlib_process_suspend (vm, 5.0); - if (vec_len (vlib_mains) == 0) - vec_add1 (gm->my_vlib_mains, &vlib_global_main); - else - { - for (i = 0; i < vec_len (vlib_mains); i++) - vec_add1 (gm->my_vlib_mains, vlib_mains[i]); - } + for (i = 0; i < vec_len (vlib_mains); i++) + vec_add1 (gm->my_vlib_mains, vlib_mains[i]); while (1) { |