Remove redundant includes.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 68809699c25c4d4436c51bee617e9e32ee5accdb..54fd53d19000426dbf487e7491d3675e32b99173 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -5,36 +5,64 @@
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>

-#include "misc.h"
+#include "loba_simple.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 namespace opt {
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 namespace opt {
 

+    // Global options

     std::string program_name;
     std::string program_name;

-
-    std::string platform_file;
-    std::string deployment_file;
-

     int help_requested = 0;
     bool version_requested = false;
 
     int help_requested = 0;
     bool version_requested = false;
 

+    // Simulation parameters

     unsigned log_rate = 1;
 
     unsigned log_rate = 1;
 

+    // Platform and deployment
+    std::string platform_file;
+    std::string deployment_file;
+
+    // Automatic deployment

     namespace auto_depl {
         bool        enabled = false;
     namespace auto_depl {
         bool        enabled = false;

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

         unsigned    nhosts = 0;
         double      load = 0.0;
     }
 
         unsigned    nhosts = 0;
         double      load = 0.0;
     }
 

-    unsigned maxiter = 4;       // fixme
-    bool exit_on_close = false;
-
+    // Load balancing algorithm
+    std::string loba_algo("simple");

     bool bookkeeping = false;
 
     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
     cost_func comp_cost("1e9, 0"); // fixme: find better defaults
     cost_func comm_cost("1, 0"); // fixme: find better defaults

+    unsigned maxiter = 4;       // fixme
+    bool exit_on_close = false;
+
+    // Named parameters lists
+    loba_algorithms_type loba_algorithms;
+    loba_algorithms_type::loba_algorithms_type()
+    {
+        NOL_INSERT("none", "no load-balancing (for testing)", process);
+        NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
+    }
+
+    topologies_type topologies;
+    topologies_type::topologies_type()
+    {
+        NOL_INSERT("btree", "binary tree topologym intiial 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);
+    }

 
 } // namespace opt
 
 
 } // namespace opt
 


@@ -56,8 +84,16 @@ int opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
     
     int c;
     opterr = 0;

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

         switch (c) {
         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;
             break;


@@ -86,7 +122,12 @@ 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':
             opt::version_requested = true;
             break;
         case 'V':
             opt::version_requested = true;


@@ -97,7 +138,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;


@@ -108,14 +148,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++]);


@@ -128,33 +164,45 @@ int opt::parse_args(int* argc, char* argv[])
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");

-    INFO1("| platform file.......: \"%s\"", opt::platform_file.c_str());
+    INFO1("| log rate.....................: %u",     opt::log_rate);
+    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............: %u", opt::auto_depl::nhosts);
+        INFO1("| - initial load...............: %g", opt::auto_depl::load);

     } 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.: %u",   opt::maxiter);
+    INFO1("| exit on close................: %s",   on_off(opt::exit_on_close));

     INFO0("`----");
 }
 
 void opt::usage()
 {
     INFO0("`----");
 }
 
 void opt::usage()
 {

+    // option(...)

 #define o(opt) "    " << std::setw(14) \
                       << std::left << (opt) << std::right << " "
 #define o(opt) "    " << std::setw(14) \
                       << std::left << (opt) << std::right << " "

-#define so(subopt) std::setw(10) << (subopt) << ": "
+    // sub-option(...)
+#define so(subopt) std::setw(18) << (subopt) << " : "
+    // sub-option list
+#define so_list(name) do {                                      \
+        name ## _type::iterator it;                             \
+        for (it = name.begin() ; it != name.end() ; ++it)       \
+            std::clog << so(name.get_name(it))                  \
+                      << name.get_descr(it) << "\n";            \
+    } while (0)
+

 
     std::clog << "Usage: " << opt::program_name
 
     std::clog << "Usage: " << opt::program_name

-              << " [options] <platform_file> <deployment_file>\n";
+              << " [options] <platform_file> [<deployment_file>]\n";

 
 

+    std::clog << "\nGlobal options\n";

     std::clog << o("-h")
               << "print help and exit (use -hh for extended help)\n";
     if (opt::help_requested < 1)
     std::clog << o("-h")
               << "print help and exit (use -hh for extended help)\n";
     if (opt::help_requested < 1)


@@ -163,7 +211,32 @@ void opt::usage()
     std::clog << o("--help") << "print help from SimGrid framework and exit\n";
     std::clog << o("-V") << "print version and exit\n";
 
     std::clog << o("--help") << "print help from SimGrid framework and exit\n";
     std::clog << o("-V") << "print version and exit\n";
 

-    std::clog << o("-b") << "activate bookkeeping\n";
+    std::clog << "\nSimulation parameters\n";
+    std::clog << o("-l value")
+              << "print current load every n-th iterations, 0 to disable"
+              << " (" << opt::log_rate << ")\n";
+
+    std::clog << "\nAutomatic deployment options\n";
+    std::clog << o("-T name")
+              << "enable automatic deployment with selected topology"
+              << " (" << opt::auto_depl::topology << ")\n";
+    if (opt::help_requested > 1)
+        so_list(opt::topologies);
+    std::clog << o("-L value")
+              << "total load with auto deployment, 0 for number of hosts"
+              << " (" << opt::auto_depl::load << ")\n";
+    std::clog << o("-N value")
+              << "number of hosts to use with auto deployment,"
+              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";
+
+    std::clog << "\nLoad balancing algorithm\n";
+    std::clog << o("-a name") << "load balancing algorithm"
+              << " (" << opt::loba_algo << ")\n";
+    if (opt::help_requested > 1)
+        so_list(opt::loba_algorithms);
+    std::clog << o("-b") << "enable bookkeeping\n";
+
+    std::clog << "\nApplication parameters\n";

     std::clog << o("-c [fn,...]f0")
               << "polynomial factors for computation cost"
               << " (" << opt::comp_cost.to_string() << ")\n";
     std::clog << o("-c [fn,...]f0")
               << "polynomial factors for computation cost"
               << " (" << opt::comp_cost.to_string() << ")\n";


@@ -174,24 +247,10 @@ void opt::usage()
     std::clog << o("-i value")
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";
     std::clog << o("-i value")
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";

-    std::clog << o("-l value")
-              << "print current load every n-th iterations, 0 to disable"
-              << " (" << opt::log_rate << ")\n";
-    std::clog << o("-L value")
-              << "total load with auto deployment, 0 for number of hosts"
-              << " (" << opt::auto_depl::load << ")\n";
-    std::clog << o("-N value")
-              << "number of hosts to use with auto deployment,"
-              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";
-    std::clog << o("-T type")
-              << "enable automatic deployment with selected topology\n";
-    if (opt::help_requested > 1) {
-        std::clog << so(1) << "pipo\n";
-        std::clog << so(42) << "atchoum\n";
-    }

 
 

+#undef so_list
+#undef so

 #undef o
 #undef o

-#undef oo

 }
 
 // Local variables:
 }
 
 // Local variables: