modification to fairstrategy

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index e4d1236ecd51205c4dd87ed536d05e5392f27dc6..e41347071d8194c0d8977e251ce12f0e3d310626 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -6,6 +6,7 @@
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 #include "loba_simple.h"
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 #include "loba_simple.h"

+#include "loba_fairstrategy.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 


@@ -45,6 +46,7 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {

+        NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);

         NOL_INSERT("none", "no load-balancing (for testing)", process);
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
         NOL_INSERT("none", "no load-balancing (for testing)", process);
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }


@@ -75,7 +77,7 @@ 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;


@@ -120,6 +122,10 @@ int opt::parse_args(int* argc, char* argv[])
                 result = 0;
             }
             break;
                 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;
             break;


@@ -235,6 +241,8 @@ 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")