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 61c8305..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/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);
 
@@ -103,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);
     });
   }
@@ -120,7 +109,7 @@ void Host::turnOff() {
 }
 
 bool Host::isOn() {
-  return this->pimpl_cpu->isOn();
+  return this->pimpl_cpu->is_on();
 }
 
 int Host::getPstatesCount() const
@@ -163,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());
   }
 }
 
@@ -270,7 +259,7 @@ void Host::execute(double flops)
 
 double Host::getLoad()
 {
-  return this->pimpl_cpu->getLoad();
+  return this->pimpl_cpu->get_load();
 }
 
 } // namespace simgrid