From 8bdfda4ed37966fcac00b37ddca740afaba48b28 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 18 Jan 2011 11:00:39 +0100
Subject: [PATCH 1/1] Add option "-t" for fixing a time limit on the
simulation.
---
options.cpp | 10 +++++++++-
options.h | 1 +
process.cpp | 4 ++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/options.cpp b/options.cpp
index 1a3db2c..dc29495 100644
--- 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;
+ double time_limit = 0;
bool exit_on_close = false;
// Named parameters lists
@@ -177,7 +178,7 @@ bool opt::parse_args(int* argc, char* argv[])
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;
@@ -221,6 +222,9 @@ bool opt::parse_args(int* argc, char* argv[])
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",
@@ -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"));
+ DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));
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("-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)
diff --git a/options.h b/options.h
index de642a9..20a1683 100644
--- 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;
+ extern double time_limit;
extern bool exit_on_close;
// Named parameters lists
diff --git a/process.cpp b/process.cpp
index 34590f3..99bd039 100644
--- a/process.cpp
+++ b/process.cpp
@@ -110,6 +110,10 @@ int process::run()
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
--
2.39.5