X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4cb5119dfa978af3deecb83a56587ed08384193a..15ace044d0d9e82ef744e22cf84168771e669678:/options.cpp?ds=inline

diff --git a/options.cpp b/options.cpp
index 2994640..96542f6 100644
--- a/options.cpp
+++ b/options.cpp
@@ -1,3 +1,4 @@
+#include <ctime>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -47,6 +48,8 @@ namespace opt {
         std::string topology("clique");
         unsigned    nhosts = 0;
         double      load = 0.0;
+        bool        random_distribution = false;
+        unsigned long random_seed = 0;
     }
 
     // Load balancing algorithm
@@ -211,7 +214,7 @@ bool opt::parse_args(int* argc, char* argv[])
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,
-                       "a:bc:C:d:D:ehi:I:l:L:m:M:N:s:S:t:T:vV")) != -1) {
+                       "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -274,6 +277,13 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'N':
             PARSE_ARG(opt::auto_depl::nhosts);
             break;
+        case 'r':
+            PARSE_ARG(opt::auto_depl::random_seed);
+            break;
+        case 'R':
+            opt::auto_depl::random_distribution =
+                !opt::auto_depl::random_distribution;
+            break;
         case 's':
             PARSE_ARG(opt::min_lb_iter_duration);
             break;
@@ -330,6 +340,9 @@ bool opt::parse_args(int* argc, char* argv[])
         result = false;
     }
 
+    if (!opt::auto_depl::random_seed)
+        opt::auto_depl::random_seed = time(NULL);
+
     return result;
 }
 
@@ -350,6 +363,10 @@ void opt::print()
                                                          "auto"));
         DESCR("- initial load", "%s", h.val_or_string(auto_depl::load,
                                                       "auto"));
+        DESCR("- random initial load distribution", "%s",
+              h.on_off(auto_depl::random_distribution));
+        DESCR("- random seed", "%s",
+              h.val_or_string(auto_depl::random_seed, "time based"));
     } else {
         DESCR("deployment file", "\"%s\"", deployment_file.c_str());
     }
@@ -424,6 +441,13 @@ void opt::usage()
     std::clog << o("-N value")
               << "number of hosts to use with auto deployment, 0 for max."
               << " [" << opt::auto_depl::nhosts << "]\n";
+    std::clog << o("-R")
+              << "toggle random initial load distribution"
+              << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
+              << "]\n";
+    std::clog << o("-r value")
+              << "random seed, 0 for using it on time()"
+              << " [" << opt::auto_depl::random_seed << "]\n";
 
     std::clog << "\nLoad balancing algorithm\n";
     std::clog << o("-a name") << "load balancing algorithm"