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
Mark actors as auto_restart when recreating them on restart.
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
df3b893
..
34efc84
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-1,12
+1,14
@@
-/* Copyright (c) 2016-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
8
. 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. */
#include "src/kernel/EngineImpl.hpp"
/* 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. */
#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/NetPoint
.hpp"
-#include "src/
kernel/routing/NetZoneImpl
.hpp"
+#include "src/
surf/StorageImpl
.hpp"
+#include "src/
surf/network_interface
.hpp"
#include <algorithm>
#include <algorithm>
@@
-25,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());
@@
-33,9
+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 : netpoints_)
delete kv.second;
+
+ for (auto const& kv : storages_)
+ if (kv.second)
+ kv.second->get_impl()->destroy();
+
+ for (auto const& kv : links_)
+ if (kv.second)
+ kv.second->get_impl()->destroy();
}
}
}
}
}
}