vsomeip 3.1.14.1

Author: lutzbichler

Android.bp

@@ -36,7 +36,8 @@ cc_defaults {
         "-Wno-sign-compare",
         "-Wno-format",
         "-Wno-header-guard",
-        "-Wno-overloaded-virtual"
+        "-Wno-overloaded-virtual",
+        "-Wno-implicit-fallthrough"
     ]
 }
 
@@ -58,15 +59,14 @@ cc_library_shared {
 
     local_include_dirs: [
         "interface",
-        "implementation/helper/1.66"
+        "implementation/helper/1.70"
     ],
 
     export_include_dirs: [
 	"interface"
     ],
 
     shared_libs: [
-        "libboost_log",
         "libboost_system",
         "libboost_thread",
         "libboost_filesystem",
@@ -89,12 +89,12 @@ cc_library_shared {
 
     local_include_dirs: [
         "interface",
-        "implementation/helper/1.66"
+        "implementation/helper/1.70"
     ],
 
     shared_libs: [
         "libvsomeip",
-        "libboost_log",
+        "libboost_system",
         "libboost_filesystem"
     ]
 }
@@ -113,12 +113,11 @@ cc_library_shared {
 
     local_include_dirs: [
         "interface",
-        "implementation/helper/1.66"
+        "implementation/helper/1.70"
     ],
 
     shared_libs: [
-       "libvsomeip",
-       "libboost_log"
+       "libvsomeip"
     ]
 }
 
@@ -136,11 +135,10 @@ cc_library_shared {
 
     local_include_dirs: [
         "interface",
-        "implementation/helper/1.66"
+        "implementation/helper/1.70"
     ],
 
     shared_libs: [
-        "libvsomeip",
-        "libboost_log"
+        "libvsomeip"
     ]
 }

CHANGES

@@ -1,6 +1,54 @@
 Changes
 =======
 
+v3.1.14.1
+- Merged extended support for static routing (versioning) 
+  (by Jean-Patrice Laude <[email protected]>)
+- Merged simplification of build process for hello_world example
+  (by Nikolay Khilyuk <[email protected]>)
+- Updated Android.bp to use boost 1.70.0 or higher
+- Merged Android support for hello_world example
+  (by Nikolay Khilyuk <[email protected]>)
+- Align response sample to documentation (do not specify application name)
+  (by JayHou <[email protected]>)
+- Call dlerror before calling dlsym to clear previous error. 
+  (by Oleg Kharitonov <[email protected]>) 
+- Get base path from environment variable for Android NDK.
+  (by Nikolay Khilyuk <[email protected]>) 
+- Fixed wrong library naming
+  (by Nikolay Khilyuk <[email protected]>) 
+
+v3.1.14
+- Fixed race conditions (application registration, subscription)
+
+v3.1.13
+- Abort operation when doing a full rejoin
+- Protect access when consuming a policy
+- Decrease wait time for composite send operations 
+- Reimplemented logger without using boost::log
+
+v3.1.12
+- Ensure composite send operations have finished before resetting an endpoint.
+  Otherwise this may cause a crash within boost.asio.
+- Always use the assigned client identifier when sending messages from a proxy.
+- Add TTL to initial timestamp to avoid immediate expiration.
+
+v3.1.11
+- Preparation for new IPsec plugin (3.1.1)
+
+v3.1.10
+- Reset subscriptions on stop offer service
+- Protect access to security policy contents
+- Tolerate wrong/incomplete event registrations in compatibility mode
+- Avoid buffering of pending subscriptions
+
+v3.1.9
+- Fix race condition when processing multicast messages
+
+v3.1.8
+- Fix deadlock when sending messages
+- Fix race condition when processing SD messages
+
 v3.1.7
 - Fix stop subscribes when a service is released
 - Improve handling of time stamps when processing subscriptions

CMakeLists.txt

@@ -11,11 +11,11 @@ set (VSOMEIP_COMPAT_NAME vsomeip)
 
 set (VSOMEIP_MAJOR_VERSION 3)
 set (VSOMEIP_MINOR_VERSION 1)
-set (VSOMEIP_PATCH_VERSION 7)
+set (VSOMEIP_PATCH_VERSION 14)
 set (VSOMEIP_HOTFIX_VERSION 1)
 
 set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP_PATCH_VERSION})
-set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentatin/doxygen.in
+set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in
 set (CMAKE_VERBOSE_MAKEFILE off)
 
 if (NOT GTEST_ROOT)
