Now that THROWF is in SG/svn, remove compatibility hack.

[loba.git] / options.h

diff --git a/options.h b/options.h
index e751535bd8f0b3a3a1e9cb2ede251e57a8818103..604d1781ebf1deb00ca901de2ae2bcef971a821f 100644 (file)
--- a/options.h
+++ b/options.h
@@ -3,20 +3,27 @@
 
 #include <string>
 #include "cost_func.h"
-#include "deployment.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;
+    extern int option_x;       // hidden option, for debugging purpose
 
     // Simulation parameters
-    extern unsigned log_rate;
+    extern int log_rate;
+    extern bool exit_request;
 
     // Platform and deployment
     extern std::string platform_file;
@@ -28,16 +35,28 @@ namespace opt {
         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;
+    extern double min_transfer_amount;
+    extern double max_transfer_amount;
+    extern double min_lb_iter_duration;
 
     // 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 unsigned lb_maxiter;
+    extern unsigned comp_maxiter;
+    extern double time_limit;
     extern bool exit_on_close;
 
     // Named parameters lists
@@ -52,7 +71,7 @@ namespace opt {
     } topologies;
 
     // Utility functions
-    int parse_args(int* argc, char* argv[]);
+    bool parse_args(int* argc, char* argv[]);
     void print();
     void usage();