A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Storage-kill: clean surf of storage
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
2f74981
..
2ff3eb3
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-34,8
+34,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;
simgrid::kernel::profile::FutureEvtSet future_evt_set;
std::vector<std::string> surf_path;
-extern std::map<std::string, simgrid::kernel::resource::StorageType*, std::less<>> storage_types;
-
std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description()
std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description()
@@
-114,10
+112,6
@@
const std::vector<surf_model_description_t> surf_disk_model_description = {
{"default", "Simplistic disk model.", &surf_disk_model_init_default},
};
{"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()
double NOW = 0;
double surf_get_clock()
@@
-226,12
+220,6
@@
void surf_init(int *argc, char **argv)
void surf_exit()
{
simgrid::s4u::Engine::shutdown();
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;
for (auto const& model : all_existing_models)
delete model;