reduce the scope of some #include, and cut useless ones

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 82d6d66..481c10a 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -1,25 +1,14 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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 <string>
-#include <functional>
-#include <stdexcept>
-
-#include <map>
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Storage.hpp"
-#include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/msg/msg_private.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_host_private.hpp"
 #include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "xbt/log.h"
+
+#include <string>
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_route);
 
@@ -33,8 +22,6 @@ template class Extendable<simgrid::s4u::Host>;
 
 namespace s4u {
 
-std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
-
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
 simgrid::xbt::signal<void(Host&)> Host::onDestruction;
 simgrid::xbt::signal<void(Host&)> Host::onStateChange;
@@ -44,7 +31,7 @@ Host::Host(const char* name)
   : name_(name)
 {
   xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
-  host_list[name_] = this;
+  Engine::getInstance()->addHost(std::string(name_), this);
   new simgrid::surf::HostImpl(this);
 }
 
@@ -72,27 +59,26 @@ void Host::destroy()
   if (not currentlyDestroying_) {
     currentlyDestroying_ = true;
     onDestruction(*this);
-    host_list.erase(name_);
+    Engine::getInstance()->delHost(std::string(name_));
     delete this;
   }
 }
 
 Host* Host::by_name(std::string name)
 {
-  return host_list.at(name); // Will raise a std::out_of_range if the host does not exist
+  return Engine::getInstance()->hostByName(name);
 }
 Host* Host::by_name(const char* name)
 {
-  return host_list.at(std::string(name)); // Will raise a std::out_of_range if the host does not exist
+  return Engine::getInstance()->hostByName(std::string(name));
 }
 Host* Host::by_name_or_null(const char* name)
 {
-  return by_name_or_null(std::string(name));
+  return Engine::getInstance()->hostByNameOrNull(std::string(name));
 }
 Host* Host::by_name_or_null(std::string name)
 {
-  auto host = host_list.find(name);
-  return host == host_list.end() ? nullptr : host->second;
+  return Engine::getInstance()->hostByNameOrNull(name);
 }
 
 Host *Host::current(){
@@ -106,7 +92,7 @@ void Host::turnOn() {
   if (isOff()) {
     simgrid::simix::kernelImmediate([this] {
       this->extension<simgrid::simix::Host>()->turnOn();
-      this->pimpl_cpu->turnOn();
+      this->pimpl_cpu->turn_on();
       onStateChange(*this);
     });
   }
@@ -123,7 +109,7 @@ void Host::turnOff() {
 }
 
 bool Host::isOn() {
-  return this->pimpl_cpu->isOn();
+  return this->pimpl_cpu->is_on();
 }
 
 int Host::getPstatesCount() const
@@ -166,12 +152,12 @@ void Host::routeTo(Host* dest, std::vector<Link*>& links, double* latency)
 /** @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);
+  simgrid::kernel::routing::NetZoneImpl::get_global_route(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):", getCname(), dest->getCname(),
+    XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(),
                (latency == nullptr ? -1 : *latency));
     for (auto const& link : links)
-      XBT_CDEBUG(surf_route, "Link %s", link->getCname());
+      XBT_CDEBUG(surf_route, "Link %s", link->get_cname());
   }
 }
 
@@ -238,11 +224,17 @@ int Host::getPstate()
  * \brief Returns the list of storages attached to an host.
  * \return a vector containing all storages attached to the host
  */
+std::vector<const char*> Host::get_attached_storages()
+{
+  return simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
+}
+
 void Host::getAttachedStorages(std::vector<const char*>* storages)
 {
-  simgrid::simix::kernelImmediate([this, storages] {
-     this->pimpl_->getAttachedStorageList(storages);
-  });
+  std::vector<const char*> local_storages =
+      simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
+  for (auto elm : local_storages)
+    storages->push_back(elm);
 }
 
 std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()
@@ -267,7 +259,7 @@ void Host::execute(double flops)
 
 double Host::getLoad()
 {
-  return this->pimpl_cpu->getLoad();
+  return this->pimpl_cpu->get_load();
 }
 
 } // namespace simgrid