diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2019-11-25 16:29:38 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-12-11 16:54:26 +0000 |
| commit | 0aa4013e20471a7b23bc3252649c95c81b5d7519 (patch) | |
| tree | 33fa625cc95b9feb23e512fc54a31152132e440d /src/vpp/api/api_main.c | |
| parent | cfdb109180cb01c17f92a465f925c244259ba06b (diff) | |
api: Use vl_msg_push/pop_heap
Type: refactor
Change-Id: I0eb46676fc22ce6825b2d879498df344b5a855e8
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Diffstat (limited to 'src/vpp/api/api_main.c')
| -rw-r--r-- | src/vpp/api/api_main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c index 7fcbe7027f1..1d16f78ea88 100644 --- a/src/vpp/api/api_main.c +++ b/src/vpp/api/api_main.c @@ -76,7 +76,6 @@ maybe_register_api_client (vat_main_t * vam) { vl_api_registration_t **regpp; vl_api_registration_t *regp; - svm_region_t *svm; void *oldheap; api_main_t *am = vlibapi_get_main (); @@ -85,17 +84,15 @@ maybe_register_api_client (vat_main_t * vam) pool_get (am->vl_clients, regpp); - svm = am->vlib_rp; + oldheap = vl_msg_push_heap (); - pthread_mutex_lock (&svm->mutex); - oldheap = svm_push_data_heap (svm); *regpp = clib_mem_alloc (sizeof (vl_api_registration_t)); regp = *regpp; clib_memset (regp, 0, sizeof (*regp)); regp->registration_type = REGISTRATION_TYPE_SHMEM; regp->vl_api_registration_pool_index = regpp - am->vl_clients; - regp->vlib_rp = svm; + regp->vlib_rp = am->vlib_rp; regp->shmem_hdr = am->shmem_hdr; /* Loopback connection */ @@ -104,8 +101,7 @@ maybe_register_api_client (vat_main_t * vam) regp->name = format (0, "%s", "vpp-internal"); vec_add1 (regp->name, 0); - pthread_mutex_unlock (&svm->mutex); - svm_pop_heap (oldheap); + vl_msg_pop_heap (oldheap); vam->my_client_index = vl_msg_api_handle_from_index_and_epoch (regp->vl_api_registration_pool_index, |