Deadlock fix, and other changes.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 0a9fb5ce1fa1b0b7e76ac88b719fd95b33075311..2c8e61d672b7c82adfadbbf233805f06f193c225 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -1,16 +1,24 @@
-#include "options.h"
-

 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>

-#include "loba_simple.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 

+#include "loba_simple.h"
+#include "loba_fairstrategy.h"
+
+#include "options.h"
+

 namespace opt {
 
 namespace opt {
 

+    // Constants
+
+    // A sum of loads if considered null if it is less than
+    // load_ratio_threshold percent of the sum of loads at init.
+    const double load_ratio_threshold = 1e-4;
+

     // Global options
     std::string program_name;
     int help_requested = 0;
     // Global options
     std::string program_name;
     int help_requested = 0;


@@ -26,51 +34,47 @@ namespace opt {
     // Automatic deployment
     namespace auto_depl {
         bool        enabled = false;
     // Automatic deployment
     namespace auto_depl {
         bool        enabled = false;

-        std::string topology;
+        std::string topology("clique");

         unsigned    nhosts = 0;
         double      load = 0.0;
     }
 
     // Load balancing algorithm
         unsigned    nhosts = 0;
         double      load = 0.0;
     }
 
     // Load balancing algorithm

-    std::string loba_algo("none");
+    std::string loba_algo("simple");

     bool bookkeeping = false;
 
     // Application parameters
     cost_func comp_cost("1e9, 0"); // fixme: find better defaults
     cost_func comm_cost("1, 0"); // fixme: find better defaults
     bool bookkeeping = false;
 
     // Application parameters
     cost_func comp_cost("1e9, 0"); // fixme: find better defaults
     cost_func comm_cost("1, 0"); // fixme: find better defaults

-    unsigned maxiter = 4;       // fixme
+    unsigned maxiter = 10;       // fixme: find better defaults

     bool exit_on_close = false;
 
     // Named parameters lists
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
     bool exit_on_close = false;
 
     // Named parameters lists
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {

-        THIS_INSERT("none", "no load-balancing", process);
-        THIS_INSERT("simple", "balance with least loaded neighbor",
-                    loba_simple);
+        NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+        NOL_INSERT("none", "no load-balancing (for testing only)", process);
+        NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);

     }
 
     }
 

-#if 0

     topologies_type topologies;
     topologies_type::topologies_type()
     {
     topologies_type topologies;
     topologies_type::topologies_type()
     {

-        THIS_INSERT("none", "no load-balancing", process);
-        THIS_INSERT("simple", "balance with least loaded neighbor",
-                    loba_simple);
+        NOL_INSERT("btree", "binary tree topology, initial load at root",
+                   deployment_btree);
+        NOL_INSERT("clique", "all connected topology", deployment_clique);
+        NOL_INSERT("hcube", "hypercube topology", deployment_hcube);
+        NOL_INSERT("line", "line topology, initial load at one end",
+                   deployment_line);
+        NOL_INSERT("ring", "ring topology", deployment_ring);
+        NOL_INSERT("star", "star topology, initial load at center",
+                   deployment_star);
+        NOL_INSERT("torus", "torus topology", deployment_torus);

     }
     }

-#endif

 
 } // namespace opt
 
 
 } // namespace opt
 

