Deadlock fix, and other changes.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 8125edbbc596c12a50a21ba1d484340a880da1ce..5c43e6f2962420d2d35e82047227efeb6afe85bd 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,28 +1,60 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include <string>
 #include "cost_func.h"
+#include "deployment.h"
+#include "named_object_list.h"
+#include "process.h"
 
 // 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;
 
+    // Simulation parameters
     extern unsigned log_rate;
 
-    extern unsigned maxiter;
-    extern bool exit_on_close;
+    // 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;
 
+    // Application parameters
     extern cost_func comp_cost;
+    extern cost_func comm_cost;
+    extern unsigned maxiter;
+    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;
 
+    // Utility functions
     int parse_args(int* argc, char* argv[]);
     void print();
     void usage();