From: Martin Quinson Date: Fri, 17 Feb 2023 22:02:54 +0000 (+0100) Subject: Move HostImpl to kernel/resource with its friends X-Git-Tag: v3.34~512 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5dfff0d610d01d61458294991d8793dc3bdbf1a7 Move HostImpl to kernel/resource with its friends --- diff --git a/MANIFEST.in b/MANIFEST.in index 54f77594bf..47e097be08 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2054,6 +2054,8 @@ include src/kernel/resource/DiskImpl.cpp include src/kernel/resource/DiskImpl.hpp include src/kernel/resource/FactorSet.cpp include src/kernel/resource/FactorSet.hpp +include src/kernel/resource/HostImpl.cpp +include src/kernel/resource/HostImpl.hpp include src/kernel/resource/LinkImpl.hpp include src/kernel/resource/Model.cpp include src/kernel/resource/NetworkModel.cpp @@ -2431,8 +2433,6 @@ include src/smpi/smpitools.sh include src/sthread/sthread.c include src/sthread/sthread.h include src/sthread/sthread_impl.cpp -include src/surf/HostImpl.cpp -include src/surf/HostImpl.hpp include src/surf/ns3/ns3_simulator.cpp include src/surf/ns3/ns3_simulator.hpp include src/surf/sg_platf.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 789082c1e3..cbbeb72833 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -12,8 +12,8 @@ #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/surf/HostImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_cpu, kernel, "Kernel cpu-related synchronization"); diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index 21b55c90ed..89bd70cd50 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -14,8 +14,8 @@ #include "src/kernel/actor/SimcallObserver.hpp" #include "src/kernel/resource/CpuImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/surf/HostImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_io, kernel, "Kernel io-related synchronization"); diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 148982feb9..8b0ccf736b 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -12,7 +12,7 @@ #if HAVE_SMPI #include "src/smpi/include/private.hpp" #endif -#include "src/surf/HostImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include #include diff --git a/src/surf/HostImpl.cpp b/src/kernel/resource/HostImpl.cpp similarity index 98% rename from src/surf/HostImpl.cpp rename to src/kernel/resource/HostImpl.cpp index f07e935f24..4dd7089bbf 100644 --- a/src/surf/HostImpl.cpp +++ b/src/kernel/resource/HostImpl.cpp @@ -7,9 +7,9 @@ #include #include -#include "xbt/asserts.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/VirtualMachineImpl.hpp" +#include "xbt/asserts.hpp" #include @@ -29,7 +29,8 @@ namespace simgrid::kernel::resource { ************/ HostImpl::HostImpl(const std::string& name) : piface_(this), name_(name) { - xbt_enforce(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); + xbt_enforce(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", + get_cname()); } HostImpl::~HostImpl() diff --git a/src/surf/HostImpl.hpp b/src/kernel/resource/HostImpl.hpp similarity index 95% rename from src/surf/HostImpl.hpp rename to src/kernel/resource/HostImpl.hpp index 8690555fd2..eda907d191 100644 --- a/src/surf/HostImpl.hpp +++ b/src/kernel/resource/HostImpl.hpp @@ -29,7 +29,8 @@ public: virtual Action* execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, double rate) = 0; - virtual Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) = 0; + virtual Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, + double size) = 0; }; /************ @@ -52,7 +53,7 @@ class XBT_PRIVATE HostImpl : public xbt::PropertyHolder, public actor::ObjectAcc std::map> vms_; std::string name_{"noname"}; routing::NetZoneImpl* englobing_zone_ = nullptr; - bool sealed_ = false; + bool sealed_ = false; protected: virtual ~HostImpl(); // Use destroy() instead of this destructor. diff --git a/src/kernel/resource/VirtualMachineImpl.hpp b/src/kernel/resource/VirtualMachineImpl.hpp index 93bc7044be..1b8882be3c 100644 --- a/src/kernel/resource/VirtualMachineImpl.hpp +++ b/src/kernel/resource/VirtualMachineImpl.hpp @@ -5,7 +5,7 @@ #include -#include "src/surf/HostImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #ifndef VM_INTERFACE_HPP_ #define VM_INTERFACE_HPP_ diff --git a/src/kernel/resource/models/host_clm03.hpp b/src/kernel/resource/models/host_clm03.hpp index 61603cc47f..65715c4d36 100644 --- a/src/kernel/resource/models/host_clm03.hpp +++ b/src/kernel/resource/models/host_clm03.hpp @@ -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/surf/HostImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #ifndef HOST_CLM03_HPP_ #define HOST_CLM03_HPP_ diff --git a/src/kernel/resource/models/network_ib.cpp b/src/kernel/resource/models/network_ib.cpp index f4d044bc29..75b454b0f7 100644 --- a/src/kernel/resource/models/network_ib.cpp +++ b/src/kernel/resource/models/network_ib.cpp @@ -8,8 +8,8 @@ #include "simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/kernel/resource/models/network_ib.hpp" -#include "src/surf/HostImpl.hpp" #include #include diff --git a/src/kernel/resource/models/ptask_L07.hpp b/src/kernel/resource/models/ptask_L07.hpp index 072c879bec..d7db18fcfb 100644 --- a/src/kernel/resource/models/ptask_L07.hpp +++ b/src/kernel/resource/models/ptask_L07.hpp @@ -3,8 +3,8 @@ /* 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/resource/HostImpl.hpp" #include "src/kernel/resource/NetworkModel.hpp" -#include "src/surf/HostImpl.hpp" #include #include #include diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 57db71f7c6..14c1b88050 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -9,16 +9,16 @@ #include #include -#include "xbt/asserts.hpp" #include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/CpuImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/kernel/resource/NetworkModel.hpp" #include "src/kernel/resource/SplitDuplexLinkImpl.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/kernel/resource/VirtualMachineImpl.hpp" -#include "src/surf/HostImpl.hpp" +#include "xbt/asserts.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_platform, kernel, "Kernel platform-related information"); diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index f488c35eb2..13cf3c9e47 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -14,8 +14,8 @@ #include "src/include/mc/mc.h" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/surf/HostImpl.hpp" #include diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index d994ec074c..a919d88b66 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -12,11 +12,11 @@ #include "mc/mc.h" #include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/kernel/resource/NetworkModel.hpp" #include "src/kernel/resource/SplitDuplexLinkImpl.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/surf/HostImpl.hpp" #include "xbt/config.hpp" #include diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index bfd02d9343..ba4a844e81 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -14,9 +14,9 @@ #include #include "simgrid/simix.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/kernel/resource/VirtualMachineImpl.hpp" -#include "src/surf/HostImpl.hpp" #include diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index 4fffa24fb0..ba3cf8100b 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -10,8 +10,8 @@ #include "smpi_info.hpp" #include "smpi_request.hpp" #include "smpi_win.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/smpi/include/smpi_actor.hpp" -#include "src/surf/HostImpl.hpp" #include diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 9f2a198685..589285f4eb 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -21,8 +21,8 @@ #include "simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" +#include "src/kernel/resource/HostImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" -#include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" #include "src/surf/xml/platf_private.hpp" diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 4c431745ce..e2b8ac2557 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -15,6 +15,7 @@ set(EXTRA_DIST src/include/xbt/xbt_modinter.h src/include/xxhash.hpp src/kernel/actor/Simcall.hpp + src/kernel/resource/HostImpl.hpp src/kernel/resource/LinkImpl.hpp src/kernel/resource/NetworkModel.hpp src/kernel/resource/NetworkModelFactors.hpp @@ -41,7 +42,6 @@ set(EXTRA_DIST src/smpi/include/smpi_utils.hpp src/smpi/smpi_main.c src/smpi/smpi_replay_main.cpp - src/surf/HostImpl.hpp src/surf/surf_interface.hpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.c @@ -315,6 +315,7 @@ set(SURF_SRC src/kernel/resource/DiskImpl.hpp src/kernel/resource/FactorSet.cpp src/kernel/resource/FactorSet.hpp + src/kernel/resource/HostImpl.cpp src/kernel/resource/Model.cpp src/kernel/resource/NetworkModel.cpp src/kernel/resource/NetworkModelFactors.cpp @@ -359,7 +360,6 @@ set(SURF_SRC src/kernel/timer/Timer.cpp - src/surf/HostImpl.cpp src/surf/sg_platf.cpp src/surf/xml/platf.hpp src/surf/xml/platf_private.hpp