X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/162af51e54767c8e8f7481caeed9ae7d78f6bde6..da82494b57755f7709200dec34441cad787ddde2:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index fcd5140c72..0635354b61 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2019. 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,11 +10,8 @@
 #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_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
-
-extern int surf_parse_lineno;
+#include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
 namespace simgrid {
 namespace kernel {
@@ -32,51 +29,42 @@ 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();
 
   surf_parse_open(file);
-  try {
-    int parse_status = surf_parse();
-    surf_parse_close();
-    xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
-  } catch (const Exception&) {
-    xbt_die(
-        "Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
-        file.c_str(), surf_parse_lineno);
-    throw;
-  }
+  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)
 {
-  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return simgrid::xbt::wrap_main(code, std::move(args));
-  };
+  registered_functions[name] = code;
 }
-
-void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void EngineImpl::register_default(const actor::ActorCodeFactory& code)
 {
-  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return std::bind(std::move(code), std::move(args));
-  };
+  default_function = code;
 }
 
-void EngineImpl::register_default(xbt_main_func_t code)
+void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::vector<resource::Model*>& dependencies)
 {
-  simix_global->default_function = [code](std::vector<std::string> args) {
-    return simgrid::xbt::wrap_main(code, std::move(args));
-  };
+  auto model_name = model->get_name();
+  xbt_assert(models_prio_.find(model_name) == models_prio_.end(),
+             "Model %s already exists, use model.set_name() to change its name", model_name.c_str());
+
+  for (const auto dep : dependencies) {
+    xbt_assert(models_prio_.find(dep->get_name()) != models_prio_.end(),
+               "Model %s doesn't exists. Impossible to use it as dependency.", dep->get_name().c_str());
+  }
+  models_.push_back(model.get());
+  models_prio_[model_name] = std::move(model);
 }
 
 } // namespace kernel