X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/827f345d26da926941909a521752839e21e9a44e..7097365f75e89b3b266987b2ec70b9dbc82bfded:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index ed367e8d8f..29d104a225 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -10,19 +10,22 @@
 
 #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_LOG_EXTERNAL_CATEGORY(surf_route);
 
-std::unordered_map<simgrid::xbt::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
+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;
 
 namespace simgrid {
@@ -36,12 +39,14 @@ namespace s4u {
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
 simgrid::xbt::signal<void(Host&)> Host::onDestruction;
 simgrid::xbt::signal<void(Host&)> Host::onStateChange;
+simgrid::xbt::signal<void(Host&)> Host::onSpeedChange;
 
 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_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;
 }
 
@@ -78,11 +84,13 @@ Host* Host::by_name(std::string name)
 }
 Host* Host::by_name_or_null(const char* name)
 {
-  try {
-    return host_list.at(name);
-  } catch (std::out_of_range& e) {
+  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(){
@@ -94,16 +102,21 @@ Host *Host::current(){
 
 void Host::turnOn() {
   if (isOff()) {
-    simgrid::simix::kernelImmediate([&]{
+    simgrid::simix::kernelImmediate([this] {
       this->extension<simgrid::simix::Host>()->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([this, self] {
+      SIMIX_host_off(this, self);
+      onStateChange(*this);
+    });
   }
 }
 
@@ -115,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->cname());
+  }
+}
+
 boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
   if (mounts == nullptr) {
     mounts = new boost::unordered_map<std::string, Storage*> ();
@@ -135,7 +179,9 @@ boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getProperties();
+  });
 }
 
 /** Retrieve the property value (or nullptr if not set) */
@@ -143,13 +189,15 @@ const char*Host::property(const char*key) {
   return this->pimpl_->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){
-  simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
+  simgrid::simix::kernelImmediate([this, key, value] {
+    this->pimpl_->setProperty(key, value);
+  });
 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {
-  return simgrid::simix::kernelImmediate([&]() {
+  return simgrid::simix::kernelImmediate([this] {
     return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
@@ -157,7 +205,7 @@ xbt_swag_t Host::processes()
 /** Get the peak power of a host */
 double Host::getPstateSpeedCurrent()
 {
-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this] {
     return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }
@@ -165,7 +213,7 @@ double Host::getPstateSpeedCurrent()
 /** Get one power peak (in flops/s) of a host at a given pstate */
 double Host::getPstateSpeed(int pstate_index)
 {
-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this, pstate_index] {
     return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }
@@ -182,14 +230,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, pstate_index] {
+      this->pimpl_cpu->setPState(pstate_index);
+  });
 }
 /** @brief Retrieve the pstate at which the host is currently running */
 int Host::pstate()
 {
-  return pimpl_cpu->getPState();
+  return this->pimpl_cpu->getPState();
 }
 
 /**
@@ -199,7 +247,9 @@ int Host::pstate()
  */
 xbt_dict_t Host::mountedStoragesAsDict()
 {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getMountedStorageList();
+  });
 }
 
 /**
@@ -209,7 +259,9 @@ xbt_dict_t Host::mountedStoragesAsDict()
  */
 xbt_dynar_t Host::attachedStorages()
 {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getAttachedStorageList();
+  });
 }
 
 } // namespace simgrid