sanitize the OOP of kernel::profile

[simgrid.git] / src / kernel / EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index d3501dc..58c0b63 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -1,29 +1,28 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2019. 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 <simgrid/s4u/forward.hpp>
-#include <xbt/dict.h>
+#include <simgrid/s4u/NetZone.hpp>
 
+#include <map>
 #include <string>
 #include <unordered_map>
 
 namespace simgrid {
 namespace kernel {
-namespace routing {
-class NetZoneImpl;
-class NetCard;
-}
 
 class EngineImpl {
 public:
   EngineImpl();
   virtual ~EngineImpl();
-  kernel::routing::NetZoneImpl* netRoot_ = nullptr;
+  kernel::routing::NetZoneImpl* netzone_root_ = nullptr;
 
-protected:
-  std::unordered_map<std::string,simgrid::kernel::routing::NetCard*> netcards_;
+private:
+  std::map<std::string, simgrid::s4u::Host*> hosts_;
+  std::map<std::string, simgrid::s4u::Link*> links_;
+  std::map<std::string, simgrid::s4u::Storage*> storages_;
+  std::unordered_map<std::string, simgrid::kernel::routing::NetPoint*> netpoints_;
   friend simgrid::s4u::Engine;
 };
 }