Do the same for IoImpl as for ExecImpl when timeout on completion

[simgrid.git] / src / kernel / EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 07e5ab61e5457baa49ac7e4a71d769a03ba5fe02..e45b5e027395a0af3f2a808c41842adac26e25e8 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2021. 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. */
@@ -10,7 +10,6 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/StorageImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
@@ -30,16 +29,12 @@ EngineImpl::~EngineImpl()
   for (auto const& kv : netpoints_)
     delete kv.second;
 
-  for (auto const& kv : storages_)
-    if (kv.second)
-      kv.second->destroy();
-
   for (auto const& kv : links_)
     if (kv.second)
       kv.second->destroy();
 }
 
-void EngineImpl::load_deployment(const std::string& file)
+void EngineImpl::load_deployment(const std::string& file) const
 {
   sg_platf_exit();
   sg_platf_init();
@@ -48,25 +43,38 @@ void EngineImpl::load_deployment(const std::string& file)
   surf_parse();
   surf_parse_close();
 }
-void EngineImpl::register_function(const std::string& name, xbt_main_func_t code)
+
+void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)
+{
+  registered_functions[name] = code;
+}
+void EngineImpl::register_default(const actor::ActorCodeFactory& code)
+{
+  default_function = code;
+}
+
+void EngineImpl::add_model_ptask(simgrid::kernel::resource::Model::Type type, simgrid::kernel::resource::Model* model,
+                                 bool is_default)
 {
-  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return xbt::wrap_main(code, std::move(args));
-  };
+  if (is_default)
+    models_by_type_[type].insert(models_by_type_[type].begin(), model);
+  else
+    models_by_type_[type].push_back(model);
 }
 
-void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void EngineImpl::add_model(simgrid::kernel::resource::Model::Type type,
+                           std::unique_ptr<simgrid::kernel::resource::Model> model, bool is_default)
 {
-  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return std::bind(std::move(code), std::move(args));
-  };
+  add_model_ptask(type, model.get(), is_default);
+  models_.push_back(std::move(model));
 }
 
-void EngineImpl::register_default(xbt_main_func_t code)
+simgrid::kernel::resource::Model* EngineImpl::get_default_model(simgrid::kernel::resource::Model::Type type)
 {
-  simix_global->default_function = [code](std::vector<std::string> args) {
-    return xbt::wrap_main(code, std::move(args));
-  };
+  if (models_by_type_[type].size() > 0)
+    return models_by_type_[type][0];
+  else
+    return nullptr;
 }
 
 } // namespace kernel