Happy new year.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 0ed04acfde62e493404a795f5d45920f8eadfeea..76de43bb579eb5d885a1874bfcad98aed3745e69 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -18,6 +18,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_makhoul3.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_makhoul3.h"

+#include "loba_pstar.h"

 #include "loba_simple.h"
 #include "misc.h"
 
 #include "loba_simple.h"
 #include "misc.h"
 


@@ -105,6 +106,8 @@ namespace opt {
                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);

+        NOL_INSERT("pstar", "balance with pstar strategy",
+                   loba_pstar);

         NOL_INSERT("simple", "balance with least loaded neighbor",
                    loba_simple);
     }
         NOL_INSERT("simple", "balance with least loaded neighbor",
                    loba_simple);
     }


@@ -166,25 +169,24 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
 
 const char* opt_helper::descr(const char* str)
 {

-    std::string& res = descr_str;
-    res = str;
-    res.resize(DATA_DESCR_WIDTH, '.');
-    return res.c_str();
+    descr_str = str;
+    descr_str.push_back(' ');
+    descr_str.resize(DATA_DESCR_WIDTH, '.');
+    return descr_str.c_str();

 }
 
 template <typename T>
 const char* opt_helper::val_or_string(const T& val, const char* str,
                                       const T& deflt)
 {
 }
 
 template <typename T>
 const char* opt_helper::val_or_string(const T& val, const char* str,
                                       const T& deflt)
 {

-    std::string& res = val_or_string_str;

     if (val != deflt) {
         std::ostringstream oss;
         oss << val;
     if (val != deflt) {
         std::ostringstream oss;
         oss << val;

-        res = oss.str();
+        val_or_string_str = oss.str();

     } else {
     } else {

-        res = str;
+        val_or_string_str = str;

     }
     }

-    return res.c_str();
+    return val_or_string_str.c_str();

 }
 
 template <typename T>
 }
 
 template <typename T>


@@ -596,7 +598,7 @@ void opt::usage()
 
     std::clog << "\nLogging support:\n"
               << "    See SimGrid documentation on:\n"
 
     std::clog << "\nLogging support:\n"
               << "    See SimGrid documentation on:\n"

-              << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"
+              << "        http://simgrid.gforge.inria.fr/simgrid/latest/doc/outcomes_logs.html#log_user\n"

               << "    Existing categories are:\n"
               << "        simu : root of following categories\n"
               << "        main : messages from global infrastructure\n"
               << "    Existing categories are:\n"
               << "        simu : root of following categories\n"
               << "        main : messages from global infrastructure\n"