From: Frederic Suter Date: Tue, 12 Mar 2019 13:53:57 +0000 (+0100) Subject: mv ActorImpl where it belongs X-Git-Tag: v3_22~117 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b9945098e2ba4e7b639e0c2245835d44800c1b29?hp=27fe833c49802fa5fbb1e44dc7b99d119fe3aa4b mv ActorImpl where it belongs --- diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 26906a4f3c..c893103d51 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -12,7 +12,6 @@ #include "jmsg_host.h" #include "jxbt_utilities.hpp" #include "simgrid/Exception.hpp" -#include "src/simix/ActorImpl.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp index 9595782c41..22710cfb97 100644 --- a/src/kernel/activity/CommImpl.hpp +++ b/src/kernel/activity/CommImpl.hpp @@ -7,7 +7,7 @@ #define SIMGRID_KERNEL_ACTIVITY_COMM_HPP #include "src/kernel/activity/ActivityImpl.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "surf/surf.hpp" diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp index 772fdcca72..6749e7821f 100644 --- a/src/kernel/activity/ConditionVariableImpl.hpp +++ b/src/kernel/activity/ConditionVariableImpl.hpp @@ -7,7 +7,7 @@ #define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP #include "simgrid/s4u/ConditionVariable.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include namespace simgrid { diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index 53043fc70b..97b7576fe2 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -11,7 +11,7 @@ #include "simgrid/s4u/Mailbox.hpp" #include "src/kernel/activity/CommImpl.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp index 52256b0878..37846cbd1c 100644 --- a/src/kernel/activity/MutexImpl.hpp +++ b/src/kernel/activity/MutexImpl.hpp @@ -7,7 +7,7 @@ #define SIMIX_MUTEXIMPL_HPP #include "simgrid/s4u/ConditionVariable.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include namespace simgrid { diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index 1b255a8fc1..b528e0eb7e 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -10,7 +10,7 @@ #include #include "simgrid/s4u/Semaphore.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index 25ff77d000..8735baf348 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -8,7 +8,6 @@ #include "simgrid/kernel/resource/Action.hpp" #include "simgrid/s4u/Host.hpp" #include "src/kernel/context/Context.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/simix/popping_private.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/cpu_interface.hpp" diff --git a/src/simix/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp similarity index 99% rename from src/simix/ActorImpl.cpp rename to src/kernel/actor/ActorImpl.cpp index e0ec997686..9e386fa15f 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -7,7 +7,6 @@ #include "simgrid/Exception.hpp" #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" -#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/IoImpl.hpp" @@ -15,6 +14,7 @@ #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.hpp" #include "src/mc/remote/Client.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" @@ -43,7 +43,8 @@ smx_actor_t SIMIX_process_self() * @return true if there are asynchronous communications in this process * @deprecated */ -int SIMIX_process_has_pending_comms(smx_actor_t process) { +int SIMIX_process_has_pending_comms(smx_actor_t process) +{ return process->comms.size() > 0; } @@ -54,7 +55,7 @@ namespace actor { ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this) { - pid_ = simix_process_maxpid++; + pid_ = simix_process_maxpid++; simcall.issuer = this; } @@ -523,7 +524,7 @@ void create_maestro(const std::function& code) } // namespace actor } // namespace kernel -} +} // namespace simgrid void SIMIX_process_detach() { @@ -602,7 +603,8 @@ void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) /* If we are suspending ourselves, then just do not finish the simcall now */ } -int SIMIX_process_get_maxpid() { +int SIMIX_process_get_maxpid() +{ return simix_process_maxpid; } @@ -626,10 +628,10 @@ void SIMIX_process_self_set_data(void* data) // deprecated SIMIX_process_self()->set_user_data(data); } - /* needs to be public and without simcall because it is called by exceptions and logging events */ -const char* SIMIX_process_self_get_name() { +const char* SIMIX_process_self_get_name() +{ smx_actor_t process = SIMIX_process_self(); if (process == nullptr || process == simix_global->maestro_process) diff --git a/src/simix/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp similarity index 99% rename from src/simix/ActorImpl.hpp rename to src/kernel/actor/ActorImpl.hpp index 994afa1820..3dc922455b 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -17,7 +17,7 @@ struct s_smx_process_exit_fun_t { std::function fun; - void *arg; + void* arg; }; namespace simgrid { diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index ccc04209b2..822681552c 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -6,8 +6,8 @@ #include "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" #include "src/internal_config.h" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/context/context_private.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.hpp" #include "xbt/parmap.hpp" diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index 88b2bdb525..70a87d20ca 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -9,8 +9,8 @@ #include "mc/mc.h" #include "simgrid/Exception.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/mc/mc_ignore.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.hpp" #include "ContextUnix.hpp" diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 0dfb9f89b7..c9b5ba6593 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -26,7 +26,7 @@ #include #endif -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #if SIMGRID_HAVE_MC #include "src/mc/checker/Checker.hpp" diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index cdc1151fac..dd19a66a5d 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -9,7 +9,6 @@ #include "src/mc/Transition.hpp" #include "src/mc/mc_base.h" #include "src/mc/mc_replay.hpp" -#include "src/simix/ActorImpl.hpp" #if SIMGRID_HAVE_MC #include "src/mc/checker/Checker.hpp" diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 803ec9fbfc..3098d59004 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -5,7 +5,6 @@ #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/include/surf/surf.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "xbt/asserts.h" // xbt_log_no_loc diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp index f50b41380e..2e2bce5364 100644 --- a/src/plugins/vm/VirtualMachineImpl.hpp +++ b/src/plugins/vm/VirtualMachineImpl.hpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/VirtualMachine.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/surf/HostImpl.hpp" #include #include diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index a841ac44ac..5ef382122e 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/msg/msg_private.hpp" -#include "src/simix/ActorImpl.hpp" #include "xbt/log.h" #include "simgrid/Exception.hpp" diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index ce23e8fde2..d6a15bb23b 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -7,8 +7,8 @@ #define SIMIX_PRIVATE_HPP #include "simgrid/s4u/Actor.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/context/Context.hpp" -#include "src/simix/ActorImpl.hpp" #include #include diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 49b2b370ee..43cbdb8c3a 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -10,7 +10,7 @@ #include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_status.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/smpi/include/smpi_actor.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)"); diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index c6af1236e0..af6cf7817b 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -11,7 +11,6 @@ #include "smpi_comm.hpp" #include "src/internal_config.h" #include "src/mc/mc_replay.hpp" -#include "src/simix/ActorImpl.hpp" #include "xbt/config.hpp" #include "src/smpi/include/smpi_actor.hpp" diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index 5bbd84ea23..8826c7cdaf 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -15,7 +15,6 @@ #include "smpi_op.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/smpi/include/smpi_actor.hpp" #include "xbt/config.hpp" diff --git a/src/smpi/plugins/sampi_loadbalancer.cpp b/src/smpi/plugins/sampi_loadbalancer.cpp index 3e8d4b626f..3880e19728 100644 --- a/src/smpi/plugins/sampi_loadbalancer.cpp +++ b/src/smpi/plugins/sampi_loadbalancer.cpp @@ -14,7 +14,7 @@ #include #include "src/kernel/activity/ExecImpl.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/smpi/plugins/load_balancer/load_balancer.hpp" // This is not yet ready to be public XBT_LOG_NEW_DEFAULT_SUBCATEGORY(plugin_load_balancer, smpi, "Logging specific to the SMPI load balancing plugin"); diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index d1fff38817..628569bf2d 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -6,11 +6,11 @@ #ifndef SURF_HOST_INTERFACE_HPP_ #define SURF_HOST_INTERFACE_HPP_ -#include "StorageImpl.hpp" -#include "cpu_interface.hpp" -#include "network_interface.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/surf/PropertyHolder.hpp" +#include "src/surf/StorageImpl.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/network_interface.hpp" #include diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 64fa920ad5..92ef0ddad7 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -383,8 +383,6 @@ set(SIMIX_SRC src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp - src/simix/ActorImpl.cpp - src/simix/ActorImpl.hpp src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp @@ -406,6 +404,8 @@ set(SIMIX_SRC src/kernel/activity/SleepImpl.hpp src/kernel/activity/SynchroRaw.cpp src/kernel/activity/SynchroRaw.hpp + src/kernel/actor/ActorImpl.cpp + src/kernel/actor/ActorImpl.hpp ${SIMIX_GENERATED_SRC} )