Test if the configuration into tag_config is already set by command line.

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

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index f432748..5cdd4c0 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -9,13 +9,13 @@
 #include "xbt/config.h"
 #include "xbt/str.h"
 #include "surf/surf_private.h"
+#include "simix/context.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
                                 "About the configuration of surf (and the rest of the simulation)");
 
 xbt_cfg_t _surf_cfg_set = NULL;
 
-
 /* Parse the command line, looking for options */
 static void surf_config_cmd_line(int *argc, char **argv)
 {
@@ -144,6 +144,11 @@ 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);
@@ -174,7 +179,7 @@ static void _surf_cfg_cb__surf_path(const char *name, int pos)
 
 /* callback to decide if we want to use the model-checking */
 #include "xbt_modinter.h"
-int _surf_do_model_check = 0;   /* this variable is used accros the lib */
+extern int _surf_do_model_check;   /* this variable lives in xbt_main until I find a right location for it */
 
 static void _surf_cfg_cb_model_check(const char *name, int pos)
 {
@@ -184,11 +189,14 @@ 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_context_factory(const char *name, int pos)
+{
+  smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name);
+}
 
 static void _surf_cfg_cb_parallel_contexts(const char *name, int pos)
 {
-  _surf_parallel_contexts = 1;
+  smx_parallel_contexts = 1;
 }
 
 static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
@@ -277,14 +285,21 @@ void surf_config_init(int *argc, char **argv)
                      "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)",
                      xbt_cfgelm_double, NULL, 1, 1,
                      _surf_cfg_cb__tcp_gamma, NULL);
-    xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+    xbt_cfg_setdefault_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);
+    xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
 
     /* 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)",
@@ -325,6 +340,12 @@ 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); */
 
+    /* context factory */
+    default_value = xbt_strdup("ucontext");
+    xbt_cfg_register(&_surf_cfg_set, "simix/context",
+                     "Context factory to use in SIMIX (ucontext, thread or raw)",
+                     xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_context_factory, NULL);
+
     /* parallel contexts */
     default_value_int = 0;
     xbt_cfg_register(&_surf_cfg_set, "parallel-contexts",
@@ -334,17 +355,17 @@ void surf_config_init(int *argc, char **argv)
 
     default_value_int = 0;
     xbt_cfg_register(&_surf_cfg_set, "fullduplex",
-                     "Update the constraint set propagating recursively to others constraints",
+                     "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM03)",
                      xbt_cfgelm_int, &default_value_int, 0, 1,
                      _surf_cfg_cb__surf_network_fullduplex, NULL);
-    xbt_cfg_set_int(_surf_cfg_set, "fullduplex", default_value_int);
+    xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int);
 
 #ifdef HAVE_GTNETS
     xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
                      "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
                      xbt_cfgelm_double, NULL, 1, 1,
                      _surf_cfg_cb__gtnets_jitter, NULL);
-    xbt_cfg_set_double(_surf_cfg_set, "gtnets_jitter", 0.0);
+    xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0);
 
     default_value_int = 10;
     xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed",
@@ -360,7 +381,7 @@ void surf_config_init(int *argc, char **argv)
                   "__surf_get_initial_path() failed! Can't resolves current Windows directory");
 
       surf_path = xbt_dynar_new(sizeof(char *), NULL);
-      xbt_cfg_set_string(_surf_cfg_set, "path", initial_path);
+      xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path);
     }