Rename instr_interface.h and mc_ignore.h to .hpp.

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

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 542eb68..77c71e5 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -1,12 +1,14 @@
 /* s4u::Engine Simulation Engine and global functions. */
 
-/* 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 "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "mc/mc.h"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
@@ -14,8 +16,6 @@
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
 
@@ -158,7 +158,7 @@ void Engine::delStorage(std::string name)
 /** @brief Returns the amount of links in the platform */
 size_t Engine::getLinkCount()
 {
-  return simgrid::surf::LinkImpl::linksCount();
+  return kernel::resource::LinkImpl::linksCount();
 }
 
 /** @brief Fills the passed list with all links found in the platform
@@ -167,14 +167,14 @@ size_t Engine::getLinkCount()
 void XBT_ATTRIB_DEPRECATED_v322("Engine::getLinkList() is deprecated in favor of Engine::getAllLinks(). Please switch before v3.22")
 Engine::getLinkList(std::vector<Link*>* list)
 {
-  simgrid::surf::LinkImpl::linksList(list);
+  kernel::resource::LinkImpl::linksList(list);
 }
 
 /** @brief Returns the list of all links found in the platform */
 std::vector<Link*> Engine::getAllLinks()
 {
   std::vector<Link*> res;
-  simgrid::surf::LinkImpl::linksList(&res);
+  kernel::resource::LinkImpl::linksList(&res);
   return res;
 }
 
@@ -193,7 +193,7 @@ s4u::NetZone* Engine::getNetRoot()
 
 static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
 {
-  if (not strcmp(current->getCname(), name))
+  if (not strcmp(current->get_cname(), name))
     return current;
 
   for (auto const& elem : *(current->getChildren())) {
@@ -228,14 +228,14 @@ void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* l
 void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point)
 {
   // simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
-  pimpl->netpoints_[point->getName()] = point;
+  pimpl->netpoints_[point->get_name()] = point;
   // });
 }
 /** @brief Unregister a given netpoint */
 void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
 {
   simgrid::simix::kernelImmediate([this, point] {
-    pimpl->netpoints_.erase(point->getName());
+    pimpl->netpoints_.erase(point->get_name());
     delete point;
   });
 }