Use static instead of volatile for variables that may be clobbered by a TRY..CATCH.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 838dfa020233fe2820d3e8189c0c330c3daf6735..264a566f25564831680df3027fc28ff9c5213180 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,11 +1,14 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
 

+#include <csignal>              // std::sig_atomic_t

 #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 {


@@ -17,9 +20,12 @@ namespace opt {
     extern std::string program_name;
     extern int help_requested;
     extern bool version_requested;
     extern std::string program_name;
     extern int help_requested;
     extern bool version_requested;

+    extern int option_x;       // hidden option (int), for testing
+    extern double option_X;    // hidden option (double), for testing

 
     // Simulation parameters
 
     // Simulation parameters

-    extern unsigned log_rate;
+    extern int log_rate;
+    extern volatile std::sig_atomic_t exit_request;

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


@@ -31,16 +37,32 @@ namespace opt {
         extern std::string topology;
         extern unsigned    nhosts;
         extern double      load;
         extern std::string topology;
         extern unsigned    nhosts;
         extern double      load;

+        extern bool        random_distribution;
+        extern unsigned long random_seed;

     }
 
     // Load balancing algorithm
     extern std::string loba_algo;
     extern bool bookkeeping;
     }
 
     // Load balancing algorithm
     extern std::string loba_algo;
     extern bool bookkeeping;

+    extern bool egocentric;
+    extern double min_transfer_amount;
+    extern double max_transfer_amount;
+    extern double min_lb_iter_duration;
+    extern bool integer_transfer;
+    extern unsigned loba_best_divisor;

 
     // 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 maxiter;
+    extern double min_comp_iter_duration;
+    extern unsigned comp_iter_delay;
+    extern double comp_time_delay;
+
+    // Parameters for the end of the simulation
+    extern double avg_load_ratio;
+    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