Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
separate the energy plugin from surf in the doc + improvements
[simgrid.git] / src / simgrid / host.cpp
index 19330ae..5db33f1 100644 (file)
@@ -1,27 +1,75 @@
-/* Copyright (c) 2013-201. 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 <simgrid/simix.hpp>
+#include <algorithm>
+#include <vector>
 
-#include "xbt/dict.h"
 #include "simgrid/host.h"
-#include "simgrid/Host.hpp"
-#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
+#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/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" {
+
+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 : simgrid::s4u::host_list)
+    names.push_back(kv.second->name());
+
+  std::sort(names.begin(), names.end());
 
-#include "src/simix/smx_private.hpp"
-#include "src/surf/host_interface.hpp"
+  for (auto 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 xbt_dict_length(host_list);
+  return simgrid::s4u::host_list.size();
+}
+/** @brief Returns the host list
+ *
+ * Uses sg_host_count() to know the array size.
+ *
+ * \return an array of \ref sg_host_t containing all the hosts in the platform.
+ * \remark The host order in this array is generally different from the
+ * creation/declaration order in the XML platform (we use a hash table
+ * internally).
+ * \see sg_host_count()
+ */
+sg_host_t *sg_host_list() {
+  xbt_assert(sg_host_count() > 0, "There is no host!");
+  return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
 }
 
 const char *sg_host_get_name(sg_host_t host)
 {
-       return host->getName().c_str();
+  return host->cname();
 }
 
 void* sg_host_extension_get(sg_host_t host, size_t ext)
@@ -31,61 +79,35 @@ void* sg_host_extension_get(sg_host_t host, size_t ext)
 
 size_t sg_host_extension_create(void(*deleter)(void*))
 {
-  return simgrid::Host::extension_create(deleter);
+  return simgrid::s4u::Host::extension_create(deleter);
 }
 
 sg_host_t sg_host_by_name(const char *name)
 {
-  return simgrid::Host::by_name_or_null(name);
+  return simgrid::s4u::Host::by_name_or_null(name);
 }
 
-sg_host_t sg_host_by_name_or_create(const char *name)
+static int hostcmp_voidp(const void* pa, const void* pb)
 {
-  return simgrid::Host::by_name_or_create(name);
+  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(void)
-{
-       xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL);
-
-  xbt_dict_cursor_t cursor = nullptr;
-  const char* name = nullptr;
-  simgrid::Host* host = nullptr;
-       xbt_dict_foreach(host_list, cursor, name, host)
-               if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST)
-                       xbt_dynar_push(res, &host);
-       return res;
-}
-
-// ========= Layering madness ==============
-
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int USER_HOST_LEVEL;
-
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used
-#include "src/simdag/simdag_private.h" // __SD_workstation_destroy. FIXME: killme by initializing that level in simdag when used
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_routing.hpp"
-
-void sg_host_init()
+xbt_dynar_t sg_hosts_as_dynar()
 {
-  MSG_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
-    __MSG_host_priv_free((msg_host_priv_t) p);
-  });
-
-  ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
-         delete static_cast<simgrid::surf::NetCard*>(p);
-  });
+  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
 
-  SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
-  SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy);
-  USER_HOST_LEVEL = simgrid::Host::extension_create(NULL);
+  for (auto 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);
+  }
+  xbt_dynar_sort(res, hostcmp_voidp);
+  return res;
 }
 
+// ========= Layering madness ==============*
+
 // ========== User data Layer ==========
 void *sg_host_user(sg_host_t host) {
   return host->extension(USER_HOST_LEVEL);
@@ -97,208 +119,148 @@ 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);
-}
-void sg_host_msg_destroy(sg_host_t host) {
-  host->extension_set(MSG_HOST_LEVEL, nullptr);
-}
-// ========== SimDag Layer ==============
-SD_workstation_priv_t sg_host_sd(sg_host_t host) {
-  return (SD_workstation_priv_t) host->extension(SD_HOST_LEVEL);
-}
-void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) {
-  host->extension_set(SD_HOST_LEVEL, smx_host);
-}
-void sg_host_sd_destroy(sg_host_t host) {
-  host->extension_set(SD_HOST_LEVEL, nullptr);
-}
+// ========= storage related functions ============
+xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
+  xbt_assert((host != nullptr), "Invalid parameters");
+  xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
+  for (auto elm : host->mountedStorages()) {
+    const char* mount_name = elm.first.c_str();
+    sg_storage_t storage   = elm.second;
+    xbt_dict_set(res, mount_name, (void*)storage->name(), nullptr);
+  }
 
-// ========== 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);
+  return res;
 }
-void sg_host_simix_destroy(sg_host_t host) {
-  host->extension_set(SIMIX_HOST_LEVEL, nullptr);
+
+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);
+  host->attachedStorages(storage_vector);
+  for (auto name : *storage_vector)
+    xbt_dynar_push(storage_dynar, &name);
+  delete storage_vector;
+  return storage_dynar;
 }
 
 // =========== user-level functions ===============
 // ================================================
