X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09abefeb928cd7ea4679407a6b4387d4f75beaa9..67c7181f9993f11534086e9f9e4f2f42408731f3:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index abb9d42c86..e50304986a 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -16,10 +16,10 @@ using simgrid::mc::remote; * This is implemented by: * * - `model_checker->process.smx_process_infos` - * (copy of `simix_global->process_list`); + * (copy of `EngineImpl::actor_list_`); * * - `model_checker->process.smx_old_process_infos` - * (copy of `simix_global->actors_to_destroy`); + * (copy of `EngineImpl::actors_to_destroy_`); * * - `model_checker->hostnames`. * @@ -52,7 +52,6 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces simgrid::mc::ActorInformation info; info.address = simgrid::mc::RemotePtr(data[i]); - info.hostname = nullptr; process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i])); target.push_back(std::move(info)); } @@ -66,24 +65,8 @@ void RemoteProcess::refresh_simix() if (this->cache_flags_ & RemoteProcess::cache_simix_processes) return; - // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` - - static_assert(std::is_same< - std::unique_ptr, - decltype(simix_global) - >::value, "Unexpected type for simix_global"); - static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*), - "Bad size for simix_global"); - - RemotePtr simix_global_p{this->read_variable("simix_global")}; - - // simix_global = REMOTE(*simix_global) - Remote simix_global = - this->read(simix_global_p); - - MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.get_buffer()->actors_vector)); - MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, - remote(simix_global.get_buffer()->dead_actors_vector)); + MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, actors_addr_); + MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, dead_actors_addr_); this->cache_flags_ |= RemoteProcess::cache_simix_processes; }