move files in k/resources/ accordingly to their namespace

diff --git a/src/kernel/model/Resource.cpp b/src/kernel/resource/Resource.cpp
similarity index 94%
rename from src/kernel/model/Resource.cpp
rename to src/kernel/resource/Resource.cpp
index 6367a23..6016ae4 100644 (file)
--- a/src/kernel/model/Resource.cpp
+++ b/src/kernel/resource/Resource.cpp
@@ -3,7 +3,7 @@
 /* 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. */
 
 /* 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 "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 #include "src/kernel/lmm/maxmin.hpp" // Constraint
 #include "src/surf/surf_interface.hpp"
 
 #include "src/kernel/lmm/maxmin.hpp" // Constraint
 #include "src/surf/surf_interface.hpp"
 


@@ -67,6 +67,6 @@ kernel::lmm::Constraint* Resource::constraint() const
   return const_cast<kernel::lmm::Constraint*>(constraint_);
 }
 
   return const_cast<kernel::lmm::Constraint*>(constraint_);
 }
 

-} // namespace model
+} // namespace resource

 } // namespace kernel
 } // namespace simgrid
 } // namespace kernel
 } // namespace simgrid

diff --git a/src/kernel/model/Resource.hpp b/src/kernel/resource/Resource.hpp
similarity index 99%
rename from src/kernel/model/Resource.hpp
rename to src/kernel/resource/Resource.hpp
index 4bdbfe2..96a56af 100644 (file)
--- a/src/kernel/model/Resource.hpp
+++ b/src/kernel/resource/Resource.hpp
@@ -81,7 +81,7 @@ protected:
     tmgr_trace_event_t event; /**< The associated trace event associated to the metric */
   };
 };
     tmgr_trace_event_t event; /**< The associated trace event associated to the metric */
   };
 };

-} // namespace model
+} // namespace resource

 } // namespace kernel
 } // namespace simgrid
 
 } // namespace kernel
 } // namespace simgrid
 

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 983b597..a351ae4 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -1,4 +1,4 @@
-/* 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. */
 
 /* 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. */


@@ -7,7 +7,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"

-#include "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 #include "src/plugins/file_system/FileSystem.hpp"
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 #include "src/plugins/file_system/FileSystem.hpp"
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>

diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp
index b877e34..c3b1d0f 100644 (file)
--- a/src/surf/StorageImpl.hpp
+++ b/src/surf/StorageImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team.
+/* Copyright (c) 2004-2018. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -8,7 +8,7 @@
 #include <xbt/signal.hpp>
 
 #include "simgrid/s4u/Storage.hpp"
 #include <xbt/signal.hpp>
 
 #include "simgrid/s4u/Storage.hpp"

-#include "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 #include "src/surf/PropertyHolder.hpp"
 #include "surf_interface.hpp"
 #include <map>
 #include "src/surf/PropertyHolder.hpp"
 #include "surf_interface.hpp"
 #include <map>

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index b0ff040..1082ea2 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -8,7 +8,7 @@
 
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

-#include "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 
 #include <list>
 
 
 #include <list>
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index b17ddad..681706d 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -8,7 +8,7 @@
 
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

-#include "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 #include "src/surf/PropertyHolder.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/base.h"
 #include "src/surf/PropertyHolder.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/base.h"

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 6f6cdce..e10c1e5 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
 
 /* 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. */

diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp
index d9a54b3..22eb441 100644 (file)
--- a/src/surf/trace_mgr_test.cpp
+++ b/src/surf/trace_mgr_test.cpp
@@ -9,7 +9,7 @@ bool init_unit_test(); // boost forget to give this prototype on NetBSD, which d
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 

-#include "src/kernel/model/Resource.hpp"
+#include "src/kernel/resource/Resource.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 2778eb8..895f918 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -303,8 +303,8 @@ set(SURF_SRC
   src/kernel/lmm/maxmin.hpp
   src/kernel/lmm/maxmin.cpp
   
   src/kernel/lmm/maxmin.hpp
   src/kernel/lmm/maxmin.cpp
   

-  src/kernel/model/Resource.hpp
-  src/kernel/model/Resource.cpp
+  src/kernel/resource/Resource.hpp
+  src/kernel/resource/Resource.cpp

   
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/ClusterZone.hpp
   
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/ClusterZone.hpp