X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..8f4c00936fdabbd005cbf15ca132ceb248f72dcd:/src/simgrid/host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 701b7f469c..51bc85ed23 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -4,19 +4,49 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <vector>
+
 #include "xbt/dict.h"
 #include "simgrid/host.h"
 #include <xbt/Extendable.hpp>
 #include <simgrid/s4u/host.hpp>
 
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/simix/smx_host_private.h"
 #include "src/surf/HostImpl.hpp"
-#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
+#include "src/surf/cpu_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
+// FIXME: The following duplicates the content of s4u::Host
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
+
+extern "C" {
+
+void sg_host_exit()
+{
+  /* copy all names to not modify the map while iterating over it.
+   *
+   * Plus, the hosts are destroyed in the lexicographic order to ensure
+   * that the output is reproducible: we don't want to kill them in the
+   * pointer order as it could be platform-dependent, which would break
+   * the tests.
+   */
+  std::vector<std::string> names = std::vector<std::string>();
+  for (auto kv : host_list)
+    names.push_back(kv.second->name());
+
+  std::sort(names.begin(), names.end());
+
+  for (auto name : names)
+    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 xbt_dict_length(host_list);
+  return host_list.size();
 }
 /** @brief Returns the host list
  *
@@ -35,7 +65,7 @@ sg_host_t *sg_host_list() {
 
 const char *sg_host_get_name(sg_host_t host)
 {
-  return host->name().c_str();
+  return host->cname();
 }
 
 void* sg_host_extension_get(sg_host_t host, size_t ext)
@@ -53,24 +83,27 @@ sg_host_t sg_host_by_name(const char *name)
   return simgrid::s4u::Host::by_name_or_null(name);
 }
 
+static int hostcmp_voidp(const void* pa, const void* pb)
+{
+  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->cname(),
+                (*static_cast<simgrid::s4u::Host* const*>(pb))->cname());
+}
+
 xbt_dynar_t sg_hosts_as_dynar()
 {
   xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
 
-  xbt_dict_cursor_t cursor = nullptr;
-  const char* name = nullptr;
-  simgrid::s4u::Host* host = nullptr;
-  xbt_dict_foreach(host_list, cursor, name, host)
-    if (host && host->pimpl_netcard && host->pimpl_netcard->isHost())
-       xbt_dynar_push(res, &host);
+  for (auto kv : host_list) {
+    simgrid::s4u::Host* host = kv.second;
+    if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost())
+      xbt_dynar_push(res, &host);
+  }
+  xbt_dynar_sort(res, hostcmp_voidp);
   return res;
 }
 
 // ========= 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);
@@ -82,35 +115,18 @@ 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 (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL);
-}
-void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
-  host->extension_set(SIMIX_HOST_LEVEL, smx_host);
-}
-void sg_host_simix_destroy(sg_host_t host) {
-  host->extension_set(SIMIX_HOST_LEVEL, nullptr);
-}
-
 // ========= storage related functions ============
 xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
-  return host->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
+  return host->pimpl_->getMountedStorageList();
 }
 
 xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
-  return host->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
+  xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
+  for (auto name : host->attachedStorages())
+    xbt_dynar_push(storage_dynar, &name);
+  return storage_dynar;
 }
 
-
 // =========== user-level functions ===============
 // ================================================
 /** @brief Returns the total speed of a host */
@@ -163,6 +179,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)
@@ -171,10 +233,10 @@ void sg_host_dump(sg_host_t host)
   xbt_dict_cursor_t cursor=nullptr;
   char *key,*data;
 
-  XBT_INFO("Displaying host %s", sg_host_get_name(host));
+  XBT_INFO("Displaying host %s", host->cname());
   XBT_INFO("  - speed: %.0f", host->speed());
   XBT_INFO("  - available speed: %.2f", sg_host_get_available_speed(host));
-  props = sg_host_get_properties(host);
+  props = host->properties();
 
   if (!xbt_dict_is_empty(props)){
     XBT_INFO("  - properties:");
@@ -184,3 +246,5 @@ void sg_host_dump(sg_host_t host)
     }
   }
 }
+
+} // extern "C"