Refs #21886: Add matched argument to hello_world example

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Nov 12, 2024 · 16018d9 · 16018d9
1 parent b13f3cc
commit 16018d9
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/examples/cpp/hello_world/CLIParser.hpp b/examples/cpp/hello_world/CLIParser.hpp
@@ -46,6 +46,7 @@ class CLIParser
     struct publisher_config
     {
         uint16_t samples = 0;
+        uint16_t matched = 1;
     };
 
     //! Subscriber application configuration structure
@@ -83,6 +84,9 @@ class CLIParser
         std::cout << "  -s <num>, --samples <num>       Number of samples to send or receive"   << std::endl;
         std::cout << "                                  [0 <= <num> <= 65535]"                  << std::endl;
         std::cout << "                                  (Default: 0 [unlimited])"               << std::endl;
+        std::cout << "Publisher options:"                                                       << std::endl;
+        std::cout << "  -m, --matched                   Number of participants to discover"     << std::endl;
+        std::cout << "                                  before start publishing (Default: 1)"   << std::endl;
         std::cout << "Subscriber options:"                                                      << std::endl;
         std::cout << "  -w, --waitset                   Use waitset & read condition"           << std::endl;
         std::exit(return_code);
@@ -194,6 +198,40 @@ class CLIParser
                     print_help(EXIT_FAILURE);
                 }
             }
+            else if (arg == "-m" || arg == "--matched")
+            {
+                try
+                {
+                    int input = std::stoi(argv[++i]);
+                    if (input < std::numeric_limits<std::uint16_t>::min() ||
+                            input > std::numeric_limits<std::uint16_t>::max())
+                    {
+                        throw std::out_of_range("matched argument out of range");
+                    }
+                    else
+                    {
+                        if (config.entity == CLIParser::EntityKind::PUBLISHER)
+                        {
+                            config.pub_config.matched = static_cast<uint16_t>(input);
+                        }
+                        else
+                        {
+                            EPROSIMA_LOG_ERROR(CLI_PARSER, "matched can only be used with the publisher entity");
+                            print_help(EXIT_FAILURE);
+                        }
+                    }
+                }
+                catch (const std::invalid_argument& e)
+                {
+                    EPROSIMA_LOG_ERROR(CLI_PARSER, "invalid sample argument for " + arg + ": " + e.what());
+                    print_help(EXIT_FAILURE);
+                }
+                catch (const std::out_of_range& e)
+                {
+                    EPROSIMA_LOG_ERROR(CLI_PARSER, "sample argument out of range for " + arg + ": " + e.what());
+                    print_help(EXIT_FAILURE);
+                }
+            }
             else
             {
                 EPROSIMA_LOG_ERROR(CLI_PARSER, "unknown option " + arg);

diff --git a/examples/cpp/hello_world/PublisherApp.cpp b/examples/cpp/hello_world/PublisherApp.cpp
@@ -47,6 +47,7 @@ PublisherApp::PublisherApp(
     , type_(new HelloWorldPubSubType())
     , matched_(0)
     , samples_(config.samples)
+    , expected_matches_(config.matched)
     , stop_(false)
 {
     // Set up the data type with initial values
@@ -152,7 +153,7 @@ bool PublisherApp::publish()
     cv_.wait(matched_lock, [&]()
             {
                 // at least one has been discovered
-                return ((matched_ > 0) || is_stopped());
+                return ((matched_ >= expected_matches_) || is_stopped());
             });
 
     if (!is_stopped())

diff --git a/examples/cpp/hello_world/PublisherApp.hpp b/examples/cpp/hello_world/PublisherApp.hpp
@@ -82,6 +82,8 @@ class PublisherApp : public Application, public DataWriterListener
 
     uint16_t samples_;
 
+    uint16_t expected_matches_;
+
     std::mutex mutex_;
 
     std::condition_variable cv_;