X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ef49c428ab0209965a09a36ab28b59789aaa4b5..c2f951e38bdf2b8639bf42b78b69c1530510b6f0:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 0bcc7ea4ec..c37252a531 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -31,7 +31,7 @@ static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) * @param target Local vector (to be filled with copies of `s_smx_actor_t`) * @param remote_swag Address of the process SWAG in the remote list */ -static void MC_process_refresh_simix_process_list(simgrid::mc::Process* process, +static void MC_process_refresh_simix_process_list(simgrid::mc::RemoteClient* process, std::vector& target, simgrid::mc::RemotePtr remote_swag) { @@ -57,7 +57,7 @@ static void MC_process_refresh_simix_process_list(simgrid::mc::Process* process, assert(i == swag.count); } -static void MC_process_refresh_simix_actor_dynar(simgrid::mc::Process* process, +static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* process, std::vector& target, simgrid::mc::RemotePtr remote_dynar) { @@ -83,9 +83,9 @@ static void MC_process_refresh_simix_actor_dynar(simgrid::mc::Process* process, namespace simgrid { namespace mc { -void Process::refresh_simix() +void RemoteClient::refresh_simix() { - if (this->cache_flags_ & Process::cache_simix_processes) + if (this->cache_flags_ & RemoteClient::cache_simix_processes) return; // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` @@ -97,7 +97,6 @@ void Process::refresh_simix() static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*), "Bad size for simix_global"); - // simix_global_p = REMOTE(simix_global.get()); RemotePtr simix_global_p = this->read_variable("simix_global"); @@ -109,7 +108,7 @@ void Process::refresh_simix() MC_process_refresh_simix_process_list(this, this->smx_dead_actors_infos, remote(simix_global.getBuffer()->process_to_destroy)); - this->cache_flags_ |= Process::cache_simix_processes; + this->cache_flags_ |= RemoteClient::cache_simix_processes; } } @@ -147,7 +146,7 @@ const char* MC_smx_actor_get_host_name(smx_actor_t actor) if (mc_model_checker == nullptr) return actor->host->getCname(); - simgrid::mc::Process* process = &mc_model_checker->process(); + simgrid::mc::RemoteClient* process = &mc_model_checker->process(); /* HACK, Horrible hack to find the offset of the id in the simgrid::s4u::Host. @@ -179,7 +178,7 @@ const char* MC_smx_actor_get_host_name(smx_actor_t actor) const char* MC_smx_actor_get_name(smx_actor_t actor) { - simgrid::mc::Process* process = &mc_model_checker->process(); + simgrid::mc::RemoteClient* process = &mc_model_checker->process(); if (mc_model_checker == nullptr) return actor->name.c_str();