Use git diff instead of diff-index for setlocalversion.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 1275bcf20b0b9b0acdcc81c84c4e3b3af4b46b9f..006c83a9ffe966959e221ba6a81c54e580019353 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);
     }


@@ -167,6 +170,7 @@ const char* opt_helper::on_off(bool b)
 const char* opt_helper::descr(const char* str)
 {
     descr_str = str;
 const char* opt_helper::descr(const char* str)
 {
     descr_str = str;

+    descr_str.push_back(' ');

     descr_str.resize(DATA_DESCR_WIDTH, '.');
     return descr_str.c_str();
 }
     descr_str.resize(DATA_DESCR_WIDTH, '.');
     return descr_str.c_str();
 }


@@ -391,7 +395,7 @@ bool opt::parse_args(int* argc, char* argv[])
     }
 
     if (!opt::auto_depl::random_seed)
     }
 
     if (!opt::auto_depl::random_seed)

-        opt::auto_depl::random_seed = time(NULL);
+        opt::auto_depl::random_seed = time(nullptr);

 
     return result;
 }
 
     return result;
 }


@@ -594,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"