-namespace {
-
-    const char* on_off(bool b)
-    {
-        return b ? "on" : "off";
-    }
-
-}
-

 int opt::parse_args(int* argc, char* argv[])
 {
     int result = 1;
 int opt::parse_args(int* argc, char* argv[])
 {
     int result = 1;


@@ -80,10 +84,15 @@ int opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
     
     int c;
     opterr = 0;

-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:l:L:N:T:V")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:l:L:N:T:vV")) != -1) {

         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;

+            if (!opt::loba_algorithms.exists(opt::loba_algo)) {
+                ERROR1("unknownw load balancing algorithm -- %s",
+                       opt::loba_algo.c_str());
+                result = 0;
+            }

             break;
         case 'b':
             opt::bookkeeping = true;
             break;
         case 'b':
             opt::bookkeeping = true;


@@ -113,7 +122,16 @@ int opt::parse_args(int* argc, char* argv[])
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 'T':
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 'T':

-            opt::auto_depl::topology = optarg;
+            opt::auto_depl::topology = optarg; 
+            if (!opt::topologies.exists(opt::auto_depl::topology)) {
+                ERROR1("unknownw topology -- %s",
+                       opt::auto_depl::topology.c_str());
+                result = 0;
+            }
+            break;
+        case 'v':
+            // nothing to do: this option is checked at the very
+            // beginning of main()

             break;
         case 'V':
             opt::version_requested = true;
             break;
         case 'V':
             opt::version_requested = true;


@@ -124,7 +142,6 @@ int opt::parse_args(int* argc, char* argv[])
             break;
         }
     }
             break;
         }
     }

-    opt::auto_depl::enabled = !opt::auto_depl::topology.empty();

 
     if (opt::version_requested || opt::help_requested)
         return 1;
 
     if (opt::version_requested || opt::help_requested)
         return 1;


@@ -135,14 +152,10 @@ int opt::parse_args(int* argc, char* argv[])
         ERROR0("missing parameter -- <plaform_file>");
         result = 0;
     }
         ERROR0("missing parameter -- <plaform_file>");
         result = 0;
     }

-    if (!opt::auto_depl::enabled) {
-        if (optind < *argc) {
-            opt::deployment_file = argv[optind++];
-        } else {
-            ERROR0("missing parameter -- <deployment_file>");
-            result = 0;
-        }
+    if (optind < *argc) {
+        opt::deployment_file = argv[optind++];

     }
     }

+    opt::auto_depl::enabled = opt::deployment_file.empty();

 
     while (optind < *argc) {
         ERROR1("unused parameter -- \"%s\"", argv[optind++]);
 
     while (optind < *argc) {
         ERROR1("unused parameter -- \"%s\"", argv[optind++]);


@@ -152,24 +165,54 @@ int opt::parse_args(int* argc, char* argv[])
     return result;
 }
 
     return result;
 }
 

+namespace {
+
+    // some helper functions for opt::print()
+
+    const char* on_off(bool b)
+    {
+        return b ? "on" : "off";
+    }
+
+    template <typename T>
+    const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
+    {
+        static std::string res;
+        if (val != deflt) {
+            std::ostringstream oss;
+            oss << val;
+            res = oss.str();
+        } else {
+            res = str;
+        }
+        return res.c_str();
+    }
+
+} // namespace
+

 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");

-    INFO1("| platform file.......: \"%s\"", opt::platform_file.c_str());
+    INFO1("| log rate.....................: %s",
+          val_or_string(opt::log_rate, "disabled"));
+    INFO1("| platform file................: \"%s\"", opt::platform_file.c_str());

     if (opt::auto_depl::enabled) {
     if (opt::auto_depl::enabled) {

-        INFO0("| automatic deployment enabled with:");
-        INFO1("|     topology........: %s", opt::auto_depl::topology.c_str());
-        INFO1("|     number of hosts.: %u", opt::auto_depl::nhosts);
-        INFO1("|     initial load....: %g", opt::auto_depl::load);
+        INFO0("| automatic deployment enabled");
+        INFO1("| - topology...................: %s", opt::auto_depl::topology.c_str());
+        INFO1("| - number of hosts............: %s",
+              val_or_string(opt::auto_depl::nhosts, "auto"));
+        INFO1("| - initial load...............: %s",
+              val_or_string(opt::auto_depl::load, "auto"));

     } else {
     } else {

-        INFO1("| deployment file.....: \"%s\"", opt::deployment_file.c_str());
+        INFO1("| deployment file..............: \"%s\"", opt::deployment_file.c_str());

     }
     }

