Merge branch 'iox-eclipse-iceoryx#391-static-memory-alternative-for-s…

…td-function' of github.com:ApexAI/iceoryx into iox-eclipse-iceoryx#391-static-memory-alternative-for-std-function

.clang-format

@@ -1,6 +1,6 @@
 ---
 # for complete code formatting of codebase please type:
-# "find . -type f -regex '.*\.\(inl\|cpp\|h\|hpp\|cc\|cxx\)' -exec clang-format-9 -style=file -i {} \;"
+# "find . -type f -regex '.*\.\(inl\|cpp\|h\|hpp\|cc\|c\|cxx\)' -exec clang-format-10 -style=file -i {} \;"
 Language:        Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
@@ -40,17 +40,15 @@ BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
 ColumnLimit:     120
-# The line below is commented because this feature is not supported in clang-format-4.0
-#CompactNamespaces: true
+CompactNamespaces: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-# The line below is commented because this feature is not supported in clang-format-4.0
-#FixNamespaceComments: true
+FixNamespaceComments: true
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -65,7 +63,7 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left 
+PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    true
 SpaceAfterCStyleCast: false
@@ -78,8 +76,7 @@ SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        c++14
 TabWidth:        4
 UseTab:          Never
 ...
-

.github/workflows/build-test.yml

@@ -108,7 +108,7 @@ jobs:
       # we have to exclude the tests explicitly until everyone is running
       - name: Run tests, excluding timing_tests
         run: |
-          build\hoofs\test\Debug\hoofs_moduletests.exe --gtest_filter="-SignalHandler*:relativeptr*:Timer*:base_relative*:DeadlineTimer*:Thread*:Duration*:*TimingTest*"
+          build\hoofs\test\Debug\hoofs_moduletests.exe --gtest_filter="-*TimingTest*"
           build\hoofs\test\Debug\hoofs_integrationtests.exe
           build\binding_c\test\Debug\binding_c_moduletests.exe --gtest_filter="-Chunk*:iox_listener*:iox_node*:iox_pub*:BindingC_Runtime*:iox_sub*:iox_ws*:iox_types*:*TimingTest*"
           build\posh\test\Debug\posh_moduletests.exe --gtest_filter="-PoshRuntime*:IceoryxRoudiApp*:IceoryxRoudiMemoryManager*:PortManager*:ProcessIntrospection*:ProcessManager*:PosixShmMemoryProvider*:Process_test*:ParseAllMalformedInput*:*TimingTest*"

.github/workflows/integrationtest.yml

@@ -25,7 +25,7 @@ jobs:
           echo $(clang --version)
 
       - name: Setup ROS
-        uses: ros-tooling/setup-ros@0.1.2
+        uses: ros-tooling/setup-ros@0.2.1
         with:
           required-ros-distributions: foxy
 

CONTRIBUTING.md

@@ -56,6 +56,8 @@ Please make sure you have:
 6. You open your pull request towards the base branch `master`
 7. Link the pull request to the according Github issue and set the label accordingly
 
+**NOTE:** For support while developing you can use little helper scripts, see [git-hooks](https://github.com/eclipse-iceoryx/iceoryx/blob/master/tools/git-hooks/Readme.md).
+
 ## Branching strategy
 
 `master`
@@ -107,10 +109,10 @@ codebase follows these rules, things are work in progress.
     our code may contain additions which are not compatible with the STL (e.g. `iox::cxx::vector::emplace_back()`
     does return a bool)
 7) **Always use `iox::log::Logger`**, instead of `printf()`
-8) **Always use `iox::ErrorHandler()`**, when an error occurs that cannot or shall not be propagated via an 
+8) **Always use `iox::ErrorHandler()`**, when an error occurs that cannot or shall not be propagated via an
     `iox::cxx::expected`, the `iox::ErrorHandler()` shall be used; exceptions are not allowed
 
-See [error-handling.md](https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/design/error-handling.md) for additional 
+See [error-handling.md](https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/design/error-handling.md) for additional
 information about logging and error handling.
 
 ### Naming conventions

