#include "mc_server.h"
#endif
+#ifdef HAVE_MC
+using simgrid::mc::remote;
+#endif
+
extern "C" {
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
#ifdef HAVE_MC
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_synchro, act, sizeof(temp_synchro),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
}
#endif
#ifdef HAVE_MC
s_xbt_dynar_t comms_buffer;
- size_t buffer_size;
+ size_t buffer_size = 0;
if (mc_mode == MC_MODE_SERVER) {
// Read dynar:
- MC_process_read_simple(&mc_model_checker->process(),
- &comms_buffer, simcall_comm_waitany__get__comms(req), sizeof(comms_buffer));
+ mc_model_checker->process().read(
+ &comms_buffer, remote(simcall_comm_waitany__get__comms(req)));
assert(comms_buffer.elmsize == sizeof(act));
buffer_size = comms_buffer.elmsize * comms_buffer.used;
comms = &comms_buffer;
// Read all the dynar buffer:
char buffer[buffer_size];
if (mc_mode == MC_MODE_SERVER)
- MC_process_read_simple(&mc_model_checker->process(),
- buffer, comms->data, sizeof(buffer));
+ mc_model_checker->process().read_bytes(buffer, sizeof(buffer),
+ remote(comms->data));
#else
comms = simcall_comm_waitany__get__comms(req);
#endif
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_synchro, act, sizeof(temp_synchro),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
}
else
#ifdef HAVE_MC
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_mutex, mutex, sizeof(temp_mutex),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_mutex, remote(mutex));
mutex = &temp_mutex;
}
#endif