X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c4e7c13743a9d1e8dfa5dc27d4b2fa3aaf1557ab..4b258b0acb4f4f43d99a3eba7fd38ba40460b96d:/options.cpp?ds=sidebyside

diff --git a/options.cpp b/options.cpp
index 35095a5..54fd53d 100644
--- a/options.cpp
+++ b/options.cpp
@@ -26,7 +26,7 @@ namespace opt {
     // Automatic deployment
     namespace auto_depl {
         bool        enabled = false;
-        std::string topology;
+        std::string topology("clique");
         unsigned    nhosts = 0;
         double      load = 0.0;
     }
@@ -49,18 +49,20 @@ namespace opt {
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
 
-#if 0
     topologies_type topologies;
     topologies_type::topologies_type()
     {
-        NOL_INSERT("line", "line topology, initial load at one end", xxx);
-        NOL_INSERT("ring", "ring topology", xxx);
-        NOL_INSERT("star", "star topology, initial load at center", xxx);
-        NOL_INSERT("clique", "all connected topology", xxx);
-        NOL_INSERT("btree", "binary tree topologym intiial load at root", xxx);
-        NOL_INSERT("hcube", "hypercube topology", xxx);
+        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);
     }
-#endif
 
 } // namespace opt
 
@@ -120,7 +122,12 @@ int opt::parse_args(int* argc, char* argv[])
             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;
@@ -131,7 +138,6 @@ int opt::parse_args(int* argc, char* argv[])
             break;
         }
     }
-    opt::auto_depl::enabled = !opt::auto_depl::topology.empty();
 
     if (opt::version_requested || opt::help_requested)
         return 1;
@@ -142,14 +148,10 @@ int opt::parse_args(int* argc, char* argv[])
         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++]);
@@ -198,9 +200,7 @@ void opt::usage()
 
 
     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")
@@ -218,13 +218,10 @@ void opt::usage()
 
     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 0
         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";