align file position to the C++ namespaces

diff --git a/src/kernel/resource/Resource.cpp b/src/kernel/resource/Resource.cpp
index 0a448db..b975e92 100644 (file)
--- a/src/kernel/resource/Resource.cpp
+++ b/src/kernel/resource/Resource.cpp
@@ -5,8 +5,8 @@
 
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "src/kernel/lmm/maxmin.hpp" // Constraint
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/surf/trace_mgr.cpp b/src/kernel/resource/profile/trace_mgr.cpp
similarity index 98%
rename from src/surf/trace_mgr.cpp
rename to src/kernel/resource/profile/trace_mgr.cpp
index 037b89e..c7091a0 100644 (file)
--- a/src/surf/trace_mgr.cpp
+++ b/src/kernel/resource/profile/trace_mgr.cpp
@@ -3,12 +3,11 @@
 /* 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 "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/sysdep.h"
 
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
-#include "surf_private.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -60,7 +59,7 @@ FutureEvtSet::~FutureEvtSet()
 
 simgrid::kernel::profile::Profile* tmgr_trace_new_from_string(std::string name, std::string input, double periodicity)
 {
-  int linecount = 0;
+  int linecount                                    = 0;
   simgrid::kernel::profile::Profile* trace         = new simgrid::kernel::profile::Profile();
   simgrid::kernel::profile::DatedValue* last_event = &(trace->event_list.back());
 

diff --git a/src/surf/trace_mgr.hpp b/src/kernel/resource/profile/trace_mgr.hpp
similarity index 99%
rename from src/surf/trace_mgr.hpp
rename to src/kernel/resource/profile/trace_mgr.hpp
index fe48da2..e684228 100644 (file)
--- a/src/surf/trace_mgr.hpp
+++ b/src/kernel/resource/profile/trace_mgr.hpp
@@ -25,7 +25,7 @@ public:
   bool free_me;
 };
 
-} // namespace resource
+} // namespace profile
 } // namespace kernel
 } // namespace simgrid
 extern XBT_PRIVATE simgrid::kernel::profile::FutureEvtSet future_evt_set;

diff --git a/src/surf/trace_mgr_test.cpp b/src/kernel/resource/profile/trace_mgr_test.cpp
similarity index 99%
rename from src/surf/trace_mgr_test.cpp
rename to src/kernel/resource/profile/trace_mgr_test.cpp
index 610657d..5392035 100644 (file)
--- a/src/surf/trace_mgr_test.cpp
+++ b/src/kernel/resource/profile/trace_mgr_test.cpp
@@ -7,8 +7,8 @@
 #include "src/include/catch.hpp"
 
 #include "simgrid/kernel/resource/Resource.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 #include "xbt/log.h"
 #include "xbt/misc.h"

diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp
index 182b9e2..bb65ba4 100644 (file)
--- a/src/surf/StorageImpl.hpp
+++ b/src/surf/StorageImpl.hpp
@@ -8,8 +8,8 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/PropertyHolder.hpp"
-#include "src/surf/trace_mgr.hpp"
 #include "surf_interface.hpp"
 
 #include <map>

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 38ccfc9..74bd125 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -10,7 +10,7 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/trace_mgr.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 
 #include <list>
 

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 9a08026..4f25126 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_ti.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 #include "surf/surf.hpp"
 
 #define EPSILON 0.000000001

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index fcbdbdd..2e9ec6d 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -6,8 +6,8 @@
 #ifndef SURF_MODEL_CPUTI_H_
 #define SURF_MODEL_CPUTI_H_
 
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 #include <boost/intrusive/list.hpp>
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index fda1a61..6cc74b2 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -10,8 +10,8 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/PropertyHolder.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 #include <list>
 #include <unordered_map>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4128383..c6b9e8f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -313,6 +313,8 @@ set(SURF_SRC
   src/kernel/resource/Action.cpp
   src/kernel/resource/Model.cpp
   src/kernel/resource/Resource.cpp
+  src/kernel/resource/profile/trace_mgr.hpp
+  src/kernel/resource/profile/trace_mgr.cpp
 
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/DijkstraZone.cpp
@@ -346,8 +348,6 @@ set(SURF_SRC
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
   src/surf/xml/surfxml_parseplatf.cpp
-  src/surf/trace_mgr.hpp
-  src/surf/trace_mgr.cpp
   src/surf/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 8f40b96..8ef455f 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -121,7 +121,7 @@ IF(SIMGRID_HAVE_LUA)
 ENDIF()
 
 # New tests should use the Catch Framework
-set(UNIT_TESTS  src/surf/trace_mgr_test.cpp
+set(UNIT_TESTS  src/kernel/resource/profile/trace_mgr_test.cpp
                 src/xbt/config_test.cpp
                 src/xbt/dict_test.cpp
                 src/xbt/dynar_test.cpp