Cosmetics: move around some code.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 43286f3606a84f45570c0019be7acb9a0e5c706e..fcb982a5a1e1da3f37c43652015eeb857db9c6dd 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,27 +1,71 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
 

+#include <string>

 #include "cost_func.h"
 #include "cost_func.h"

+#include "named_object_list.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 {
 

-    extern const char* program_name;
-
-    extern const char* platform_file;
-    extern const char* application_file;
+    // Constants
+    extern const double load_ratio_threshold;

 
 

+    // Global options
+    extern std::string program_name;

     extern int help_requested;
     extern bool version_requested;
 
     extern int help_requested;
     extern bool version_requested;
 

-    extern unsigned maxiter;
-    extern bool exit_on_close;
+    // Simulation parameters
+    extern int log_rate;
+
+    // Platform and deployment
+    extern std::string platform_file;
+    extern std::string deployment_file;
+
+    // Automatic deployment
+    namespace auto_depl {
+        extern bool        enabled;
+        extern std::string topology;
+        extern unsigned    nhosts;
+        extern double      load;
+    }

 
 

+    // Load balancing algorithm
+    extern std::string loba_algo;

     extern bool bookkeeping;
     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 comp_cost;

+    extern cost_func comm_cost;
+    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
+    extern struct loba_algorithms_type:
+        public named_object_list2<process, int, char** > {
+            loba_algorithms_type();
+    } loba_algorithms;
+
+    extern struct topologies_type:
+        public named_object_list<deployment_generator> {
+            topologies_type();
+    } topologies;

 
 

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

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