Cosmetics: sort topologies in source files.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 35095a5d11e5d45625e3abacf499767c2249a065..7a65a71864400bc1bf4c976cdcc2556aad4ec62d 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -49,18 +49,20 @@ namespace opt {
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
 
         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()
     {

-        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
 
 
 } // namespace opt
 


@@ -120,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;


@@ -220,11 +227,7 @@ void opt::usage()
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology\n";
     if (opt::help_requested > 1)
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology\n";
     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";