X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b29f2bc452ad2be0c7285e98f3bf7026d0ce6d..648a27ac5171a4e9fa142617ff7104aae77be888:/src/simgrid/sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index f21667ec54..621ca12c0c 100644
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -143,21 +143,6 @@ static void _sg_cfg_cb__host_model(const char *name)
   find_model_description(surf_host_model_description, val);
 }
 
-/* callback of the vm/model variable */
-static void _sg_cfg_cb__vm_model(const char *name)
-{
-  xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization");
-
-  char *val = xbt_cfg_get_string(name);
-  if (!strcmp(val, "help")) {
-    model_help("vm", surf_vm_model_description);
-    sg_cfg_exit_early();
-  }
-
-  /* Make sure that the model exists */
-  find_model_description(surf_vm_model_description, val);
-}
-
 /* callback of the cpu/model variable */
 static void _sg_cfg_cb__cpu_model(const char *name)
 {
@@ -342,19 +327,6 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name)
   }
 }
 
-static void _sg_cfg_cb__surf_network_coordinates(const char *name)
-{
-  static int already_set = 0;
-  int val = xbt_cfg_get_boolean(name);
-  if (val) {
-    if (!already_set)
-      COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
-    already_set = 1;
-  } else
-    if (already_set)
-      xbt_die("Setting of whether to use coordinate cannot be disabled once set.");
-}
-
 static void _sg_cfg_cb__surf_network_crosstraffic(const char *name)
 {
   sg_network_crosstraffic = xbt_cfg_get_boolean(name);
@@ -408,9 +380,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);
 
-    describe_model(description,descsize, surf_vm_model_description, "model", "The model to use for the vm");
-    xbt_cfg_register_string("vm/model", "default", &_sg_cfg_cb__vm_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)");
@@ -542,9 +511,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/coordinates", "no", _sg_cfg_cb__surf_network_coordinates,
-        "Whether we use a coordinate-based routing (as Vivaldi)");
-
     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)");