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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 5675bf1dca..10eec1db8d 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -10,17 +10,21 @@
 
 #include <unordered_map>
 
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/storage.hpp"
 #include "simgrid/simix.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "xbt/log.h"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
+#include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/storage.hpp"
+#include "xbt/log.h"
 
-xbt_dict_t host_list = nullptr; // FIXME: move it to Engine
+XBT_LOG_EXTERNAL_CATEGORY(surf_route);
+
+std::unordered_map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
 
 int MSG_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
@@ -40,8 +44,9 @@ simgrid::xbt::signal<void(Host&)> Host::onStateChange;
 Host::Host(const char* name)
   : name_(name)
 {
-  xbt_assert(sg_host_by_name(name) == nullptr, "Refusing to create a second host named '%s'.", name);
-  xbt_dict_set(host_list, name, this, nullptr);
+  xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
+  host_list[name_] = this;
+  new simgrid::surf::HostImpl(this);
 }
 
 Host::~Host()
@@ -49,8 +54,9 @@ Host::~Host()
   xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
 
   delete pimpl_;
+  if (pimpl_netpoint != nullptr) // not removed yet by a children class
+    simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint);
   delete pimpl_cpu;
-  delete pimpl_netcard;
   delete mounts;
 }
 
@@ -66,25 +72,25 @@ void Host::destroy()
 {
   if (!currentlyDestroying_) {
     currentlyDestroying_ = true;
-    xbt_dict_remove(host_list, name().c_str());
     onDestruction(*this);
+    host_list.erase(name_);
     delete this;
   }
 }
 
 Host* Host::by_name(std::string name)
 {
-  Host* host = Host::by_name_or_null(name.c_str());
-  // TODO, raise an exception instead?
-  if (host == nullptr)
-    xbt_die("No such host: '%s'", name.c_str());
-  return host;
+  return host_list.at(name); // Will raise a std::out_of_range if the host does not exist
 }
 Host* Host::by_name_or_null(const char* name)
 {
-  if (host_list == nullptr)
-    host_list = xbt_dict_new_homogeneous(nullptr);
-  return (Host*) xbt_dict_get_or_null(host_list, name);
+  return by_name_or_null(std::string(name));
+}
+Host* Host::by_name_or_null(std::string name)
+{
+  if (host_list.find(name) == host_list.end())
+    return nullptr;
+  return host_list.at(name);
 }
 
 Host *Host::current(){
@@ -98,14 +104,19 @@ void Host::turnOn() {
   if (isOff()) {
     simgrid::simix::kernelImmediate([&]{
       this->extension<simgrid::simix::Host>()->turnOn();
-      this->pimpl_->turnOn();
+      this->pimpl_cpu->turnOn();
+      onStateChange(*this);
     });
   }
 }
 
 void Host::turnOff() {
   if (isOn()) {
-    simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+    smx_actor_t self = SIMIX_process_self();
+    simgrid::simix::kernelImmediate([&] {
+      SIMIX_host_off(this, self);
+      onStateChange(*this);
+    });
   }
 }
 
@@ -117,6 +128,37 @@ int Host::pstatesCount() const {
   return this->pimpl_cpu->getNbPStates();
 }
 
+/**
+ * \brief Find a route toward another host
+ *
+ * \param dest [IN] where to
+ * \param links [OUT] where to store the list of links (must exist, cannot be nullptr).
+ * \param latency [OUT] where to store the latency experienced on the path (or nullptr if not interested)
+ *                It is the caller responsibility to initialize latency to 0 (we add to provided route)
+ * \pre links!=nullptr
+ *
+ * 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)
+{
+  std::vector<surf::LinkImpl*> linkImpls;
+  this->routeTo(dest, &linkImpls, latency);
+  for (surf::LinkImpl* l : linkImpls)
+    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)
+{
+  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):", cname(), dest->cname(),
+               (latency == nullptr ? -1 : *latency));
+    for (auto link : *links)
+      XBT_CDEBUG(surf_route, "Link %s", link->getName());
+  }
+}
+
 boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
   if (mounts == nullptr) {
     mounts = new boost::unordered_map<std::string, Storage*> ();
@@ -184,24 +226,14 @@ int Host::coreCount() {
 /** @brief Set the pstate at which the host should run */
 void Host::setPstate(int pstate_index)
 {
-  simgrid::simix::kernelImmediate(std::bind(
-      &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
-  ));
+  simgrid::simix::kernelImmediate([&](){
+      this->pimpl_cpu->setPState(pstate_index);
+  });
 }
 /** @brief Retrieve the pstate at which the host is currently running */
 int Host::pstate()
 {
-  return pimpl_cpu->getPState();
-}
-
-void Host::parameters(vm_params_t params)
-{
-  simgrid::simix::kernelImmediate([&]() { this->pimpl_->getParams(params); });
-}
-
-void Host::setParameters(vm_params_t params)
-{
-  simgrid::simix::kernelImmediate([&]() { this->pimpl_->setParams(params); });
+  return this->pimpl_cpu->getPState();
 }
 
 /**