X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db5adf7439201fb67d1d697b86806d58ace9fe85..d7c957a488bb2ebd0ef5ea7a3323f1ccea620f30:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 9170f1d11d..41806829f3 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -33,9 +33,6 @@ std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destro
 
 simgrid::kernel::profile::FutureEvtSet future_evt_set;
 std::vector<std::string> surf_path;
-/**  set of hosts for which one want to be notified if they ever restart. */
-std::set<std::string> watched_hosts;
-extern std::map<std::string, simgrid::kernel::resource::StorageType*> storage_types;
 
 std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
 
@@ -76,16 +73,19 @@ const std::vector<surf_model_description_t> surf_network_model_description = {
      &surf_network_model_init_NS3},
 };
 
-#if ! HAVE_SMPI
-void surf_network_model_init_SMPI() {
+#if !HAVE_SMPI
+void surf_network_model_init_SMPI()
+{
   xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
 }
-void surf_network_model_init_IB() {
+void surf_network_model_init_IB()
+{
   xbt_die("Please activate SMPI support in cmake to use the IB network model.");
 }
 #endif
 #if !SIMGRID_HAVE_NS3
-void surf_network_model_init_NS3() {
+void surf_network_model_init_NS3()
+{
   xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model.");
 }
 #endif
@@ -105,8 +105,9 @@ const std::vector<surf_model_description_t> surf_host_model_description = {
 
 const std::vector<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).",
+    {"TI",
+     "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU "
+     "model for now).",
      nullptr},
     {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
 };
@@ -115,10 +116,6 @@ const std::vector<surf_model_description_t> surf_disk_model_description = {
     {"default", "Simplistic disk model.", &surf_disk_model_init_default},
 };
 
-const std::vector<surf_model_description_t> surf_storage_model_description = {
-    {"default", "Simplistic storage model.", &surf_storage_model_init_default},
-};
-
 double NOW = 0;
 
 double surf_get_clock()
@@ -168,7 +165,7 @@ std::ifstream* surf_ifsopen(const std::string& name)
 
 FILE* surf_fopen(const std::string& name, const char* mode)
 {
-  FILE *file = nullptr;
+  FILE* file = nullptr;
 
   if (is_absolute_file_path(name)) /* don't mess with absolute file names */
     return fopen(name.c_str(), mode);
@@ -213,8 +210,7 @@ int find_model_description(const std::vector<surf_model_description_t>& table, c
   return -1;
 }
 
-
-void surf_init(int *argc, char **argv)
+void surf_init(int* argc, char** argv)
 {
   if (xbt_initialized > 0)
     return;
@@ -227,12 +223,6 @@ void surf_init(int *argc, char **argv)
 void surf_exit()
 {
   simgrid::s4u::Engine::shutdown();
-  for (auto const& e : storage_types) {
-    const simgrid::kernel::resource::StorageType* stype = e.second;
-    delete stype->properties;
-    delete stype->model_properties;
-    delete stype;
-  }
 
   for (auto const& model : all_existing_models)
     delete model;
@@ -240,5 +230,5 @@ void surf_exit()
   tmgr_finalize();
   sg_platf_exit();
 
-  NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
+  NOW = 0; /* Just in case the user plans to restart the simulation afterward */
 }