-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "mc_record.h"
#include "mc_smx.h"
#include "mc_client.h"
+#include "mc_exit.h"
+
+using simgrid::mc::remote;
extern "C" {
static void update_comm_pattern(mc_comm_pattern_t comm_pattern, smx_synchro_t comm_addr)
{
s_smx_synchro_t comm;
- MC_process_read_simple(&mc_model_checker->process(),
- &comm, comm_addr, sizeof(comm));
+ mc_model_checker->process().read(&comm, remote(comm_addr));
smx_process_t src_proc = MC_smx_resolve_process(comm.comm.src_proc);
smx_process_t dst_proc = MC_smx_resolve_process(comm.comm.dst_proc);
comm_pattern->dst_host = MC_smx_process_get_host_name(dst_proc);
if (comm_pattern->data_size == -1 && comm.comm.src_buff != NULL) {
size_t buff_size;
- MC_process_read_simple(&mc_model_checker->process(),
- &buff_size, comm.comm.dst_buff_size, sizeof(buff_size));
+ mc_model_checker->process().read(
+ &buff_size, remote(comm.comm.dst_buff_size));
comm_pattern->data_size = buff_size;
comm_pattern->data = xbt_malloc0(comm_pattern->data_size);
- MC_process_read_simple(&mc_model_checker->process(),
- comm_pattern->data, comm.comm.src_buff, comm_pattern->data_size);
+ mc_model_checker->process().read_bytes(
+ comm_pattern->data, comm_pattern->data_size,
+ remote(comm.comm.src_buff));
}
}
xbt_free(initial_global_state->send_diff);
initial_global_state->send_diff = NULL;
MC_print_statistics(mc_stats);
- xbt_abort();
+ exit(SIMGRID_EXIT_NON_DETERMINISM);
}else if(_sg_mc_comms_determinism && (!initial_global_state->send_deterministic && !initial_global_state->recv_deterministic)) {
XBT_INFO("****************************************************");
XBT_INFO("***** Non-deterministic communications pattern *****");
xbt_free(initial_global_state->recv_diff);
initial_global_state->recv_diff = NULL;
MC_print_statistics(mc_stats);
- xbt_abort();
+ exit(SIMGRID_EXIT_NON_DETERMINISM);
}
}
}
pattern->type = SIMIX_COMM_SEND;
pattern->comm_addr = simcall_comm_isend__get__result(request);
- s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process(),
- &synchro, pattern->comm_addr, sizeof(synchro));
+ s_smx_synchro_t synchro = mc_model_checker->process().read<s_smx_synchro_t>(
+ (std::uint64_t) pattern->comm_addr);
- char* remote_name;
- MC_process_read_simple(&mc_model_checker->process(), &remote_name,
- synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name,
- sizeof(remote_name));
- pattern->rdv =
- MC_process_read_string(&mc_model_checker->process(), remote_name);
+ char* remote_name = mc_model_checker->process().read<char*>(
+ (std::uint64_t)(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
+ pattern->rdv = mc_model_checker->process().read_string(remote_name);
pattern->src_proc = MC_smx_resolve_process(synchro.comm.src_proc)->pid;
pattern->src_host = MC_smx_process_get_host_name(issuer);
- struct s_smpi_mpi_request mpi_request;
- MC_process_read_simple(&mc_model_checker->process(),
- &mpi_request, (MPI_Request) simcall_comm_isend__get__data(request),
- sizeof(mpi_request));
+ struct s_smpi_mpi_request mpi_request =
+ mc_model_checker->process().read<s_smpi_mpi_request>(
+ (std::uint64_t) simcall_comm_isend__get__data(request));
pattern->tag = mpi_request.tag;
if(synchro.comm.src_buff != NULL){
pattern->data_size = synchro.comm.src_buff_size;
pattern->data = xbt_malloc0(pattern->data_size);
- MC_process_read_simple(&mc_model_checker->process(),
- pattern->data, synchro.comm.src_buff, pattern->data_size);
+ mc_model_checker->process().read_bytes(
+ pattern->data, pattern->data_size, remote(synchro.comm.src_buff));
}
if(mpi_request.detached){
if (!initial_global_state->initial_communications_pattern_done) {
pattern->comm_addr = simcall_comm_irecv__get__result(request);
struct s_smpi_mpi_request mpi_request;
- MC_process_read_simple(&mc_model_checker->process(),
- &mpi_request, (MPI_Request) simcall_comm_irecv__get__data(request),
- sizeof(mpi_request));
+ mc_model_checker->process().read(
+ &mpi_request, remote((struct s_smpi_mpi_request*)simcall_comm_irecv__get__data(request)));
pattern->tag = mpi_request.tag;
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process(),
- &synchro, pattern->comm_addr, sizeof(synchro));
+ mc_model_checker->process().read(&synchro, remote(pattern->comm_addr));
char* remote_name;
- MC_process_read_simple(&mc_model_checker->process(), &remote_name,
- synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name,
- sizeof(remote_name));
- pattern->rdv =
- MC_process_read_string(&mc_model_checker->process(), remote_name);
+ mc_model_checker->process().read(&remote_name,
+ remote(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
+ pattern->rdv = mc_model_checker->process().read_string(remote_name);
pattern->dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc)->pid;
pattern->dst_host = MC_smx_process_get_host_name(issuer);
} else {