Define process::lb_load(), and use it.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 1a3db2c2995d0e0c268d4b1fd70c6efca02e24c2..dc29495c236ee34f7ec47924fd966e5cc6c08fe5 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -56,6 +56,7 @@ namespace opt {
     // fixme: find better defaults
     unsigned comp_maxiter = 10;
     unsigned lb_maxiter = comp_maxiter;
     // fixme: find better defaults
     unsigned comp_maxiter = 10;
     unsigned lb_maxiter = comp_maxiter;

+    double time_limit = 0;

     bool exit_on_close = false;
 
     // Named parameters lists
     bool exit_on_close = false;
 
     // Named parameters lists


@@ -177,7 +178,7 @@ bool opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
     
     int c;
     opterr = 0;

-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t:T:vV")) != -1) {

         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;


@@ -221,6 +222,9 @@ bool opt::parse_args(int* argc, char* argv[])
         case 's':
             std::istringstream(optarg) >> opt::min_iter_duration;
             break;
         case 's':
             std::istringstream(optarg) >> opt::min_iter_duration;
             break;

+        case 't':
+            std::istringstream(optarg) >> opt::time_limit;
+            break;

         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",


@@ -292,6 +296,7 @@ void opt::print()
           h.val_or_string(comp_maxiter, "infinity"));
     DESCR("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));
           h.val_or_string(comp_maxiter, "infinity"));
     DESCR("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));

+    DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));

     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     INFO0("`----");
 
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     INFO0("`----");
 


@@ -371,6 +376,9 @@ void opt::usage()
     std::clog << o("-I value")
               << "maximum number of lb. iterations, 0 for infinity"
               << " (" << opt::lb_maxiter << ")\n";
     std::clog << o("-I value")
               << "maximum number of lb. iterations, 0 for infinity"
               << " (" << opt::lb_maxiter << ")\n";

+    std::clog << o("-t value")
+              << "time limit (simulated time), 0 for infinity"
+              << " (" << opt::time_limit << ")\n";

     std::clog << o("-e") << "exit on reception of \"close\" message\n";
 
     if (opt::help_requested < 3)
     std::clog << o("-e") << "exit on reception of \"close\" message\n";
 
     if (opt::help_requested < 3)