X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d70f95ee9e74e70bbf4932bef39ae76fb592fbd..19e1048a7009c4144b0f361ad85fb9dff44761ea:/src/s4u/s4u_Engine.cpp

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index 054c00e138..47b512e668 100644
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -16,7 +16,7 @@
 #include "simgrid/simix.h"
 #include "src/instr/instr_private.hpp"
 #include "src/kernel/EngineImpl.hpp"
-#include "src/simix/smx_private.hpp" // For access to simix_global->process_list
+#include "src/mc/mc_replay.hpp"
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
 #include <simgrid/Exception.hpp>
@@ -37,13 +37,24 @@ xbt::signal<void(void)> Engine::on_deadlock;
 
 Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
 
-Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
+void Engine::initialize(int* argc, char** argv)
 {
   xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
+  Engine::instance_ = this;
   instr::init();
   SIMIX_global_init(argc, argv);
+}
 
-  Engine::instance_ = this;
+Engine::Engine(std::string name) : pimpl(new kernel::EngineImpl())
+{
+  int argc   = 1;
+  char* argv = &name[0];
+  initialize(&argc, &argv);
+}
+
+Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
+{
+  initialize(argc, argv);
 }
 
 Engine::~Engine()
@@ -70,22 +81,20 @@ void Engine::shutdown()
 
 double Engine::get_clock()
 {
-  return SIMIX_get_clock();
-}
-
-void Engine::add_model(simgrid::kernel::resource::Model::Type type,
-                       std::shared_ptr<simgrid::kernel::resource::Model> model)
-{
-  simgrid::kernel::actor::simcall([this, type, &model] { pimpl->add_model(type, std::move(model)); });
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    return MC_process_clock_get(SIMIX_process_self());
+  } else {
+    return surf_get_clock();
+  }
 }
 
-/** @brief Get list of models created for a resource type */
-const std::vector<simgrid::kernel::resource::Model*>& Engine::get_model_list(simgrid::kernel::resource::Model::Type type)
+void Engine::add_model(std::shared_ptr<kernel::resource::Model> model,
+                       const std::vector<kernel::resource::Model*>& dependencies)
 {
-  return pimpl->get_model_list(type);
+  simgrid::kernel::actor::simcall([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); });
 }
 
-const std::vector<std::shared_ptr<simgrid::kernel::resource::Model>>& Engine::get_all_models() const
+const std::vector<simgrid::kernel::resource::Model*>& Engine::get_all_models() const
 {
   return pimpl->get_all_models();
 }
@@ -99,11 +108,7 @@ const std::vector<std::shared_ptr<simgrid::kernel::resource::Model>>& Engine::ge
  */
 void Engine::load_platform(const std::string& platf) const
 {
-  double start = xbt_os_time();
-  parse_platform_file(platf);
-
-  double end = xbt_os_time();
-  XBT_DEBUG("PARSE TIME: %g", (end - start));
+  pimpl->load_platform(platf);
 }
 
 void Engine::register_function(const std::string& name, int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329
@@ -231,6 +236,14 @@ Link* Engine::link_by_name(const std::string& name) const
   return link->second->get_iface();
 }
 
+SplitDuplexLink* Engine::split_duplex_link_by_name(const std::string& name) const
+{
+  auto link = pimpl->split_duplex_links_.find(name);
+  if (link == pimpl->split_duplex_links_.end())
+    throw std::invalid_argument(std::string("Link not found: ") + name);
+  return link->second->get_iface();
+}
+
 /** @brief Find a link from its name (or nullptr if that link does not exist) */
 Link* Engine::link_by_name_or_null(const std::string& name) const
 {
@@ -238,6 +251,21 @@ Link* Engine::link_by_name_or_null(const std::string& name) const
   return link == pimpl->links_.end() ? nullptr : link->second->get_iface();
 }
 
+/** @brief Find a mailox from its name or create one if it does not exist) */
+Mailbox* Engine::mailbox_by_name_or_create(const std::string& name) const
+{
+  /* two actors may have pushed the same mbox_create simcall at the same time */
+  kernel::activity::MailboxImpl* mbox = kernel::actor::simcall([&name, this] {
+    auto m = pimpl->mailboxes_.emplace(name, nullptr);
+    if (m.second) {
+      m.first->second = new kernel::activity::MailboxImpl(name);
+      XBT_DEBUG("Creating a mailbox at %p with name %s", m.first->second, name.c_str());
+    }
+    return m.first->second;
+  });
+  return mbox->get_iface();
+}
+
 void Engine::link_register(const std::string& name, const Link* link)
 {
   pimpl->links_[name] = link->get_impl();
@@ -276,13 +304,13 @@ std::vector<Link*> Engine::get_filtered_links(const std::function<bool(Link*)>&
 
 size_t Engine::get_actor_count() const
 {
-  return simix_global->process_list.size();
+  return pimpl->get_actor_count();
 }
 
 std::vector<ActorPtr> Engine::get_all_actors() const
 {
   std::vector<ActorPtr> actor_list;
-  for (auto const& kv : simix_global->process_list) {
+  for (auto const& kv : pimpl->get_actor_list()) {
     actor_list.push_back(kv.second->get_iface());
   }
   return actor_list;
@@ -291,7 +319,7 @@ std::vector<ActorPtr> Engine::get_all_actors() const
 std::vector<ActorPtr> Engine::get_filtered_actors(const std::function<bool(ActorPtr)>& filter) const
 {
   std::vector<ActorPtr> actor_list;
-  for (auto const& kv : simix_global->process_list) {
+  for (auto const& kv : pimpl->get_actor_list()) {
     if (filter(kv.second->get_iface()))
       actor_list.push_back(kv.second->get_iface());
   }
@@ -300,6 +328,12 @@ std::vector<ActorPtr> Engine::get_filtered_actors(const std::function<bool(Actor
 
 void Engine::run() const
 {
+  /* sealing resources before run: links */
+  for (auto* link : get_all_links())
+    link->seal();
+  /* seal netzone root, recursively seal children netzones, hosts and disks */
+  get_netzone_root()->seal();
+
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
@@ -307,14 +341,16 @@ void Engine::run() const
   if (MC_is_active()) {
     MC_run();
   } else {
-    SIMIX_run();
+    pimpl->run();
   }
 }
 
 /** @brief Retrieve the root netzone, containing all others */
 s4u::NetZone* Engine::get_netzone_root() const
 {
-  return pimpl->netzone_root_->get_iface();
+  if (pimpl->netzone_root_)
+    return pimpl->netzone_root_->get_iface();
+  return nullptr;
 }
 /** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */
 void Engine::set_netzone_root(const s4u::NetZone* netzone)
@@ -350,6 +386,15 @@ kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& n
   return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
 }
 
+kernel::routing::NetPoint* Engine::netpoint_by_name(const std::string& name) const
+{
+  auto netp = netpoint_by_name_or_null(name);
+  if (netp == nullptr) {
+    throw std::invalid_argument(std::string("Netpoint not found: %s") + name);
+  }
+  return netp;
+}
+
 std::vector<kernel::routing::NetPoint*> Engine::get_all_netpoints() const
 {
   std::vector<kernel::routing::NetPoint*> res;