@@ -96,11 +96,15 @@ if (ENABLE_SIGNAL_HANDLING)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVSOMEIP_ENABLE_SIGNAL_HANDLING")
 endif ()
 
-# Thread sanitizer
+# Sanitizer
 if (ENABLE_THREAD_SANITIZER)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
 endif ()
 
+if (ENABLE_LEAK_SANITIZER)
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=leak")
+endif ()
+
 # Configuration overlays
 if (ENABLE_CONFIGURATION_OVERLAYS)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVSOMEIP_ENABLE_CONFIGURATION_OVERLAYS")
@@ -128,7 +132,7 @@ endif ()
 find_package(Threads REQUIRED)
 
 # Boost
-find_package( Boost 1.55 COMPONENTS system thread log REQUIRED )
+find_package( Boost 1.55 COMPONENTS system thread filesystem REQUIRED )
 include_directories( ${Boost_INCLUDE_DIR} )
 
 if(Boost_FOUND)
@@ -152,7 +156,7 @@ else()
 endif()
 
 message( STATUS "Using boost version: ${VSOMEIP_BOOST_VERSION}" )
-if (${VSOMEIP_BOOST_VERSION} GREATER 107200)
+if (${VSOMEIP_BOOST_VERSION} GREATER 107300)
 message( ERROR "boost version ${VSOMEIP_BOOST_VERSION} is not (yet) supported. Latest supported version is 1.72.0" )
 elseif(${VSOMEIP_BOOST_VERSION} GREATER 106999)
 set(VSOMEIP_BOOST_HELPER implementation/helper/1.70)
@@ -209,14 +213,14 @@ if (MSVC)
     message("using MSVC Compiler")
     # add_definitions(-DVSOMEIP_DLL_COMPILATION) now it is controlled per target
     SET(BOOST_WINDOWS_VERSION "0x600" CACHE STRING "Set the same Version as the Version with which Boost was built, otherwise there will be errors. (normaly 0x600 is for Windows 7 and 0x501 is for Windows XP)")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_LOG_DYN_LINK -DBOOST_ASIO_DISABLE_IOCP /EHsc")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_LOG_DYN_LINK -DBOOST_ASIO_DISABLE_IOCP /EHsc")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc")
     set(USE_RT "")
     set(Boost_LIBRARIES "")
     link_directories(${Boost_LIBRARY_DIR_DEBUG})
     ADD_DEFINITIONS( -DBOOST_ALL_DYN_LINK )
 else()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${OS} ${OS_CXX_FLAGS} -DBOOST_LOG_DYN_LINK -g ${OPTIMIZE} -std=c++11 ${NO_DEPRECATED} ${EXPORTSYMBOLS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${OS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} -std=c++11 ${NO_DEPRECATED} ${EXPORTSYMBOLS}")
     set(USE_RT "rt")
 endif()
 
@@ -242,7 +246,7 @@ endif ()
 ################################################################################
 file(GLOB ${VSOMEIP_NAME}_SRC
     "implementation/endpoints/src/*.cpp"
-    "implementation/logging/src/*.cpp"
+    "implementation/logger/src/*.cpp"
     "implementation/tracing/src/*.cpp"
     "implementation/message/src/*.cpp"
     "implementation/plugin/src/*.cpp"
@@ -252,7 +256,7 @@ file(GLOB ${VSOMEIP_NAME}_SRC
     "implementation/utility/src/*.cpp"
 )
 if (VSOMEIP_ENABLE_MULTIPLE_ROUTING_MANAGERS EQUAL 1)
-list(APPEND ${VSOMEIP_NAME}_SRC ${${VSOMEIP_NAME}-cfg_SRC})
+list(APPEND ${VSOMEIP_NAME}_SRC "implementation/configuration/src/configuration_impl.cpp")
 endif()
 list(SORT ${VSOMEIP_NAME}_SRC)
 
@@ -553,7 +557,7 @@ else()
                                -a version=${VSOMEIP_VERSION}
                                -b html
                                -o documentation/vsomeipUserGuide.html
-                               ${PROJECT_BINARY_DIR}/../documentation/vsomeipUserGuide)
+                               ${PROJECT_SOURCE_DIR}/documentation/vsomeipUserGuide)
 endif()
 
 ##############################################################################
@@ -576,7 +580,9 @@ add_subdirectory( tools )
 # build examples
 add_custom_target( examples )
 add_subdirectory( examples EXCLUDE_FROM_ALL )
