Move kernel/resource/Resource.hpp in private section.

Rationale: includes several private files from src/kernel/.

diff --git a/MANIFEST.in b/MANIFEST.in
index 5669064..256e15d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2040,7 +2040,6 @@ include include/simgrid/kernel/future.hpp
 include include/simgrid/kernel/resource/Action.hpp
 include include/simgrid/kernel/resource/Model.hpp
 include include/simgrid/kernel/resource/NetworkModelIntf.hpp
-include include/simgrid/kernel/resource/Resource.hpp
 include include/simgrid/kernel/routing/ClusterZone.hpp
 include include/simgrid/kernel/routing/DijkstraZone.hpp
 include include/simgrid/kernel/routing/DragonflyZone.hpp
@@ -2266,6 +2265,7 @@ include src/kernel/resource/DiskImpl.cpp
 include src/kernel/resource/DiskImpl.hpp
 include src/kernel/resource/Model.cpp
 include src/kernel/resource/NetworkModelIntf_test.cpp
+include src/kernel/resource/Resource.hpp
 include src/kernel/resource/profile/DatedValue.cpp
 include src/kernel/resource/profile/DatedValue.hpp
 include src/kernel/resource/profile/Event.hpp

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 5735d8d..0d247f5 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -5,11 +5,11 @@
 
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
-#include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Disk.hpp"
 #include "simgrid/s4u/Io.hpp"
+#include "src/kernel/resource/Resource.hpp"
 #include "src/surf/surf_interface.hpp"
-#include <xbt/PropertyHolder.hpp>
+#include "xbt/PropertyHolder.hpp"
 
 #include <map>
 

diff --git a/include/simgrid/kernel/resource/Resource.hpp b/src/kernel/resource/Resource.hpp
similarity index 94%
rename from include/simgrid/kernel/resource/Resource.hpp
rename to src/kernel/resource/Resource.hpp
index fce350f..1d0e92e 100644 (file)
--- a/include/simgrid/kernel/resource/Resource.hpp
+++ b/src/kernel/resource/Resource.hpp
@@ -6,14 +6,14 @@
 #ifndef SIMGRID_KERNEL_RESOURCE_RESOURCE_HPP
 #define SIMGRID_KERNEL_RESOURCE_RESOURCE_HPP
 
+#include "simgrid/forward.h"
 #include "src/kernel/lmm/maxmin.hpp" // Constraint
 #include "src/kernel/resource/profile/Event.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include <simgrid/forward.h>
-#include <xbt/signal.hpp>
-#include <xbt/str.h>
-#include <xbt/utility.hpp>
+#include "xbt/signal.hpp"
+#include "xbt/str.h"
+#include "xbt/utility.hpp"
 
 #include <string>
 
@@ -26,9 +26,9 @@ namespace resource {
  * @details This is the ancestor class of every resources in SimGrid, such as links, CPU or disk
  */
 class XBT_PUBLIC Resource {
-  std::string name_ = "unnamed";
-  bool is_on_       = true;
-  bool sealed_      = false;
+  std::string name_            = "unnamed";
+  bool is_on_                  = true;
+  bool sealed_                 = false;
   profile::Event* state_event_ = nullptr;
 
 protected:

diff --git a/src/kernel/resource/profile/Profile_test.cpp b/src/kernel/resource/profile/Profile_test.cpp
index 137ed43..8d4671a 100644 (file)
--- a/src/kernel/resource/profile/Profile_test.cpp
+++ b/src/kernel/resource/profile/Profile_test.cpp
@@ -5,7 +5,7 @@
 
 #include "catch.hpp"
 
-#include "simgrid/kernel/resource/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"
 #include "src/kernel/resource/profile/DatedValue.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"

diff --git a/src/surf/LinkImplIntf.hpp b/src/surf/LinkImplIntf.hpp
index aac4b84..0f10e42 100644 (file)
--- a/src/surf/LinkImplIntf.hpp
+++ b/src/surf/LinkImplIntf.hpp
@@ -6,9 +6,9 @@
 #ifndef SIMGRID_KERNEL_RESOURCE_LINKIMPLINTF_HPP
 #define SIMGRID_KERNEL_RESOURCE_LINKIMPLINTF_HPP
 
-#include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Link.hpp"
-#include <xbt/PropertyHolder.hpp>
+#include "src/kernel/resource/Resource.hpp"
+#include "xbt/PropertyHolder.hpp"
 
 /***********
  * Classes *

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index e526adc..8cd60d0 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -7,9 +7,9 @@
 #define SURF_CPU_INTERFACE_HPP_
 
 #include "simgrid/kernel/resource/Model.hpp"
-#include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/resource/Resource.hpp"
 
 #include <list>
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 1f712a6..0f775b6 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -8,11 +8,11 @@
 
 #include "simgrid/kernel/resource/Model.hpp"
 #include "simgrid/kernel/resource/NetworkModelIntf.hpp"
-#include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/resource/Resource.hpp"
 #include "src/surf/LinkImpl.hpp"
-#include <xbt/PropertyHolder.hpp>
+#include "xbt/PropertyHolder.hpp"
 
 #include <list>
 #include <unordered_map>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index dae8efa..1ee79aa 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -313,6 +313,7 @@ set(SURF_SRC
   src/kernel/resource/Model.cpp
   src/kernel/resource/DiskImpl.cpp
   src/kernel/resource/DiskImpl.hpp
+  src/kernel/resource/Resource.hpp
 
   src/kernel/resource/profile/DatedValue.cpp
   src/kernel/resource/profile/DatedValue.hpp
@@ -724,7 +725,6 @@ set(headers_to_install
   include/simgrid/kernel/resource/Action.hpp
   include/simgrid/kernel/resource/NetworkModelIntf.hpp
   include/simgrid/kernel/resource/Model.hpp
-  include/simgrid/kernel/resource/Resource.hpp
 
   include/simgrid/kernel/routing/ClusterZone.hpp
   include/simgrid/kernel/routing/DijkstraZone.hpp