From b0768b35fb515b7c0a15c3c7d8c1227497c59786 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Mon, 27 Jan 2020 16:04:33 +0100 Subject: [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 --- cmake/Modules/FindSafeVapi.cmake | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 cmake/Modules/FindSafeVapi.cmake (limited to 'cmake') diff --git a/cmake/Modules/FindSafeVapi.cmake b/cmake/Modules/FindSafeVapi.cmake new file mode 100644 index 000000000..a9077ae14 --- /dev/null +++ b/cmake/Modules/FindSafeVapi.cmake @@ -0,0 +1,40 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set(SAFE_VAPI_SEARCH_PATH_LIST + ${SAFE_VAPI_HOME} + $ENV{SAFE_VAPI_HOME} + /usr/local + /opt + /usr +) + +find_path(SAFE_VAPI_INCLUDE_DIR vapi/vapi_safe.h + HINTS ${SAFE_VAPI_SEARCH_PATH_LIST} + PATH_SUFFIXES include + DOC "Find the vapi_safe includes" +) + +find_library(SAFE_VAPI_LIBRARY NAMES libsafe_vapi.so + HINTS ${SAFE_VAPI_SEARCH_PATH_LIST} + PATH_SUFFIXES lib/x86_64-linux-gnu/ + DOC "Find the vapi safe lib" +) + +set(SAFE_VAPI_LIBRARIES ${SAFE_VAPI_LIBRARY}) +set(SAFE_VAPI_INCLUDE_DIRS ${SAFE_VAPI_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Hicnlight SAFE_VAPI_LIBRARIES SAFE_VAPI_INCLUDE_DIRS) + +mark_as_advanced(SAFE_VAPI_LIBRARY SAFE_VAPI_INCLUDE_DIR) -- cgit 1.2.3-korg