make_params: PREFIX can be set from 2nd parameter on command line.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 4e352c604f30fb914429c985dc35d21689df0378..f9baa880f2185051c08d4b7f1626d43eaa34cf22 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,21 +1,31 @@
 #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 "named_object_list.h"
 #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 {
 
 
 // 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;
     // Global options
     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;


@@ -27,16 +37,33 @@ 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 unsigned exit_on_convergence;

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


@@ -45,15 +72,13 @@ namespace opt {
             loba_algorithms_type();
     } loba_algorithms;
 
             loba_algorithms_type();
     } loba_algorithms;
 

-#if 0

     extern struct topologies_type:
     extern struct topologies_type:

-        public named_object_list<xxx> {
+        public named_object_list<deployment_generator> {

             topologies_type();
     } topologies;
             topologies_type();
     } topologies;

-#endif

 
     // Utility functions
 
     // Utility functions

-    int parse_args(int* argc, char* argv[]);
+    bool parse_args(int* argc, char* argv[]);

     void print();
     void usage();
 
     void print();
     void usage();