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(
// 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);
}
* @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);
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)