Add option "-t" for fixing a time limit on the simulation.

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)

diff --git a/options.h b/options.h
index de642a9b7b3a6c14c3cd437d5371ec3139cc0a59..20a1683015f1c18d701303112cdbd42a190cd615 100644 (file)
--- a/options.h
+++ b/options.h
@@ -47,6 +47,7 @@ namespace opt {
     // Parameters for the end of the simulation
     extern unsigned comp_maxiter;
     extern unsigned lb_maxiter;
     // Parameters for the end of the simulation
     extern unsigned comp_maxiter;
     extern unsigned lb_maxiter;

+    extern double time_limit;

     extern bool exit_on_close;
 
     // Named parameters lists
     extern bool exit_on_close;
 
     // Named parameters lists

diff --git a/process.cpp b/process.cpp
index 34590f3f199f33be126f8111f4539b8caaf522bb..99bd0399e308d0281fb7c31074635aab069ec129 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -110,6 +110,10 @@ int process::run()
             break;
         if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter)
             break;
             break;
         if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter)
             break;

+        if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
+            VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
+            break;
+        }

 
         // block on receiving unless there is something to compute or
         // to send
 
         // block on receiving unless there is something to compute or
         // to send