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
add the Storage::read_async and Storage::write_async methods
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
52cc45d
..
34efc84
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-5,9
+5,10
@@
#include "src/kernel/EngineImpl.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/StorageImpl.hpp"
+#include "src/surf/network_interface.hpp"
#include <algorithm>
#include <algorithm>
@@
-26,7
+27,7
@@
EngineImpl::~EngineImpl()
*/
std::vector<std::string> names;
for (auto const& kv : hosts_)
*/
std::vector<std::string> names;
for (auto const& kv : hosts_)
- names.push_back(kv.second->get
N
ame());
+ names.push_back(kv.second->get
_n
ame());
std::sort(names.begin(), names.end());
std::sort(names.begin(), names.end());
@@
-34,13
+35,17
@@
EngineImpl::~EngineImpl()
hosts_.at(name)->destroy();
/* Also delete the other data */
hosts_.at(name)->destroy();
/* Also delete the other data */
- delete net
R
oot_;
+ delete net
zone_r
oot_;
for (auto const& kv : netpoints_)
delete kv.second;
for (auto const& kv : storages_)
if (kv.second)
for (auto const& kv : netpoints_)
delete kv.second;
for (auto const& kv : storages_)
if (kv.second)
- delete kv.second->getImpl();
+ kv.second->get_impl()->destroy();
+
+ for (auto const& kv : links_)
+ if (kv.second)
+ kv.second->get_impl()->destroy();
}
}
}
}
}
}