X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18bee871381a6ce670d9da211f43ab9b55fdc350..dca78d0426c59e786f1633ef14b3c8b99ab7e9e0:/src/simgrid/host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 0da2044a6f..5bf67431eb 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -11,13 +11,21 @@
 #include <xbt/Extendable.hpp>
 #include <simgrid/s4u/host.hpp>
 
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/simix/smx_host_private.h"
 #include "src/surf/HostImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
-extern std::unordered_map<std::string, simgrid::s4u::Host*>
-    host_list; // FIXME: don't duplicate the content of s4u::Host this way
+// FIXME: The following duplicates the content of s4u::Host
+namespace simgrid {
+namespace s4u {
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
+}
+}
+
+extern "C" {
 
 void sg_host_exit()
 {
@@ -29,20 +37,20 @@ void sg_host_exit()
    * the tests.
    */
   std::vector<std::string> names = std::vector<std::string>();
-  for (auto kv : host_list)
+  for (auto kv : simgrid::s4u::host_list)
     names.push_back(kv.second->name());
 
   std::sort(names.begin(), names.end());
 
   for (auto name : names)
-    host_list.at(name)->destroy();
+    simgrid::s4u::host_list.at(name)->destroy();
 
   // host_list.clear(); This would be sufficient if the dict would contain smart_ptr. It's now useless
 }
 
 size_t sg_host_count()
 {
-  return host_list.size();
+  return simgrid::s4u::host_list.size();
 }
 /** @brief Returns the host list
  *
@@ -89,10 +97,10 @@ xbt_dynar_t sg_hosts_as_dynar()
 {
   xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
 
-  for (auto kv : host_list) {
+  for (auto kv : simgrid::s4u::host_list) {
     simgrid::s4u::Host* host = kv.second;
-    if (host && host->pimpl_netcard && host->pimpl_netcard->isHost())
-       xbt_dynar_push(res, &host);
+    if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost())
+      xbt_dynar_push(res, &host);
   }
   xbt_dynar_sort(res, hostcmp_voidp);
   return res;
@@ -100,9 +108,6 @@ xbt_dynar_t sg_hosts_as_dynar()
 
 // ========= Layering madness ==============*
 
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_routing.hpp"
-
 // ========== User data Layer ==========
 void *sg_host_user(sg_host_t host) {
   return host->extension(USER_HOST_LEVEL);
@@ -114,30 +119,21 @@ void sg_host_user_destroy(sg_host_t host) {
   host->extension_set(USER_HOST_LEVEL, nullptr);
 }
 
-// ========== MSG Layer ==============
-msg_host_priv_t sg_host_msg(sg_host_t host) {
-  return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
-}
-void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
-  host->extension_set(MSG_HOST_LEVEL, smx_host);
-}
-
-// ========== Simix layer =============
-#include "src/simix/smx_host_private.h"
-smx_host_priv_t sg_host_simix(sg_host_t host){
-  return host->extension<simgrid::simix::Host>();
-}
-
 // ========= storage related functions ============
 xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
   return host->pimpl_->getMountedStorageList();
 }
 
 xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
-  return host->pimpl_->getAttachedStorageList();
+  std::vector<const char*>* storage_vector = new std::vector<const char*>();
+  xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
+  host->attachedStorages(storage_vector);
+  for (auto name : *storage_vector)
+    xbt_dynar_push(storage_dynar, &name);
+  delete storage_vector;
+  return storage_dynar;
 }
 
-
 // =========== user-level functions ===============
 // ================================================
 /** @brief Returns the total speed of a host */
@@ -190,6 +186,52 @@ const char *sg_host_get_property_value(sg_host_t host, const char *name)
 {
   return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name);
 }
+/**
+ * \brief Find a route between two hosts
+ *
+ * \param from where from
+ * \param to where to
+ * \param links [OUT] where to store the list of links (must exist, cannot be nullptr).
+ */
+void sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links)
+{
+  std::vector<simgrid::s4u::Link*> vlinks;
+  from->routeTo(to, &vlinks, nullptr);
+  for (auto link : vlinks)
+    xbt_dynar_push(links, &link);
+}
+/**
+ * \brief Find the latency of the route between two hosts
+ *
+ * \param from where from
+ * \param to where to
+ */
+double sg_host_route_latency(sg_host_t from, sg_host_t to)
+{
+  std::vector<simgrid::s4u::Link*> vlinks;
+  double res = 0;
+  from->routeTo(to, &vlinks, &res);
+  return res;
+}
+/**
+ * \brief Find the bandwitdh of the route between two hosts
+ *
+ * \param from where from
+ * \param to where to
+ */
+double sg_host_route_bandwidth(sg_host_t from, sg_host_t to)
+{
+  double min_bandwidth = -1.0;
+
+  std::vector<simgrid::s4u::Link*> vlinks;
+  from->routeTo(to, &vlinks, nullptr);
+  for (auto link : vlinks) {
+    double bandwidth = link->bandwidth();
+    if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
+      min_bandwidth = bandwidth;
+  }
+  return min_bandwidth;
+}
 
 /** @brief Displays debugging information about a host */
 void sg_host_dump(sg_host_t host)
@@ -211,3 +253,5 @@ void sg_host_dump(sg_host_t host)
     }
   }
 }
+
+} // extern "C"