doc/aspice_swe3_4/example/iceoryx_component/source/example_module/example_base_class.hpp

@@ -56,7 +56,7 @@ class ExampleBaseClass
     /// @brief Short description
     uint32_t simplerMethod() const noexcept;
 
-    private:
+  private:
     /// @brief Short description
     uint32_t m_memberVariable{0U};
 };

doc/design/diagrams/service-discovery/overview-alternative-b.puml

@@ -0,0 +1,38 @@
+@startuml
+title Alternative B: iceoryx-based ECU forwarding CaPro messages to Gateway and User App
+
+package "iceoryx instance e.g. electronic control unit" {
+    component RouDi {
+        artifact discoveryLoop [
+        PortManager::sendToAllMatchingInterfacePorts()
+        ]
+        artifact server [
+        m_server : Server
+        ]
+    }
+    component "User App" {
+        component ServiceDiscoveryListener {
+            artifact serviceDiscoveryThread [
+            m_thread  : Thread
+            m_interfacePort  : InterfacePort
+            ]
+            artifact callback [
+            m_callback  : std::function<void()>
+            ]
+        }
+        artifact client [
+        m_client : Client
+        ]
+    }
+}
+
+package "DDS instance e.g. electronic control unit" {
+    component DCPSTopic
+}
+
+[discoveryLoop] ..> [DCPSTopic] : dispatchCaProMessage()
+[discoveryLoop] ..> [serviceDiscoveryThread] : dispatchCaProMessage()
+[server] <..> [client] : findService()
+[DCPSTopic] ..> [discoveryLoop]  : Not yet implemented
+[serviceDiscoveryThread] ..> [callback]  : calls
+@enduml

doc/design/diagrams/service-discovery/overview-alternative-d.puml

@@ -0,0 +1,50 @@
+@startuml
+title Alternative D: iceoryx-based ECU forwarding CaPro messages to Gateway and User App
+
+package "iceoryx instance e.g. electronic control unit" {
+    component RouDi {
+        artifact discoveryLoop [
+        PortManager::sendToAllMatchingInterfacePorts()
+        ]
+    }
+    component "User App" {
+        component DiscoveryInfoA <<object>> {
+            artifact DiscoveryInfoNoteA [
+            +findService() : cxx::expected<InstanceContainer, FindServiceError>
+            -m_subscriber : Subscriber<ServiceRegistryTopic>
+            -m_lastServiceRegistry : ServiceRegistryTopic
+            ]
+
+        }
+
+        component UserAppListener <<object>>
+
+        component UserDefinedCallback <<object>>
+    }
+    component "DDS Gateway" {
+        component DiscoveryInfoB <<object>> {
+            artifact DiscoveryInfoNoteB [
+            +findService() : cxx::expected<InstanceContainer, FindServiceError>            
+            -m_subscriber : Subscriber<ServiceRegistryTopic>
+            -m_lastServiceRegistry : ServiceRegistryTopic
+            ]
+        }
+        component GatewayListener <<object>>
+
+        component GatewayUserDefinedCallback <<object>>
+    }
+}
+
+package "DDS instance e.g. electronic control unit" {
+    component DCPSTopic
+}
+
+[DiscoveryInfoNoteB] ..> [DCPSTopic] : Implemented
+[discoveryLoop] ..> [DiscoveryInfoNoteA] : publish(ServiceRegistryTopic)
+[discoveryLoop] ..> [DiscoveryInfoNoteB] : publish(ServiceRegistryTopic)
+[DCPSTopic] ..> [DiscoveryInfoNoteB]  : Not yet implemented
+[GatewayListener] ..> [GatewayUserDefinedCallback]  : calls
+[UserAppListener] ..> [UserDefinedCallback]  : calls
+[DiscoveryInfoNoteA] ..> [UserAppListener]  : attached to
+[DiscoveryInfoNoteB] ..> [GatewayListener]  : attached to
+@enduml