no need for a lib to store the netcards. A dict is easier

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 523aee6..77057f2 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -10,15 +10,18 @@
 
 #include <unordered_map>
 
+#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/NetCard.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<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
 
@@ -40,7 +43,7 @@ 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_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
   host_list[name_] = this;
 }
 
@@ -117,6 +120,29 @@ int Host::pstatesCount() const {
   return this->pimpl_cpu->getNbPStates();
 }
 
+/**
+ * \brief Find a route toward another host
+ *
+ * \param dest [IN] where to
+ * \param route [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 route!=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)
+{
+  simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netcard, dest->pimpl_netcard, 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*> ();