X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index b4245edaa0..2e25a3d198 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -33,8 +33,6 @@ template class Extendable<simgrid::s4u::Host>;
 
 namespace s4u {
 
-std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
-
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
 simgrid::xbt::signal<void(Host&)> Host::onDestruction;
 simgrid::xbt::signal<void(Host&)> Host::onStateChange;
@@ -44,7 +42,7 @@ Host::Host(const char* name)
   : name_(name)
 {
   xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
-  host_list[name_] = this;
+  Engine::getInstance()->addHost(std::string(name_), this);
   new simgrid::surf::HostImpl(this);
 }
 
@@ -72,23 +70,26 @@ void Host::destroy()
   if (not currentlyDestroying_) {
     currentlyDestroying_ = true;
     onDestruction(*this);
-    host_list.erase(name_);
+    Engine::getInstance()->delHost(std::string(name_));
     delete this;
   }
 }
 
 Host* Host::by_name(std::string name)
 {
-  return host_list.at(name); // Will raise a std::out_of_range if the host does not exist
+  return Engine::getInstance()->hostByName(name);
+}
+Host* Host::by_name(const char* name)
+{
+  return Engine::getInstance()->hostByName(std::string(name));
 }
 Host* Host::by_name_or_null(const char* name)
 {
-  return by_name_or_null(std::string(name));
+  return Engine::getInstance()->hostByNameOrNull(std::string(name));
 }
 Host* Host::by_name_or_null(std::string name)
 {
-  auto host = host_list.find(name);
-  return host == host_list.end() ? nullptr : host->second;
+  return Engine::getInstance()->hostByNameOrNull(name);
 }
 
 Host *Host::current(){
@@ -134,10 +135,8 @@ int Host::getPstatesCount() const
  */
 void Host::actorList(std::vector<ActorPtr>* whereto)
 {
-  smx_actor_t actor = NULL;
-  xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list)
-  {
-    whereto->push_back(actor->ciface());
+  for (auto& actor : this->extension<simgrid::simix::Host>()->process_list) {
+    whereto->push_back(actor.ciface());
   }
 }
 
@@ -153,22 +152,22 @@ void Host::actorList(std::vector<ActorPtr>* whereto)
  * walk through the routing components tree and find a route between hosts
  * by calling each "get_route" function in each routing component.
  */
-void Host::routeTo(Host* dest, std::vector<Link*>* links, double* latency)
+void Host::routeTo(Host* dest, std::vector<Link*>& links, double* latency)
 {
   std::vector<surf::LinkImpl*> linkImpls;
-  this->routeTo(dest, &linkImpls, latency);
+  this->routeTo(dest, linkImpls, latency);
   for (surf::LinkImpl* const& l : linkImpls)
-    links->push_back(&l->piface_);
+    links.push_back(&l->piface_);
 }
 
 /** @brief Just like Host::routeTo, but filling an array of link implementations */
-void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* latency)
+void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>& links, double* latency)
 {
   simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netpoint, dest->pimpl_netpoint, links, latency);
   if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
     XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", getCname(), dest->getCname(),
                (latency == nullptr ? -1 : *latency));
-    for (auto const& link : *links)
+    for (auto const& link : links)
       XBT_CDEBUG(surf_route, "Link %s", link->getCname());
   }
 }
@@ -193,9 +192,8 @@ void Host::setProperty(std::string key, std::string value)
 /** Get the processes attached to the host */
 void Host::getProcesses(std::vector<ActorPtr>* list)
 {
-  smx_actor_t actor = NULL;
-  xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list) {
-    list->push_back(actor->iface());
+  for (auto& actor : this->extension<simgrid::simix::Host>()->process_list) {
+    list->push_back(actor.iface());
   }
 }
 
@@ -264,5 +262,10 @@ void Host::execute(double flops)
   simcall_execution_wait(s);
 }
 
+double Host::getLoad()
+{
+  return this->pimpl_cpu->getLoad();
+}
+
 } // namespace simgrid
 } // namespace s4u