* under the terms of the license (GNU LGPL) which comes with this package. */
#include <cassert>
+#include <cstddef>
#include <cstdlib>
+#include <memory>
+#include <type_traits>
+#include <utility>
#include <vector>
#include <xbt/log.h>
#include <xbt/str.h>
#include <xbt/swag.h>
-#include "src/simix/smx_private.h"
+#include <simgrid/s4u/host.hpp>
+#include "src/simix/smx_private.h"
#include "src/mc/mc_smx.h"
#include "src/mc/ModelChecker.hpp"
using simgrid::mc::remote;
-/** HACK, Statically "upcast" a s_smx_process_t into a SimixProcessInformation
+/** HACK, Statically "upcast" a s_smx_actor_t into a SimixProcessInformation
*
* This gets 'processInfo' from '&processInfo->copy'. It upcasts in the
* sense that we could achieve the same thing by having SimixProcessInformation
- * inherit from s_smx_process_t but we don't really want to do that.
+ * inherit from s_smx_actor_t but we don't really want to do that.
*/
static inline
-simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p)
+simgrid::mc::SimixProcessInformation* process_info_cast(smx_actor_t p)
{
simgrid::mc::SimixProcessInformation temp;
std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;
/** Load the remote swag of processes into a vector
*
* @param process MCed process
- * @param target Local vector (to be filled with copies of `s_smx_process_t`)
+ * @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,
- std::vector<simgrid::mc::SimixProcessInformation>& target, xbt_swag_t remote_swag)
+ std::vector<simgrid::mc::SimixProcessInformation>& target,
+ simgrid::mc::RemotePtr<s_xbt_swag_t> remote_swag)
{
target.clear();
// swag = REMOTE(*simix_global->process_list)
s_xbt_swag_t swag;
- process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
+ process->read_bytes(&swag, sizeof(swag), remote_swag);
// Load each element of the vector from the MCed process:
int i = 0;
- for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
+ for (smx_actor_t p = (smx_actor_t) swag.head; p; ++i) {
simgrid::mc::SimixProcessInformation info;
info.address = p;
target.push_back(std::move(info));
// Lookup next process address:
- p = (smx_process_t) xbt_swag_getNext(&info.copy, swag.offset);
+ p = (smx_actor_t) xbt_swag_getNext(&info.copy, swag.offset);
}
assert(i == swag.count);
}
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
- // simix_global_p = REMOTE(simix_global);
- smx_global_t simix_global_p;
- this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
+ 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");
+
+ // simix_global_p = REMOTE(simix_global.get());
+ RemotePtr<simgrid::simix::Global> simix_global_p =
+ this->read_variable<simgrid::simix::Global*>("simix_global");
// simix_global = REMOTE(*simix_global)
- simgrid::simix::Global simix_global;
- this->read_bytes(&simix_global, sizeof(simix_global),
- remote(simix_global_p));
+ Remote<simgrid::simix::Global> simix_global =
+ this->read<simgrid::simix::Global>(simix_global_p);
MC_process_refresh_simix_process_list(
- this, this->smx_process_infos, simix_global.process_list);
+ this, this->smx_process_infos,
+ remote(simix_global.getBuffer()->process_list));
MC_process_refresh_simix_process_list(
- this, this->smx_old_process_infos, simix_global.process_to_destroy);
+ this, this->smx_old_process_infos,
+ remote(simix_global.getBuffer()->process_to_destroy));
this->cache_flags_ |= Process::cache_simix_processes;
}
* @param process the MCed process
* @param req the simcall (copied in the local process)
*/
-smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
+smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
{
xbt_assert(mc_model_checker != nullptr);
- // This is the address of the smx_process in the MCed process:
+ // This is the address of the smx_actor in the MCed process:
auto address = simgrid::mc::remote(req->issuer);
// Lookup by address:
xbt_die("Issuer not found");
}
-const char* MC_smx_process_get_host_name(smx_process_t p)
+const char* MC_smx_process_get_host_name(smx_actor_t p)
{
if (mc_model_checker == nullptr)
- return sg_host_get_name(p->host);
+ return p->host->cname();
simgrid::mc::Process* process = &mc_model_checker->process();
simgrid::xbt::string_data remote_string = process->read(remote_string_address);
char hostname[remote_string.len];
process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
- info->hostname = mc_model_checker->get_host_name(hostname);
+ info->hostname = mc_model_checker->get_host_name(hostname).c_str();
return info->hostname;
}
-const char* MC_smx_process_get_name(smx_process_t p)
+const char* MC_smx_process_get_name(smx_actor_t p)
{
simgrid::mc::Process* process = &mc_model_checker->process();
if (mc_model_checker == nullptr)
