Example Refactor: Request-Reply (#5014)

* Refs #21188: Update header guards in other examples Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: CLIParser and example skeleton Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add IDL and type support Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add Server initialization Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add Server on_subscription_matched Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add Client initialization Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add Client on_publication_matched Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Uncrustify Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Code grouping Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Refactor matched status and create a utils header Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client waits until a server is fully matched Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Server runs until it is stopped Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client sends requests which are put in a queue Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Rename reply z to result Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Server sends reply and client waits for it Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Move type support to dedicated directory Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Server reply history cleanup when possible Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client uses CFT to only receive replies to its requests Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client waits before sending request Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add logging utils Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client SIGINT exit before any server has matched Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add debug logging Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add request ID to log messages Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add small TODO for follow-up PR to fulfil Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add context to log messages Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add tests Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add README.md Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add versions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Remove old example Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Address minor Eliana's comments Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Remove operation param from CLI. Client always requests + Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add space between doxygen @param and direction specifier Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client sends 1 request per operation and waits for all replies Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Fix data race on reader filter removal Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Unmatch participant on participant removed Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Add DomainParticipantFactory::get_participant_extended_qos_from_default_profile Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Server ignores non-client participants Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Client ignores non-server participants Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Improve client log Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Update tests Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Increase timeouts for CI testing Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Adjust for change in write return type Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Fix data race between requests_status_ init and update Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Take timeouts back to 3s Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Remove compose name from clients to cope with different docker compose versions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21188: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
eProsima · Jul 16, 2024 · 0bd9128 · 0bd9128
1 parent cc62caf
commit 0bd9128
Show file tree

Hide file tree

Showing 41 changed files with 3,896 additions and 1,334 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -21,6 +21,7 @@ add_subdirectory(cpp/dds)
 add_subdirectory(cpp/delivery_mechanisms)
 add_subdirectory(cpp/discovery_server)
 add_subdirectory(cpp/hello_world)
+add_subdirectory(cpp/request_reply)
 add_subdirectory(cpp/rtps)
 add_subdirectory(cpp/xtypes)
 

diff --git a/examples/cpp/content_filter/CLIParser.hpp b/examples/cpp/content_filter/CLIParser.hpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
+
 #include <csignal>
 #include <cstdlib>
 #include <iostream>
 #include <thread>
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
-
 namespace eprosima {
 namespace fastdds {
 namespace examples {

diff --git a/examples/cpp/content_filter/CustomContentFilter.hpp b/examples/cpp/content_filter/CustomContentFilter.hpp
@@ -1,3 +1,17 @@
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// 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.
+
 #ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
 #define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
 

diff --git a/examples/cpp/content_filter/CustomContentFilterFactory.hpp b/examples/cpp/content_filter/CustomContentFilterFactory.hpp
@@ -1,3 +1,17 @@
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// 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.
+
 #ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
 #define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
 

diff --git a/examples/cpp/dds/CMakeLists.txt b/examples/cpp/dds/CMakeLists.txt
@@ -18,7 +18,6 @@ add_subdirectory(HelloWorldExampleDataSharing)
 add_subdirectory(HelloWorldExampleSharedMem)
 add_subdirectory(HelloWorldExampleTCP)
 add_subdirectory(Keys)
-add_subdirectory(RequestReplyExample)
 add_subdirectory(StaticHelloWorldExample)
 add_subdirectory(WriterLoansExample)
 add_subdirectory(ZeroCopyExample)
diff --git a/examples/cpp/dds/RequestReplyExample/CMakeLists.txt b/examples/cpp/dds/RequestReplyExample/CMakeLists.txt