diff options
| author |   Florin Coras <fcoras@cisco.com> | 2018-01-05 03:20:25 -0800 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-01-09 18:33:08 +0000 |
| commit | e86a8edd3c14fb41ace2a12efd17bc7772bf623f (patch) | |
| tree | 480219864cadd743fdb95c21379aeaf88a985e23 /src/vpp/api/api.c | |
| parent | 4363ad6c96b5641fca1b16c5a6ec22e2364adcfd (diff) | |
api: refactor vlibmemory
- separate client/server code for both memory and socket apis
- separate memory api code from generic vlib api code
- move unix_shared_memory_fifo to svm and rename to svm_fifo_t
- overall declutter
Change-Id: I90cdd98ff74d0787d58825b914b0f1eafcfa4dc2
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vpp/api/api.c')
| -rw-r--r-- | src/vpp/api/api.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c index d2b06ff51c4..70b104234b7 100644 --- a/src/vpp/api/api.c +++ b/src/vpp/api/api.c @@ -72,6 +72,7 @@ #include <vpp/api/vpe_all_api_h.h> #undef vl_printfun #include <vlibapi/api_helper_macros.h> + #define foreach_vpe_api_msg \ _(CONTROL_PING, control_ping) \ _(CLI, cli) \ @@ -84,6 +85,7 @@ _(GET_NEXT_INDEX, get_next_index) \ #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) + typedef enum { RESOLVE_IP4_ADD_DEL_ROUTE = 1, @@ -162,7 +164,7 @@ static void vl_api_cli_t_handler (vl_api_cli_t * mp) { vl_api_cli_reply_t *rp; - unix_shared_memory_queue_t *q; + svm_queue_t *q; vlib_main_t *vm = vlib_get_main (); api_main_t *am = &api_main; unformat_input_t input; @@ -365,6 +367,7 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp) vlib_main_t *vm = vlib_get_main (); void *oldheap; vl_api_get_node_graph_reply_t *rmp; + vlib_node_t ***node_dups; pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); @@ -376,9 +379,9 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp) vec_reset_length (vector); /* $$$$ FIXME */ - vector = vlib_node_serialize (&vm->node_main, vector, - (u32) ~ 0 /* all threads */ , - 1 /* include nexts */ , + node_dups = vlib_node_get_nodes (vm, (u32) ~ 0 /* all threads */ , + 1 /* include stats */ ); + vector = vlib_node_serialize (vm, node_dups, vector, 1 /* include nexts */ , 1 /* include stats */ ); svm_pop_heap (oldheap); @@ -398,7 +401,7 @@ static void vl_api_##nn##_t_handler ( \ { \ vpe_client_registration_t *reg; \ vpe_api_main_t * vam = &vpe_api_main; \ - unix_shared_memory_queue_t * q; \ + svm_queue_t * q; \ \ /* One registration only... */ \ pool_foreach(reg, vam->nn##_registrations, \ @@ -482,7 +485,7 @@ vpe_api_init (vlib_main_t * vm) #undef _ vl_set_memory_region_name ("/vpe-api"); - vl_enable_disable_memory_api (vm, 1 /* enable it */ ); + vl_mem_api_enable_disable (vm, 1 /* enable it */ ); return 0; } |