diff options
| author |   Dave Barach <dave@barachs.net> | 2018-06-14 09:18:21 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-06-14 18:52:47 +0000 |
| commit | 1f806587d8e1d94ee7630cee134fbaae2de2f31e (patch) | |
| tree | fb46e53861b5eebbf1333f85ded79c0558802bf3 /src/vpp | |
| parent | abcddcbcabb180595ec8041ac7cf07249d896dc4 (diff) | |
Use __attribute__((weak)) references where necessary
It should be possible to use vlib without the vlibmemory library, etc.
Change-Id: Ic2316b93d7dbb728fb4ff42a3ca8b0d747c9425e
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vpp')
| -rw-r--r-- | src/vpp/api/api.c | 5 | ||||
| -rw-r--r-- | src/vpp/conf/startup.conf | 4 | ||||
| -rw-r--r-- | src/vpp/stats/stat_segment.c | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c index 8e24493c0ce..6c06ab4cef3 100644 --- a/src/vpp/api/api.c +++ b/src/vpp/api/api.c @@ -474,7 +474,7 @@ vpe_api_hookup (vlib_main_t * vm) VLIB_API_INIT_FUNCTION (vpe_api_hookup); -static clib_error_t * +clib_error_t * vpe_api_init (vlib_main_t * vm) { vpe_api_main_t *am = &vpe_api_main; @@ -492,9 +492,6 @@ vpe_api_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (vpe_api_init); - - static clib_error_t * api_segment_config (vlib_main_t * vm, unformat_input_t * input) { diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf index 7ed279840fa..c1ac1235861 100644 --- a/src/vpp/conf/startup.conf +++ b/src/vpp/conf/startup.conf @@ -28,6 +28,10 @@ api-segment { gid vpp } +socksvr { + default +} + cpu { ## In the VPP there is one main thread and optionally the user can create worker(s) ## The main thread and worker thread(s) can be pinned to CPU core(s) manually or automatically diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c index 6fb9c83a369..16a727dbf64 100644 --- a/src/vpp/stats/stat_segment.c +++ b/src/vpp/stats/stat_segment.c @@ -186,8 +186,8 @@ vlib_stats_pop_heap2 (u64 * counter_vector, u32 thread_index, void *oldheap) ssvm_pop_heap (oldheap); } -static clib_error_t * -map_stat_segment_init (vlib_main_t * vm) +clib_error_t * +vlib_map_stat_segment_init (void) { stats_main_t *sm = &stats_main; ssvm_private_t *ssvmp = &sm->stat_segment; @@ -269,8 +269,6 @@ map_stat_segment_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (map_stat_segment_init); - typedef struct { u8 *name; |