Kill the fact that several model VM models may be provided.

- VM are a plugin: take it, copy it and change it yourself
- helps removing VMs from the trunk (I demand you to enter this plugin!)

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 9ad9cc9..880dfad 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -595,11 +595,6 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_host_model_description[];
  */
 XBT_PUBLIC(void) surf_vm_model_init_HL13();
 
-/** \ingroup SURF_models
- *  \brief The list of all available vm model models
- */
-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_vm_model_description[];
-
 /** \ingroup SURF_simulation
  *  \brief List of hosts for which one want to be notified if they ever restart.
  */

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index f21667e..1365f02 100644 (file)
--- 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)
 {
@@ -408,9 +393,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)");

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 9b41ea4..15d2df7 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -664,7 +664,6 @@ void sg_platf_end() {
 static void surf_config_models_setup()
 {
   const char* host_model_name    = xbt_cfg_get_string("host/model");
-  const char* vm_model_name      = xbt_cfg_get_string("vm/model");
   const char* network_model_name = xbt_cfg_get_string("network/model");
   const char* cpu_model_name     = xbt_cfg_get_string("cpu/model");
   const char* storage_model_name = xbt_cfg_get_string("storage/model");
@@ -693,8 +692,7 @@ static void surf_config_models_setup()
   surf_host_model_description[host_id].model_init_preparse();
 
   XBT_DEBUG("Call vm_model_init");
-  int vm_id = find_model_description(surf_vm_model_description, vm_model_name);
-  surf_vm_model_description[vm_id].model_init_preparse();
+  surf_vm_model_init_HL13();
 
   XBT_DEBUG("Call storage_model_init");
   int storage_id = find_model_description(surf_storage_model_description, storage_model_name);

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 3062d0c..b0ac64c 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -99,11 +99,6 @@ s_surf_model_description_t surf_host_model_description[] = {
   {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
-s_surf_model_description_t surf_vm_model_description[] = {
-  {"default", "Default vm model.", &surf_vm_model_init_HL13},
-  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
-};
-
 s_surf_model_description_t surf_optimization_mode_description[] = {
   {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr},
   {"TI",   "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr},