It is useless to mention "tr1", now that compilation is done with -std=c++0x.

[loba.git] / options.h

diff --git a/options.h b/options.h
index fbc4851a50427caa2fb609b21ee038b3de207c64..0c69e116f75528bde066e4bbe3455ac92e0224de 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,6 +1,7 @@
 #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"


@@ -19,9 +20,11 @@ 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, for debugging purpose

 
     // 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;


@@ -33,17 +36,23 @@ 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 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;
 
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;

-    extern double min_lb_iter_duration;

     extern double min_comp_iter_duration;
     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;
 
     // Parameters for the end of the simulation
     extern unsigned lb_maxiter;