From 048a4e5a000017d0d632ebf02dcc23d9bf9ccf72 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 1 Jun 2018 18:52:25 -0400 Subject: export counters in a memfd segment also export per-node error counters directory entries implement object types Change-Id: I8ce8e0a754e1be9de895c44ed9be6533b4ecef0f Signed-off-by: Dave Barach --- src/vlibmemory/memory_api.c | 16 ++++++++++++++++ src/vlibmemory/vlib_api.c | 6 ------ 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'src/vlibmemory') diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c index 205bea57532..4d31b35f132 100644 --- a/src/vlibmemory/memory_api.c +++ b/src/vlibmemory/memory_api.c @@ -459,6 +459,22 @@ vl_mem_api_init (const char *region_name) return 0; } +static clib_error_t * +map_api_segment_init (vlib_main_t * vm) +{ + api_main_t *am = &api_main; + int rv; + + if ((rv = vl_mem_api_init (am->region_name)) < 0) + { + return clib_error_return (0, "vl_mem_api_init (%s) failed", + am->region_name); + } + return 0; +} + +VLIB_INIT_FUNCTION (map_api_segment_init); + static void send_memclnt_keepalive (vl_api_registration_t * regp, f64 now) { diff --git a/src/vlibmemory/vlib_api.c b/src/vlibmemory/vlib_api.c index 1067bf3b4ba..eb7655ce1a7 100644 --- a/src/vlibmemory/vlib_api.c +++ b/src/vlibmemory/vlib_api.c @@ -287,12 +287,6 @@ vl_api_clnt_process (vlib_main_t * vm, vlib_node_runtime_t * node, uword *event_data = 0; f64 now; - if ((rv = vl_mem_api_init (am->region_name)) < 0) - { - clib_warning ("memory_api_init returned %d, quitting...", rv); - return 0; - } - if ((error = vl_sock_api_init (vm))) { clib_error_report (error); -- cgit 1.2.3-korg