moving dynar up in the stack

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index d918006..dcfa890 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -8,13 +8,13 @@
 #include <functional>
 #include <stdexcept>
 
-#include <unordered_map>
+#include <map>
 
 #include "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 #include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
@@ -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)
@@ -54,8 +54,8 @@ Host::~Host()
   xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
 
   delete pimpl_;
-  if (pimpl_netcard != nullptr) // not removed yet by a children class
-    simgrid::s4u::Engine::instance()->netcardUnregister(pimpl_netcard);
+  if (pimpl_netpoint != nullptr) // not removed yet by a children class
+    simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint);
   delete pimpl_cpu;
   delete mounts;
 }
@@ -102,7 +102,7 @@ Host *Host::current(){
 
 void Host::turnOn() {
   if (isOff()) {
-    simgrid::simix::kernelImmediate([&]{
+    simgrid::simix::kernelImmediate([this] {
       this->extension<simgrid::simix::Host>()->turnOn();
       this->pimpl_cpu->turnOn();
       onStateChange(*this);
@@ -113,7 +113,7 @@ void Host::turnOn() {
 void Host::turnOff() {
   if (isOn()) {
     smx_actor_t self = SIMIX_process_self();
-    simgrid::simix::kernelImmediate([&] {
+    simgrid::simix::kernelImmediate([this, self] {
       SIMIX_host_off(this, self);
       onStateChange(*this);
     });
@@ -142,12 +142,20 @@ int Host::pstatesCount() const {
  */
 void Host::routeTo(Host* dest, std::vector<Link*>* links, double* latency)
 {
-  simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netcard, dest->pimpl_netcard, links, latency);
+  std::vector<surf::LinkImpl*> linkImpls;
+  this->routeTo(dest, &linkImpls, latency);
+  for (surf::LinkImpl* l : linkImpls)
+    links->push_back(&l->piface_);
+}
+/** @brief Just like Host::routeTo, but filling an array of link implementations */
+void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* latency)
+{
+  simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netpoint, dest->pimpl_netpoint, links, latency);
   if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
     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());
   }
 }
 
@@ -171,7 +179,9 @@ boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getProperties();
+  });
 }
 
 /** Retrieve the property value (or nullptr if not set) */
@@ -179,13 +189,15 @@ const char*Host::property(const char*key) {
   return this->pimpl_->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){
-  simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
+  simgrid::simix::kernelImmediate([this, key, value] {
+    this->pimpl_->setProperty(key, value);
+  });
 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {
-  return simgrid::simix::kernelImmediate([&]() {
+  return simgrid::simix::kernelImmediate([this] {
     return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
@@ -193,7 +205,7 @@ xbt_swag_t Host::processes()
 /** Get the peak power of a host */
 double Host::getPstateSpeedCurrent()
 {
-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this] {
     return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }
@@ -201,7 +213,7 @@ double Host::getPstateSpeedCurrent()
 /** Get one power peak (in flops/s) of a host at a given pstate */
 double Host::getPstateSpeed(int pstate_index)
 {
-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this, pstate_index] {
     return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }
@@ -218,14 +230,14 @@ int Host::coreCount() {
 /** @brief Set the pstate at which the host should run */
 void Host::setPstate(int pstate_index)
 {
-  simgrid::simix::kernelImmediate(std::bind(
-      &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
-  ));
+  simgrid::simix::kernelImmediate([this, pstate_index] {
+      this->pimpl_cpu->setPState(pstate_index);
+  });
 }
 /** @brief Retrieve the pstate at which the host is currently running */
 int Host::pstate()
 {
-  return pimpl_cpu->getPState();
+  return this->pimpl_cpu->getPState();
 }
 
 /**
@@ -235,7 +247,9 @@ int Host::pstate()
  */
 xbt_dict_t Host::mountedStoragesAsDict()
 {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getMountedStorageList();
+  });
 }
 
 /**
@@ -243,9 +257,11 @@ 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()
+std::vector<const char*> Host::attachedStorages()
 {
-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getAttachedStorageList();
+  });
 }
 
 } // namespace simgrid