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

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 51bc85ed23..51da4ba691 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -1,25 +1,29 @@
-/* Copyright (c) 2013-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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 <algorithm>
 #include <vector>
 
-#include "xbt/dict.h"
 #include "simgrid/host.h"
-#include <xbt/Extendable.hpp>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
+#include "xbt/Extendable.hpp"
+#include "xbt/dict.h"
 
 #include "src/kernel/routing/NetPoint.hpp"
-#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_host_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #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
+namespace simgrid {
+namespace s4u {
 extern std::map<std::string, simgrid::s4u::Host*> host_list;
+}
+}
 
 extern "C" {
 
@@ -33,20 +37,20 @@ void sg_host_exit()
    * the tests.
    */
   std::vector<std::string> names = std::vector<std::string>();
-  for (auto kv : host_list)
-    names.push_back(kv.second->name());
+  for (auto const& kv : simgrid::s4u::host_list)
+    names.push_back(kv.second->getName());
 
   std::sort(names.begin(), names.end());
 
-  for (auto name : names)
-    host_list.at(name)->destroy();
+  for (auto const& name : names)
+    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
  *
@@ -65,7 +69,7 @@ sg_host_t *sg_host_list() {
 
 const char *sg_host_get_name(sg_host_t host)
 {
-  return host->cname();
+  return host->getCname();
 }
 
 void* sg_host_extension_get(sg_host_t host, size_t ext)
@@ -85,15 +89,15 @@ sg_host_t sg_host_by_name(const char *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());
+  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->getCname(),
+                (*static_cast<simgrid::s4u::Host* const*>(pb))->getCname());
 }
 
 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 const& kv : simgrid::s4u::host_list) {
     simgrid::s4u::Host* host = kv.second;
     if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost())
       xbt_dynar_push(res, &host);
@@ -117,13 +121,24 @@ void sg_host_user_destroy(sg_host_t host) {
 
 // ========= storage related functions ============
 xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
-  return host->pimpl_->getMountedStorageList();
+  xbt_assert((host != nullptr), "Invalid parameters");
+  xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
+  for (auto const& elm : host->getMountedStorages()) {
+    const char* mount_name = elm.first.c_str();
+    sg_storage_t storage   = elm.second;
+    xbt_dict_set(res, mount_name, (void*)storage->getCname(), nullptr);
+  }
+
+  return res;
 }
 
 xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
+  std::vector<const char*>* storage_vector = new std::vector<const char*>();
   xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
-  for (auto name : host->attachedStorages())
+  host->getAttachedStorages(storage_vector);
+  for (auto const& name : *storage_vector)
     xbt_dynar_push(storage_dynar, &name);
+  delete storage_vector;
   return storage_dynar;
 }
 
@@ -132,7 +147,7 @@ xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
 /** @brief Returns the total speed of a host */
 double sg_host_speed(sg_host_t host)
 {
-  return host->speed();
+  return host->getSpeed();
 }
 
 double sg_host_get_available_speed(sg_host_t host)
@@ -142,22 +157,22 @@ double sg_host_get_available_speed(sg_host_t host)
 
 /** @brief Returns the number of power states for a host.
  *
- *  See also @ref SURF_plugin_energy.
+ *  See also @ref plugin_energy.
  */
 int sg_host_get_nb_pstates(sg_host_t host) {
-  return host->pstatesCount();
+  return host->getPstatesCount();
 }
 
 /** @brief Gets the pstate at which that host currently runs.
  *
- *  See also @ref SURF_plugin_energy.
+ *  See also @ref plugin_energy.
  */
 int sg_host_get_pstate(sg_host_t host) {
-  return host->pstate();
+  return host->getPstate();
 }
 /** @brief Sets the pstate at which that host should run.
  *
- *  See also @ref SURF_plugin_energy.
+ *  See also @ref plugin_energy.
  */
 void sg_host_set_pstate(sg_host_t host,int pstate) {
   host->setPstate(pstate);
@@ -165,7 +180,14 @@ void sg_host_set_pstate(sg_host_t host,int pstate) {
 
 /** @brief Get the properties of an host */
 xbt_dict_t sg_host_get_properties(sg_host_t host) {
-  return host->properties();
+  xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
+  std::map<std::string, std::string>* props = host->getProperties();
+  if (props == nullptr)
+    return nullptr;
+  for (auto const& elm : *props) {
+    xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr);
+  }
+  return as_dict;
 }
 
 /** \ingroup m_host_management
@@ -177,8 +199,14 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) {
 */
 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);
+  return host->getProperty(name);
+}
+
+void sg_host_set_property_value(sg_host_t host, const char* name, const char* value)
+{
+  host->setProperty(name, value);
 }
+
 /**
  * \brief Find a route between two hosts
  *
@@ -189,8 +217,8 @@ const char *sg_host_get_property_value(sg_host_t host, const char *name)
 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)
+  from->routeTo(to, vlinks, nullptr);
+  for (auto const& link : vlinks)
     xbt_dynar_push(links, &link);
 }
 /**
@@ -203,7 +231,7 @@ 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);
+  from->routeTo(to, vlinks, &res);
   return res;
 }
 /**
@@ -217,8 +245,8 @@ 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) {
+  from->routeTo(to, vlinks, nullptr);
+  for (auto const& link : vlinks) {
     double bandwidth = link->bandwidth();
     if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
       min_bandwidth = bandwidth;
@@ -229,20 +257,15 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to)
 /** @brief Displays debugging information about a host */
 void sg_host_dump(sg_host_t host)
 {
-  xbt_dict_t props;
-  xbt_dict_cursor_t cursor=nullptr;
-  char *key,*data;
-
-  XBT_INFO("Displaying host %s", host->cname());
-  XBT_INFO("  - speed: %.0f", host->speed());
+  XBT_INFO("Displaying host %s", host->getCname());
+  XBT_INFO("  - speed: %.0f", host->getSpeed());
   XBT_INFO("  - available speed: %.2f", sg_host_get_available_speed(host));
-  props = host->properties();
+  std::map<std::string, std::string>* props = host->getProperties();
 
-  if (!xbt_dict_is_empty(props)){
+  if (not props->empty()) {
     XBT_INFO("  - properties:");
-
-    xbt_dict_foreach(props,cursor,key,data) {
-      XBT_INFO("    %s->%s",key,data);
+    for (auto const& elm : *props) {
+      XBT_INFO("    %s->%s", elm.first.c_str(), elm.second.c_str());
     }
   }
 }