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

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index f3c7b0bf57..3bc21b18c7 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -14,6 +14,7 @@
 #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");
 
@@ -103,8 +104,6 @@ xbt_dynar_t sg_hosts_as_dynar()
 
 // ========= Layering madness ==============*
 
-#include "src/surf/cpu_interface.hpp"
-
 // ========== User data Layer ==========
 void *sg_host_user(sg_host_t host) {
   return host->extension(USER_HOST_LEVEL);
@@ -116,19 +115,6 @@ 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 =============
-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();
@@ -226,12 +212,16 @@ double sg_host_route_latency(sg_host_t from, sg_host_t 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);
-  double res = 0;
-  for (auto link : vlinks)
-    res += link->bandwidth();
-  return res;
+  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 */