Keep track of load scheduled to be sent, and update total_load_running.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 37a4d8c71159873f99b7c691cc8a5359ed768da4..ed5b49865376017823d012a9803403d9d4c6e7ae 100644 (file)
--- a/options.h
+++ b/options.h
@@ -3,9 +3,11 @@
 
 #include <string>
 #include "cost_func.h"
 
 #include <string>
 #include "cost_func.h"

-#include "deployment.h"

 #include "named_object_list.h"
 #include "named_object_list.h"

-#include "process.h"
+
+// These classes may use include options.h, so make forward declarations
+class deployment_generator;
+class process;

 
 // Global parameters, shared by all the processes
 namespace opt {
 
 // Global parameters, shared by all the processes
 namespace opt {


@@ -19,7 +21,7 @@ namespace opt {
     extern bool version_requested;
 
     // Simulation parameters
     extern bool version_requested;
 
     // Simulation parameters

-    extern unsigned log_rate;
+    extern int log_rate;

 
     // Platform and deployment
     extern std::string platform_file;
 
     // Platform and deployment
     extern std::string platform_file;


@@ -40,8 +42,13 @@ namespace opt {
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;

-    extern unsigned comp_maxiter;
+    extern double min_lb_iter_duration;
+    extern double min_comp_iter_duration;
+
+    // Parameters for the end of the simulation

     extern unsigned lb_maxiter;
     extern unsigned lb_maxiter;

+    extern unsigned comp_maxiter;
+    extern double time_limit;

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