Change format for log messages.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 4e352c604f30fb914429c985dc35d21689df0378..fcb982a5a1e1da3f37c43652015eeb857db9c6dd 100644 (file)
--- a/options.h
+++ b/options.h
@@ -4,18 +4,24 @@
 #include <string>
 #include "cost_func.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 {
 
+    // Constants
+    extern const double load_ratio_threshold;
+
     // Global options
     extern std::string program_name;
     extern int help_requested;
     extern bool version_requested;
 
     // Simulation parameters
-    extern unsigned log_rate;
+    extern int log_rate;
 
     // Platform and deployment
     extern std::string platform_file;
@@ -32,11 +38,19 @@ namespace opt {
     // Load balancing algorithm
     extern std::string loba_algo;
     extern bool bookkeeping;
+    extern double min_lb_iter_duration;
+    extern unsigned comp_iter_delay;
+    extern double comp_time_delay;
 
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
-    extern unsigned maxiter;
+    extern double min_comp_iter_duration;
+
+    // Parameters for the end of the simulation
+    extern unsigned lb_maxiter;
+    extern unsigned comp_maxiter;
+    extern double time_limit;
     extern bool exit_on_close;
 
     // Named parameters lists
@@ -45,15 +59,13 @@ namespace opt {
             loba_algorithms_type();
     } loba_algorithms;
 
-#if 0
     extern struct topologies_type:
-        public named_object_list<xxx> {
+        public named_object_list<deployment_generator> {
             topologies_type();
     } topologies;
-#endif
 
     // Utility functions
-    int parse_args(int* argc, char* argv[]);
+    bool parse_args(int* argc, char* argv[]);
     void print();
     void usage();