-/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2022. 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. */
#include "simgrid/s4u/Host.hpp"
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/remote/RemoteSimulation.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
using simgrid::mc::remote;
/** @file
* This is implemented by:
*
* - `model_checker->process.smx_process_infos`
- * (copy of `simix_global->process_list`);
- *
- * - `model_checker->process.smx_old_process_infos`
- * (copy of `simix_global->actors_to_destroy`);
+ * (copy of `EngineImpl::actor_list_`);
*
* - `model_checker->hostnames`.
*
/** Load the remote list of processes into a vector
*
* @param process MCed process
- * @param target Local vector (to be filled with copies of `s_smx_actor_t`)
+ * @param target Local vector (to be filled with `simgrid::mc::ActorInformation`)
* @param remote_dynar Address of the process dynar in the remote list
*/
-static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimulation* process,
+static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProcess* process,
std::vector<simgrid::mc::ActorInformation>& target,
simgrid::mc::RemotePtr<s_xbt_dynar_t> remote_dynar)
{
s_xbt_dynar_t dynar;
process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
- auto* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
+ auto* data = static_cast<simgrid::kernel::actor::ActorImpl**>(::operator new(dynar.elmsize * dynar.used));
process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr<void>(dynar.data));
// Load each element of the vector from the MCed process:
simgrid::mc::ActorInformation info;
info.address = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
- info.hostname = nullptr;
process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
target.push_back(std::move(info));
}
namespace simgrid {
namespace mc {
-void RemoteSimulation::refresh_simix()
+void RemoteProcess::refresh_simix()
{
- if (this->cache_flags_ & RemoteSimulation::cache_simix_processes)
+ 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<simgrid::simix::Global>,
- decltype(simix_global)
- >::value, "Unexpected type for simix_global");
- static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*),
- "Bad size for simix_global");
-
- RemotePtr<simgrid::simix::Global> simix_global_p{this->read_variable<simgrid::simix::Global*>("simix_global")};
-
- // simix_global = REMOTE(*simix_global)
- Remote<simgrid::simix::Global> simix_global =
- this->read<simgrid::simix::Global>(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_);
- this->cache_flags_ |= RemoteSimulation::cache_simix_processes;
+ this->cache_flags_ |= RemoteProcess::cache_simix_processes;
}
}