-
-double sg_host_get_available_speed(sg_host_t host){
-  return surf_host_get_available_speed(host);
+/** @brief Returns the total speed of a host */
+double sg_host_speed(sg_host_t host)
+{
+  return host->speed();
 }
-/** @brief Returns the state of a host.
- *  @return 1 if the host is active or 0 if it has crashed.
- */
-int sg_host_is_on(sg_host_t host) {
-       return host->pimpl_cpu->isOn();
+
+double sg_host_get_available_speed(sg_host_t host)
+{
+  return host->pimpl_cpu->getAvailableSpeed();
 }
 
 /** @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->pimpl_cpu->getNbPStates();
+  return host->pstatesCount();
 }
 
 /** @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->getPState();
+  return host->pstate();
 }
 /** @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);
-}
-
-namespace simgrid {
-
-Host::Host(std::string const& id)
-  : name_(id)
-{
+  host->setPstate(pstate);
 }
 
-Host::~Host()
-{
+/** @brief Get the properties of an host */
+xbt_dict_t sg_host_get_properties(sg_host_t host) {
+  return host->properties();
 }
 
-/** Start the host if it is off */
-void Host::turnOn()
-{
-  simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
-}
-
-/** Stop the host if it is on */
-void Host::turnOff()
-{
-  /* Go to that function to follow the code flow through the simcall barrier */
-  if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this);
-  simgrid::simix::simcall<void>(SIMCALL_HOST_OFF, this);
-}
-
-bool Host::isOn() {
-  return pimpl_cpu->isOn();
-}
-bool Host::isOff() {
-  return ! pimpl_cpu->isOn();
-}
-
-
-/** Get the properties assigned to a host */
-xbt_dict_t Host::getProperties()
-{
-  return simgrid::simix::kernel(std::bind(sg_host_get_properties, this));
-}
-
-/** Get the processes attached to the host */
-xbt_swag_t Host::getProcessList()
-{
-  return simgrid::simix::kernel([&]() {
-    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
-  });
-}
-
-/** Get the peak power of a host */
-double Host::getCurrentPowerPeak()
-{
-  return simgrid::simix::kernel(
-    std::bind(surf_host_get_current_power_peak, this));
-}
-
-/** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::getPowerPeakAt(int pstate_index)
-{
-  return simgrid::simix::kernel(
-    std::bind(surf_host_get_power_peak_at, this, pstate_index));
-}
-
-/** @brief Get the speed of the cpu associated to a host */
-double Host::getSpeed() {
-       return pimpl_cpu->getSpeed(1.0);
-}
-/** @brief Returns the number of core of the processor. */
-int Host::getCoreAmount() {
-       return pimpl_cpu->getCore();
-}
-
-Host* Host::by_name_or_null(const char* name)
-{
-  return (Host*) xbt_dict_get_or_null(host_list, name);
-}
-
-Host* Host::by_name_or_create(const char* name)
-{
-  Host* host = by_name_or_null(name);
-  if (host == nullptr) {
-    host = new Host(name);
-    xbt_dict_set(host_list, name, host, NULL);
-  }
-  return host;
-}
-
-/** @brief Set the pstate at which the host should run */
-void Host::setPState(int pstate_index)
-{
-  simgrid::simix::kernel(std::bind(
-      &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
-  ));
-}
-/** @brief Retrieve the pstate at which the host is currently running */
-int Host::getPState()
-{
-  return pimpl_cpu->getPState();
-}
-
-void Host::getParams(vm_params_t params)
+/** \ingroup m_host_management
+ * \brief Returns the value of a given host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property (or nullptr if property not set)
+*/
+const char *sg_host_get_property_value(sg_host_t host, const char *name)
 {
-  simgrid::simix::kernel([&]() {
-    this->extension<simgrid::surf::Host>()->getParams(params);
-  });
+  return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name);
 }
-
-void Host::setParams(vm_params_t params)
+/**
+ * \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)
 {
-  simgrid::simix::kernel([&]() {
-    this->extension<simgrid::surf::Host>()->setParams(params);
-  });
+  std::vector<simgrid::s4u::Link*> vlinks;
+  from->routeTo(to, &vlinks, nullptr);
+  for (auto link : vlinks)
+    xbt_dynar_push(links, &link);
 }
-
 /**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \return a dict containing all storages mounted on the host
+ * \brief Find the latency of the route between two hosts
+ *
+ * \param from where from
+ * \param to where to
  */
-xbt_dict_t Host::getMountedStorageList()
+double sg_host_route_latency(sg_host_t from, sg_host_t to)
 {
-  return simgrid::simix::kernel([&] {
-    return this->extension<simgrid::surf::Host>()->getMountedStorageList();
-  });
+  std::vector<simgrid::s4u::Link*> vlinks;
+  double res = 0;
+  from->routeTo(to, &vlinks, &res);
+  return res;
 }
-
 /**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \return a dict containing all storages attached to the host
+ * \brief Find the bandwitdh of the route between two hosts
+ *
+ * \param from where from
+ * \param to where to
  */
-xbt_dynar_t Host::getAttachedStorageList()
+double sg_host_route_bandwidth(sg_host_t from, sg_host_t to)
 {
-  return simgrid::simix::kernel([&] {
-    return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
-  });
+  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)
+{
+  xbt_dict_t props;
+
+  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 = host->properties();
+
+  if (not xbt_dict_is_empty(props)) {
+    XBT_INFO("  - properties:");
+    xbt_dict_cursor_t cursor = nullptr;
+    char* key;
+    char* data;
+
+    xbt_dict_foreach(props,cursor,key,data) {
+      XBT_INFO("    %s->%s",key,data);
+    }
+  }
 }
+
+} // extern "C"