X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e7129924068cc550bffddb396bc236f66360735..e4429c11ec4cf4e3e2ac95530fae2ae2e4276312:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 9a0f4ab2ff..3d4b00e20b 100644
--- 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};
 
-constexpr std::initializer_list<std::pair<const char*, context::ContextFactoryInitializer>> context_factories = {
+constexpr std::initializer_list<std::pair<const char*, context::ContextFactory* (*)()>> context_factories = {
 #if HAVE_RAW_CONTEXTS
     {"raw", &context::raw_factory},
 #endif
@@ -165,20 +165,11 @@ namespace kernel {
 
 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;
 
-  while (not links_.empty())
-    links_.begin()->second->destroy();
-
   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 */
-  if (context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism
-    instance_->set_context_factory(context::factory_initializer());
+  if (context::ContextFactory::initializer) { // 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 */
@@ -332,9 +323,6 @@ void EngineImpl::seal_platform() const
     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();
 }
@@ -396,11 +384,6 @@ void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::ve
   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
 {