From 801817fee1842a25f3155c0426c96761a4e312ee Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 11 Mar 2018 18:47:27 +0100 Subject: [PATCH] move files in k/resources/ accordingly to their namespace --- src/kernel/{model => resource}/Resource.cpp | 4 ++-- src/kernel/{model => resource}/Resource.hpp | 2 +- src/s4u/s4u_storage.cpp | 4 ++-- src/surf/StorageImpl.hpp | 4 ++-- src/surf/cpu_interface.hpp | 2 +- src/surf/network_interface.hpp | 2 +- src/surf/surf_interface.hpp | 2 +- src/surf/trace_mgr_test.cpp | 2 +- tools/cmake/DefinePackages.cmake | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/kernel/{model => resource}/Resource.cpp (94%) rename src/kernel/{model => resource}/Resource.hpp (99%) 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 6367a23812..6016ae4f80 100644 --- 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. */ -#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" @@ -67,6 +67,6 @@ kernel::lmm::Constraint* Resource::constraint() const return const_cast(constraint_); } -} // namespace model +} // namespace resource } // 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 4bdbfe2b65..96a56af6d3 100644 --- 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 */ }; }; -} // namespace model +} // namespace resource } // namespace kernel } // namespace simgrid diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index 983b597ddc..a351ae469e 100644 --- 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. */ @@ -7,7 +7,7 @@ #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 diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index b877e349ca..c3b1d0f3ec 100644 --- 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 @@ -8,7 +8,7 @@ #include #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 diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index b0ff040f28..1082ea2fc3 100644 --- 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 "src/kernel/model/Resource.hpp" +#include "src/kernel/resource/Resource.hpp" #include diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index b17ddad992..681706d9e2 100644 --- 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 "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" diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 6f6cdce401..e10c1e5934 100644 --- 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. */ diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp index d9a54b30ca..22eb441363 100644 --- 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 -#include "src/kernel/model/Resource.hpp" +#include "src/kernel/resource/Resource.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 2778eb8417..895f918f29 100644 --- 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/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 -- 2.20.1