-    INFO1("| log rate............: %u",     opt::log_rate);
-    INFO1("| maxiter.............: %u",     opt::maxiter);
-    INFO1("| exit on close.......: %s",     on_off(opt::exit_on_close));
-    INFO1("| bookkeeping.........: %s",     on_off(opt::bookkeeping));
-    INFO1("| comp. cost factors..: [%s]",   opt::comp_cost.to_string().c_str());
-    INFO1("| comm. cost factors..: [%s]",   opt::comm_cost.to_string().c_str());
+    INFO1("| load balancing algorithm.....: %s",   opt::loba_algo.c_str());
+    INFO1("| bookkeeping..................: %s",   on_off(opt::bookkeeping));
+    INFO1("| computation cost factors.....: [%s]", opt::comp_cost.to_string().c_str());
+    INFO1("| communication cost factors...: [%s]", opt::comm_cost.to_string().c_str());
+    INFO1("| maximum number of iterations.: %s",
+          val_or_string(opt::maxiter, "infinity"));
+    INFO1("| exit on close................: %s",   on_off(opt::exit_on_close));

     INFO0("`----");
 }
 
     INFO0("`----");
 }
 


@@ -190,13 +233,11 @@ void opt::usage()
 
 
     std::clog << "Usage: " << opt::program_name
 
 
     std::clog << "Usage: " << opt::program_name

-              << " [options] <platform_file> <deployment_file>\n";
-    std::clog << "       " << opt::program_name
-              << " [options] -T type <platform_file>\n";
+              << " [options] <platform_file> [<deployment_file>]\n";

 
     std::clog << "\nGlobal options\n";
     std::clog << o("-h")
 
     std::clog << "\nGlobal options\n";
     std::clog << o("-h")

-              << "print help and exit (use -hh for extended help)\n";
+              << "print help and exit (use -hh or -hhh for extended help)\n";

     if (opt::help_requested < 1)
         return;
 
     if (opt::help_requested < 1)
         return;
 


@@ -207,16 +248,15 @@ void opt::usage()
     std::clog << o("-l value")
               << "print current load every n-th iterations, 0 to disable"
               << " (" << opt::log_rate << ")\n";
     std::clog << o("-l value")
               << "print current load every n-th iterations, 0 to disable"
               << " (" << opt::log_rate << ")\n";

+    std::clog << o("-v")
+              << "verbose: do not override the default logging parameters\n";

 
     std::clog << "\nAutomatic deployment options\n";
     std::clog << o("-T name")
 
     std::clog << "\nAutomatic deployment options\n";
     std::clog << o("-T name")

-              << "enable automatic deployment with selected topology\n";
+              << "enable automatic deployment with selected topology"
+              << " (" << opt::auto_depl::topology << ")\n";

     if (opt::help_requested > 1)
     if (opt::help_requested > 1)

-#if 0

         so_list(opt::topologies);
         so_list(opt::topologies);

-#else
-        std::clog << so("name") << "FIXME\n"; // fixme
-#endif

     std::clog << o("-L value")
               << "total load with auto deployment, 0 for number of hosts"
               << " (" << opt::auto_depl::load << ")\n";
     std::clog << o("-L value")
               << "total load with auto deployment, 0 for number of hosts"
               << " (" << opt::auto_depl::load << ")\n";


@@ -243,6 +283,20 @@ void opt::usage()
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";
 
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";
 

+    if (opt::help_requested < 3)
+        return;
+
+    std::clog << "\nLogging support\n"
+              << "    See SimGrid documentation on:\n"
+              << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"
+              << "    Existing categories are:\n"
+              << "        simu : root of following categories\n"
+              << "        main : messages from global infrastructure\n"
+              << "        depl : messages from auto deployment (inherited from main)\n"
+              << "        comm : messages from asynchronous pipes\n"
+              << "        proc : messages from base process class\n"
+              << "        loba : messages from load-balancer\n";
+

 #undef so_list
 #undef so
 #undef o
 #undef so_list
 #undef so
 #undef o