Drop s4u::Host::getPstateSpeedCurrent() which dupplicates Host::speed()

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 2bf9491..f792b9c 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -8,7 +8,7 @@
 #include <functional>
 #include <stdexcept>
 
-#include <unordered_map>
+#include <map>
 
 #include "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
@@ -24,9 +24,8 @@
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_route);
 
-std::unordered_map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
+std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
 
-int MSG_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
 
 namespace simgrid {
@@ -40,6 +39,7 @@ namespace s4u {
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
 simgrid::xbt::signal<void(Host&)> Host::onDestruction;
 simgrid::xbt::signal<void(Host&)> Host::onStateChange;
+simgrid::xbt::signal<void(Host&)> Host::onSpeedChange;
 
 Host::Host(const char* name)
   : name_(name)
@@ -155,7 +155,7 @@ void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* late
     XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", cname(), dest->cname(),
                (latency == nullptr ? -1 : *latency));
     for (auto link : *links)
-      XBT_CDEBUG(surf_route, "Link %s", link->getName());
+      XBT_CDEBUG(surf_route, "Link %s", link->cname());
   }
 }
 
@@ -202,15 +202,7 @@ xbt_swag_t Host::processes()
   });
 }
 
-/** Get the peak power of a host */
-double Host::getPstateSpeedCurrent()
-{
-  return simgrid::simix::kernelImmediate([this] {
-    return this->pimpl_cpu->getPstateSpeedCurrent();
-  });
-}
-
-/** Get one power peak (in flops/s) of a host at a given pstate */
+/** @brief Get the peak processor speed (in flops/s), at the specified pstate  */
 double Host::getPstateSpeed(int pstate_index)
 {
   return simgrid::simix::kernelImmediate([this, pstate_index] {
@@ -218,10 +210,11 @@ double Host::getPstateSpeed(int pstate_index)
   });
 }
 
-/** @brief Get the speed of the cpu associated to a host */
+/** @brief Get the peak processor speed (in flops/s), at the current pstate */
 double Host::speed() {
   return pimpl_cpu->getSpeed(1.0);
 }
+
 /** @brief Returns the number of core of the processor. */
 int Host::coreCount() {
   return pimpl_cpu->coreCount();
@@ -257,10 +250,10 @@ xbt_dict_t Host::mountedStoragesAsDict()
  * \brief Returns the list of storages attached to an host.
  * \return a dict containing all storages attached to the host
  */
-xbt_dynar_t Host::attachedStorages()
+void Host::attachedStorages(std::vector<const char*>* storages)
 {
-  return simgrid::simix::kernelImmediate([this] {
-    return this->pimpl_->getAttachedStorageList();
+  simgrid::simix::kernelImmediate([this, storages] { 
+     this->pimpl_->getAttachedStorageList(storages); 
   });
 }