Added sender-side gaps (only activated by default in the SMPI network model, use...

[simgrid.git] / src / surf / surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 68869a6..e0b90da 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -38,6 +38,10 @@ static void surf_config_cmd_line(int *argc, char **argv)
       xbt_cfg_help(_surf_cfg_set);
       printf
           ("\nYou can also use --help-models to see the details of all models known by this simulator.\n");
+#ifdef HAVE_TRACING
+      printf
+          ("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
+#endif
       exit(0);
     } else
         if (!strncmp
@@ -46,6 +50,13 @@ static void surf_config_cmd_line(int *argc, char **argv)
       model_help("CPU", surf_cpu_model_description);
       model_help("network", surf_network_model_description);
       exit(0);
+#ifdef HAVE_TRACING
+    }else
+        if (!strncmp
+            (argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
+      TRACE_help (1);
+      exit(0);
+#endif
     }
     if (remove_it) {            /*remove this from argv */
       for (j = i + 1; j < *argc; j++) {
@@ -128,6 +139,16 @@ static void _surf_cfg_cb__tcp_gamma(const char *name, int pos)
   sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name);
 }
 
+static void _surf_cfg_cb__maxmin_precision(const char* name, int pos)
+{
+  sg_maxmin_precision = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+
+static void _surf_cfg_cb__sender_gap(const char* name, int pos)
+{
+  sg_sender_gap = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+
 static void _surf_cfg_cb__latency_factor(const char *name, int pos)
 {
   sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name);
@@ -168,6 +189,13 @@ static void _surf_cfg_cb_model_check(const char *name, int pos)
   xbt_dict_preinit();
 }
 
+int _surf_parallel_contexts = 0;
+
+static void _surf_cfg_cb_parallel_contexts(const char *name, int pos)
+{
+  _surf_parallel_contexts = 1;
+}
+
 static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
                                                   int pos)
 {
@@ -256,7 +284,19 @@ void surf_config_init(int *argc, char **argv)
                      _surf_cfg_cb__tcp_gamma, NULL);
     xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
 
+    xbt_cfg_register(&_surf_cfg_set, "maxmin/precision",
+                     "Minimum retained action value when updating simulation",
+                     xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL);
+    xbt_cfg_set_double(_surf_cfg_set, "maxmin/precision", 0.00001);
+
     /* The parameters of network models */
+
+    double_default_value = 0.0;
+    xbt_cfg_register(&_surf_cfg_set, "network/sender_gap",
+                     "Minimum gap between two overlapping sends",
+                     xbt_cfgelm_double, &double_default_value, 1, 1,
+                     _surf_cfg_cb__sender_gap, NULL);
+
     double_default_value = 1.0;
     xbt_cfg_register(&_surf_cfg_set, "network/latency_factor",
                      "Correction factor to apply to the provided latency (default value set by network model)",
@@ -297,6 +337,13 @@ void surf_config_init(int *argc, char **argv)
        _surf_cfg_cb_model_check which sets it's value to 1 (instead of the defalut value 0)
        xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
 
+    /* parallel contexts */
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "parallel-contexts",
+                     "Activate the parallel execution of user contexts (EXPERIMENTAL -- pthreads only)",
+                     xbt_cfgelm_int, &default_value_int, 0, 1,
+                     _surf_cfg_cb_parallel_contexts, NULL);
+
     default_value_int = 0;
     xbt_cfg_register(&_surf_cfg_set, "fullduplex",
                      "Update the constraint set propagating recursively to others constraints",
@@ -350,7 +397,6 @@ void surf_config_models_setup(const char *platform_file)
   int workstation_id = -1;
   char *network_model_name = NULL;
   char *cpu_model_name = NULL;
-  surf_timer_model_init(platform_file);
 
   workstation_model_name =
       xbt_cfg_get_string(_surf_cfg_set, "workstation/model");