[HICN-488] Adding lock to vapi calls and manage vapi_connect in order to connect only once.

- Added library to hicn-plugin called safe_vapi that takes care of handling concurrent calls to the vapi.
- Removed dependency of libhicnctrl from libtransport and added dependency to safe_vapi.
- Added dependency to safe_vapi on libhicnctrl

Change-Id: Ie49e8319f64a50e7ed6a56e041db977c3b184cc5
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt
index ff586ff22..63e27ba42 100644
--- a/ctrl/libhicnctrl/CMakeLists.txt
+++ b/ctrl/libhicnctrl/CMakeLists.txt
@@ -40,6 +40,7 @@ if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   set(LIBHICNCTRL ${LIBHICNCTRL}-memif)
   set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs")
   list(APPEND HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES})
+  list(APPEND HICN_LIBRARIES ${SAFE_VAPI_LIBRARIES})
 endif()
 
 set(LIBHICNCTRL ${LIBHICNCTRL} CACHE INTERNAL "" FORCE)
@@ -58,7 +59,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 
   set(HICN_INCLUDE_DIRS
       ${HICN_INCLUDE_DIRS}
-      ${HICNPLUGIN_INCLUDE_DIRS})
+      ${HICNPLUGIN_INCLUDE_DIRS}
+      ${SAFE_VAPI_INCLUDE_DIRS})
 
 else()
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
@@ -71,10 +73,12 @@ else()
       HICN_INCLUDE_DIRS
       ${HICN_INCLUDE_DIRS}
       ${HICNPLUGIN_INCLUDE_DIRS}
+      ${SAFE_VAPI_INCLUDE_DIRS}
     )
 
     list(APPEND DEPENDENCIES
         hicn_plugin
+        ${SAFE_VAPI_SHARED}
     )
   else ()
     set(HICN_LIBRARIES ${LIBHICN_SHARED})