make option 'network/crosstraffic' clean and nice

[simgrid.git] / src / simgrid / sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 6c6dfec..a79dfb5 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -260,11 +260,6 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name)
   }
 }
 
-static void _sg_cfg_cb__surf_network_crosstraffic(const char *name)
-{
-  sg_network_crosstraffic = xbt_cfg_get_boolean(name);
-}
-
 /* build description line with possible values */
 static void describe_model(char *result,int resultsize,
                            const s_surf_model_description_t model_description[],
@@ -301,10 +296,6 @@ void sg_config_init(int *argc, char **argv)
   describe_model(description, descsize, surf_cpu_model_description, "model", "The model to use for the CPU");
   xbt_cfg_register_string("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, description);
 
-  describe_model(description, descsize, surf_optimization_mode_description, "optimization mode",
-                 "The optimization modes to use for the CPU");
-  xbt_cfg_register_string("cpu/optim", "Lazy", &_sg_cfg_cb__optimization_mode, description);
-
   describe_model(description, descsize, surf_storage_model_description, "model", "The model to use for the storage");
   xbt_cfg_register_string("storage/model", "default", &_sg_cfg_cb__storage_mode, description);
 
@@ -318,11 +309,6 @@ void sg_config_init(int *argc, char **argv)
   describe_model(description, descsize, surf_host_model_description, "model", "The model to use for the host");
   xbt_cfg_register_string("host/model", "default", &_sg_cfg_cb__host_model, description);
 
-  sg_tcp_gamma = 4194304.0;
-  simgrid::config::bindFlag(sg_tcp_gamma, {"network/TCP-gamma", "network/TCP_gamma"},
-                            "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)");
-
   simgrid::config::bindFlag(sg_surf_precision, "surf/precision",
                             "Numerical precision used when updating simulation times (in seconds)");
 
@@ -444,9 +430,6 @@ void sg_config_init(int *argc, char **argv)
         "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)");
 #endif
 
-    xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic,
-        "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)");
-
     // For smpi/bw-factor and smpi/lat-factor
     // SMPI model can be used without enable_smpi, so keep this out of the ifdef.
     xbt_cfg_register_string("smpi/bw-factor",