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
Workaround build error with older versions of Eigen3.
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index 9a0f4ab2ff8e696624752292ec50e0271fc17d0a..3d4b00e20be68d53d5d0b04e99f6f06959a1605d 100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-41,7
+41,7
@@
config::Flag<double> cfg_breakpoint{"debug/breakpoint",
"When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true};
"When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true};
-constexpr std::initializer_list<std::pair<const char*, context::ContextFactory
Initializer
>> context_factories = {
+constexpr std::initializer_list<std::pair<const char*, context::ContextFactory
* (*)()
>> context_factories = {
#if HAVE_RAW_CONTEXTS
{"raw", &context::raw_factory},
#endif
#if HAVE_RAW_CONTEXTS
{"raw", &context::raw_factory},
#endif
@@
-165,20
+165,11
@@
namespace kernel {
EngineImpl::~EngineImpl()
{
EngineImpl::~EngineImpl()
{
- /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
- * reproducible.
- */
- while (not hosts_.empty())
- hosts_.begin()->second->destroy();
-
/* Also delete the other data */
delete netzone_root_;
for (auto const& kv : netpoints_)
delete kv.second;
/* Also delete the other data */
delete netzone_root_;
for (auto const& kv : netpoints_)
delete kv.second;
- while (not links_.empty())
- links_.begin()->second->destroy();
-
for (auto const& kv : mailboxes_)
delete kv.second;
for (auto const& kv : mailboxes_)
delete kv.second;
@@
-255,8
+246,8
@@
void EngineImpl::context_mod_init() const
#endif
/* select the context factory to use to create the contexts */
#endif
/* select the context factory to use to create the contexts */
- if (context::
factory_initializer != nullpt
r) { // Give Java a chance to hijack the factory mechanism
- instance_->set_context_factory(context::
factory_
initializer());
+ if (context::
ContextFactory::initialize
r) { // Give Java a chance to hijack the factory mechanism
+ instance_->set_context_factory(context::
ContextFactory::
initializer());
return;
}
/* use the factory specified by --cfg=contexts/factory:value */
return;
}
/* use the factory specified by --cfg=contexts/factory:value */
@@
-332,9
+323,6
@@
void EngineImpl::seal_platform() const
return;
sealed = true;
return;
sealed = true;
- /* sealing resources before run: links */
- for (auto const& kv : links_)
- kv.second->get_iface()->seal();
/* seal netzone root, recursively seal children netzones, hosts and disks */
netzone_root_->seal();
}
/* seal netzone root, recursively seal children netzones, hosts and disks */
netzone_root_->seal();
}
@@
-396,11
+384,6
@@
void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::ve
models_prio_[model_name] = std::move(model);
}
models_prio_[model_name] = std::move(model);
}
-void EngineImpl::add_split_duplex_link(const std::string& name, std::unique_ptr<resource::SplitDuplexLinkImpl> link)
-{
- split_duplex_links_[name] = std::move(link);
-}
-
/** Wake up all actors waiting for a Surf action to finish */
void EngineImpl::handle_ended_actions() const
{
/** Wake up all actors waiting for a Surf action to finish */
void EngineImpl::handle_ended_actions() const
{