X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbb0053e46341918b4d5ba5ec69ddbd54c01f5de..7b6fecb801d2d513ebbd7bea94c52322e2cc1df2:/src/s4u/s4u_Engine.cpp

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index 8b05e049c5..ad5327c077 100644
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -18,6 +18,7 @@
 #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/surf/StorageImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
 #include <simgrid/Exception.hpp>
@@ -83,11 +84,7 @@ double Engine::get_clock()
 void Engine::load_platform(const std::string& platf)
 {
   double start = xbt_os_time();
-  try {
-    parse_platform_file(platf);
-  } catch (const Exception& e) {
-    xbt_die("Error while loading %s: %s", platf.c_str(), e.what());
-  }
+  parse_platform_file(platf);
 
   double end = xbt_os_time();
   XBT_DEBUG("PARSE TIME: %g", (end - start));
@@ -96,12 +93,13 @@ void Engine::load_platform(const std::string& platf)
 /** Registers the main function of an actor that will be launched from the deployment file */
 void Engine::register_function(const std::string& name, int (*code)(int, char**))
 {
-  SIMIX_function_register(name, code);
+  pimpl->register_function(name, code);
 }
+
 /** Registers the main function of an actor that will be launched from the deployment file */
 void Engine::register_function(const std::string& name, void (*code)(std::vector<std::string>))
 {
-  SIMIX_function_register(name, code);
+  pimpl->register_function(name, code);
 }
 /** Registers a function as the default main function of actors
  *
@@ -110,8 +108,9 @@ void Engine::register_function(const std::string& name, void (*code)(std::vector
  */
 void Engine::register_default(int (*code)(int, char**))
 {
-  SIMIX_function_register_default(code);
+  pimpl->register_default(code);
 }
+
 /** Load a deployment file and launch the actors that it contains
  *
  * \rst
@@ -120,8 +119,9 @@ void Engine::register_default(int (*code)(int, char**))
  */
 void Engine::load_deployment(const std::string& deploy)
 {
-  SIMIX_launch_application(deploy);
+  pimpl->load_deployment(deploy);
 }
+
 /** Returns the amount of hosts in the platform */
 size_t Engine::get_host_count()
 {
@@ -184,19 +184,19 @@ Link* Engine::link_by_name(const std::string& name)
   if (pimpl->links_.find(name) == pimpl->links_.end())
     throw std::invalid_argument(std::string("Link not found: ") + name);
 
-  return pimpl->links_.at(name);
+  return pimpl->links_.at(name)->get_iface();
 }
 
 /** @brief Find an link from its name (or nullptr if that link does not exist) */
 Link* Engine::link_by_name_or_null(const std::string& name)
 {
   auto link = pimpl->links_.find(name);
-  return link == pimpl->links_.end() ? nullptr : link->second;
+  return link == pimpl->links_.end() ? nullptr : link->second->get_iface();
 }
 
 void Engine::link_register(const std::string& name, Link* link)
 {
-  pimpl->links_[name] = link;
+  pimpl->links_[name] = link->get_impl();
 }
 
 void Engine::link_unregister(const std::string& name)
@@ -215,7 +215,7 @@ std::vector<Storage*> Engine::get_all_storages()
 {
   std::vector<Storage*> res;
   for (auto const& kv : pimpl->storages_)
-    res.push_back(kv.second);
+    res.push_back(kv.second->get_iface());
   return res;
 }
 
@@ -228,19 +228,19 @@ Storage* Engine::storage_by_name(const std::string& name)
   if (pimpl->storages_.find(name) == pimpl->storages_.end())
     throw std::invalid_argument(std::string("Storage not found: ") + name);
 
-  return pimpl->storages_.at(name);
+  return pimpl->storages_.at(name)->get_iface();
 }
 
 /** @brief Find a storage from its name (or nullptr if that storage does not exist) */
 Storage* Engine::storage_by_name_or_null(const std::string& name)
 {
   auto storage = pimpl->storages_.find(name);
-  return storage == pimpl->storages_.end() ? nullptr : storage->second;
+  return storage == pimpl->storages_.end() ? nullptr : storage->second->get_iface();
 }
 
 void Engine::storage_register(const std::string& name, Storage* storage)
 {
-  pimpl->storages_[name] = storage;
+  pimpl->storages_[name] = storage->get_impl();
 }
 
 void Engine::storage_unregister(const std::string& name)
@@ -259,16 +259,18 @@ std::vector<Link*> Engine::get_all_links()
 {
   std::vector<Link*> res;
   for (auto const& kv : pimpl->links_)
-    res.push_back(kv.second);
+    res.push_back(kv.second->get_iface());
   return res;
 }
 
 std::vector<Link*> Engine::get_filtered_links(const std::function<bool(Link*)>& filter)
 {
   std::vector<Link*> filtered_list;
-  for (auto const& kv : pimpl->links_)
-    if (filter(kv.second))
-      filtered_list.push_back(kv.second);
+  for (auto const& kv : pimpl->links_) {
+    Link* l = kv.second->get_iface();
+    if (filter(l))
+      filtered_list.push_back(l);
+  }
   return filtered_list;
 }
 
@@ -281,7 +283,7 @@ std::vector<ActorPtr> Engine::get_all_actors()
 {
   std::vector<ActorPtr> actor_list;
   actor_list.push_back(simgrid::s4u::Actor::self());
-  for (auto& kv : simix_global->process_list) {
+  for (auto const& kv : simix_global->process_list) {
     actor_list.push_back(kv.second->iface());
   }
   return actor_list;
@@ -290,7 +292,7 @@ std::vector<ActorPtr> Engine::get_all_actors()
 std::vector<ActorPtr> Engine::get_filtered_actors(const std::function<bool(ActorPtr)>& filter)
 {
   std::vector<ActorPtr> actor_list;
-  for (auto& kv : simix_global->process_list) {
+  for (auto const& kv : simix_global->process_list) {
     if (filter(kv.second->iface()))
       actor_list.push_back(kv.second->iface());
   }
@@ -415,3 +417,7 @@ double simgrid_get_clock()
 {
   return simgrid::s4u::Engine::get_clock();
 }
+int simgrid_get_actor_count()
+{
+  return simgrid::s4u::Engine::get_instance()->get_actor_count();
+}