-
+add_custom_target( hello_world )
+add_subdirectory( examples/hello_world  EXCLUDE_FROM_ALL )
+ 
 ##############################################################################
 # Test section
 ##############################################################################

README.md

@@ -1,7 +1,7 @@
 ### vsomeip
 
 ##### Copyright
-Copyright (C) 2015-2017, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+Copyright (C) 2015-2020, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 
 ##### License
 
@@ -22,9 +22,9 @@ MiddlewarE over IP (SOME/IP)) protocol. The stack consists out of:
 
 ###### Dependencies
 
-- A C++11 enabled compiler like gcc >= 4.8 is needed.
+- A C++11 enabled compiler like gcc >= 5.4 is needed.
 - vsomeip uses CMake as buildsystem.
-- vsomeip uses Boost >= 1.55:
+- vsomeip uses Boost v1.55.0 - v1.73.0 
 
 Ubuntu 14.04:
 
@@ -115,4 +115,4 @@ PRODUCT_PACKAGES += \
     libvsomeip \
     libvsomeip_cfg \
     libvsomeip_sd
-```
+```

examples/hello_world/Android.bp

@@ -0,0 +1,40 @@
+cc_defaults {
+    name: "vsomeip_hello_world_defaults",
+    vendor: true,
+
+    cppflags: [
+        "-std=c++11",
+        "-Wno-unused-parameter",
+    ],
+
+    shared_libs: [
+        "libvsomeip",
+        "libvsomeip_cfg",
+        "libvsomeip_e2e",
+        "libvsomeip_sd",
+    ],
+}
+
+cc_binary {
+    name: "vsomeip_hello_world_service",
+    defaults: ["vsomeip_hello_world_defaults"],
+
+    srcs: [
+        "hello_world_service.cpp",
+    ],
+}
+
+cc_binary {
+    name: "vsomeip_hello_world_client",
+    defaults: ["vsomeip_hello_world_defaults"],
+
+    srcs: [
+        "hello_world_client.cpp",
+    ],
+}
+
+prebuilt_etc {
+    name: "helloworld-local.json",
+    sub_dir: "vsomeip",
+    src: "helloworld-local.json",
+}

examples/hello_world/hello_world_client.cpp

@@ -146,6 +146,9 @@ hello_world_client *hw_cl_ptr(nullptr);
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     hello_world_client hw_cl;
 #ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING
     hw_cl_ptr = &hw_cl;

examples/hello_world/hello_world_service.cpp

@@ -140,6 +140,9 @@ hello_world_service *hw_srv_ptr(nullptr);
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     hello_world_service hw_srv;
 #ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING
     hw_srv_ptr = &hw_srv;

examples/hello_world/readme

@@ -6,10 +6,21 @@
 Build instructions for Hello World example
 ------------------------------------------
 
+1. Build whole project at first:
+________________________________
+cd <root directory of vSomeIP-Lib>$:
+
 mkdir build
 cd build
 cmake ..
 make
+sudo make install
+
+2. Build hello_world target
+___________________________
+cmake --build . --target hello_world
+cd ./examples/hello_world/
+make
 
 Running Hello World Example
 ---------------------------

examples/hello_world/readme_android

@@ -0,0 +1,11 @@
+To start service and client:
+
+Shell1:
+VSOMEIP_CONFIGURATION=/etc/vsomeip/helloworld-local.json \
+VSOMEIP_APPLICATION_NAME=hello_world_service \
+vsomeip_hello_world_service
+
+Shell2:
+VSOMEIP_CONFIGURATION=/etc/vsomeip/helloworld-local.json \
+VSOMEIP_APPLICATION_NAME=hello_world_client \
+vsomeip_hello_world_client

examples/response-sample.cpp

@@ -19,7 +19,7 @@
 class service_sample {
 public:
     service_sample(bool _use_static_routing) :
-            app_(vsomeip::runtime::get()->create_application("response-sample")),
+            app_(vsomeip::runtime::get()->create_application()),
             is_registered_(false),
             use_static_routing_(_use_static_routing),
             blocked_(false),

examples/routingmanagerd/routingmanagerd.cpp

@@ -17,7 +17,7 @@
 
 #ifdef USE_DLT
 #include <dlt/dlt.h>
-#include "../../implementation/logging/include/defines.hpp"
+
 #endif
 
 static std::shared_ptr<vsomeip::application> its_application;