capicxx-someip-runtime 3.1.12.4

COVESA · Jan 25, 2018 · 83b2f35 · 83b2f35
1 parent b482888
commit 83b2f35
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 Changes
 =======
+
+v3.1.12.4
+- Fixed calling of on$(BROADCASTNAME)SelectiveSubscriptionChanged
+  hooks within correct thread context if mainloop integration is used
+
 v3.1.12.3
 - Avoid holding mutex when pushing to mainloop queue
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,7 +132,7 @@ message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}")
 find_package( Boost 1.54 COMPONENTS system thread log REQUIRED )
 include_directories( ${Boost_INCLUDE_DIR} )
 
-find_package (vsomeip 2.9.0 REQUIRED)
+find_package (vsomeip 2.10.0 REQUIRED)
 message(STATUS "vsomeip version: ${vsomeip_VERSION}")
 
 include_directories (

diff --git a/include/CommonAPI/SomeIP/Connection.hpp b/include/CommonAPI/SomeIP/Connection.hpp
@@ -324,6 +324,9 @@ class Connection:
         std::map<instance_id_t,
             std::map<eventgroup_id_t,
                 std::map<event_id_t, std::uint32_t>>>> requestedEvents_;
+
+    std::map<service_id_t, std::map<instance_id_t, std::map<eventgroup_id_t, SubsciptionHandler_t>>> subscription_;
+    std::mutex subscriptionMutex_;
 };
 
 

diff --git a/src/CommonAPI/SomeIP/Connection.cpp b/src/CommonAPI/SomeIP/Connection.cpp
@@ -1068,11 +1068,66 @@ void Connection::queueSubscriptionStatusHandler(service_id_t serviceId,
 
 void Connection::registerSubsciptionHandler(const Address &_address,
         const eventgroup_id_t _eventgroup, SubsciptionHandler_t _handler) {
-    application_->register_subscription_handler(_address.getService(), _address.getInstance(), _eventgroup, _handler);
+
+    std::lock_guard<std::mutex> itsLock(subscriptionMutex_);
+    subscription_[_address.getService()][_address.getInstance()][_eventgroup] = _handler;
+
+    if (auto lockedContext = mainLoopContext_.lock()) {
+        (void)lockedContext;
+
+        // create async subscription handler which notifies the stack about
+        // the subscription result (accepted or not)
+        auto self = shared_from_this();
+        auto itsAsyncSubscriptionHandler = [this, self, _address, _eventgroup](
+            client_id_t _client,
+            bool _subscribe,
+            std::function<void(const bool)> _accepted_cb) {
+
+            // hooks must be called by the mainloop
+            proxyPushFunctionToMainLoop([this, _client, _subscribe, _accepted_cb, _address, _eventgroup]() {
+                SubsciptionHandler_t itsHandler;
+                {
+                    std::lock_guard<std::mutex> itsLock(subscriptionMutex_);
+                    auto foundService = subscription_.find(_address.getService());
+                    if (foundService != subscription_.end()) {
+                        auto foundInstance = foundService->second.find(_address.getInstance());
+                        if (foundInstance != foundService->second.end()) {
+                            auto foundEventgroup = foundInstance->second.find(_eventgroup);
+                            if (foundEventgroup != foundInstance->second.end()) {
+                                itsHandler = foundEventgroup->second;
+                            }
+                        }
+                    }
+                }
+                if(itsHandler) {
+                    _accepted_cb(itsHandler(_client, _subscribe));
+                } else {
+                    _accepted_cb(true);
+                }
+            });
+
+        };
+        application_->register_async_subscription_handler(_address.getService(), _address.getInstance(), _eventgroup, itsAsyncSubscriptionHandler);
+    } else {
+        application_->register_subscription_handler(_address.getService(), _address.getInstance(), _eventgroup, _handler);
+    }
 }
 
 void Connection::unregisterSubsciptionHandler(const Address &_address,
         const eventgroup_id_t _eventgroup) {
+    std::lock_guard<std::mutex> itsLock(subscriptionMutex_);
+    {
+        auto foundService = subscription_.find(_address.getService());
+        if (foundService != subscription_.end()) {
+            auto foundInstance = foundService->second.find(_address.getInstance());
+            if (foundInstance != foundService->second.end()) {
+                auto foundEventgroup = foundInstance->second.find(_eventgroup);
+                if (foundEventgroup != foundInstance->second.end()) {
+                    foundInstance->second.erase(_eventgroup);
+                }
+            }
+        }
+    }
     application_->unregister_subscription_handler(_address.getService(), _address.getInstance(), _eventgroup);
 }
 

diff --git a/src/CommonAPI/SomeIP/Factory.cpp b/src/CommonAPI/SomeIP/Factory.cpp
@@ -272,10 +272,10 @@ Factory::unregisterStub(const std::string &_domain,
         return false;
     }
 
-    decrementConnection(connection);
-
     servicesMutex_.unlock();
 
+    decrementConnection(connection);
+
     return true;
 }