Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / examples / cpp / dht-chord / s4u-dht-chord.cpp

diff --git a/examples/cpp/dht-chord/s4u-dht-chord.cpp b/examples/cpp/dht-chord/s4u-dht-chord.cpp
index 8723799..08934aa 100644 (file)
--- a/examples/cpp/dht-chord/s4u-dht-chord.cpp
+++ b/examples/cpp/dht-chord/s4u-dht-chord.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,10 +7,6 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_chord, "Messages specific for this s4u example");
 
-int nb_bits  = 24;
-int nb_keys  = 0;
-int timeout  = 50;
-
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
@@ -18,35 +14,34 @@ int main(int argc, char* argv[])
              "Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n"
              "\tExample: %s ../platforms/cluster_backbone.xml ./s4u-dht-chord_d.xml\n",
              argv[0], argv[0]);
-  char** options = &argv[1];
-  while (not strncmp(options[0], "-", 1)) {
-    unsigned int length = strlen("-nb_bits=");
-    if (not strncmp(options[0], "-nb_bits=", length) && strlen(options[0]) > length) {
-      nb_bits = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid nb_bits parameter: %s"));
+  std::string platform_file(argv[argc - 2]);
+  std::string deployment_file(argv[argc - 1]);
+  int nb_bits = 24;
+  int timeout = 50;
+  for (const auto& option : std::vector<std::string>(argv + 1, argv + argc - 2)) {
+    if (option.rfind("-nb_bits=", 0) == 0) {
+      nb_bits = std::stoi(option.substr(option.find('=') + 1));
       XBT_DEBUG("Set nb_bits to %d", nb_bits);
+    } else if (option.rfind("-timeout=", 0) == 0) {
+      timeout = std::stoi(option.substr(option.find('=') + 1));
+      XBT_DEBUG("Set timeout to %d", timeout);
     } else {
-      length = strlen("-timeout=");
-      if (not strncmp(options[0], "-timeout=", length) && strlen(options[0]) > length) {
-        timeout = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid timeout parameter: %s"));
-        XBT_DEBUG("Set timeout to %d", timeout);
-      } else {
-        xbt_die("Invalid chord option '%s'", options[0]);
-      }
+      xbt_die("Invalid chord option '%s'", option.c_str());
     }
-    options++;
   }
+  int nb_keys = 1U << nb_bits;
+  XBT_DEBUG("Sets nb_keys to %d", nb_keys);
 
-  e.load_platform(options[0]);
+  e.load_platform(platform_file);
 
   /* Global initialization of the Chord simulation. */
-  nb_keys = 1U << nb_bits;
-  XBT_DEBUG("Sets nb_keys to %d", nb_keys);
+  Node::set_parameters(nb_bits, nb_keys, timeout);
 
   e.register_actor<Node>("node");
-  e.load_deployment(options[1]);
+  e.load_deployment(deployment_file);
 
   e.run();
 
-  XBT_INFO("Simulated time: %g", e.get_clock());
+  XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());
   return 0;
 }