#ifdef HAVE_MC
#include "mc_process.h"
-#include "mc_model_checker.h"
+#include "ModelChecker.hpp"
#include "mc_protocol.h"
#include "mc_smx.h"
#include "mc_server.h"
{
#ifdef HAVE_MC
if (mc_mode == MC_MODE_SERVER) {
- MC_server_wait_client(&mc_model_checker->process);
+ MC_server_wait_client(&mc_model_checker->process());
return;
}
#endif
}
}
+// Called from both MCer and MCed:
int MC_request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
#ifdef HAVE_MC
// Fetch from MCed memory:
- if (!MC_process_is_self(&mc_model_checker->process)) {
- MC_process_read(&mc_model_checker->process, MC_ADDRESS_SPACE_READ_FLAGS_NONE,
+ 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);
act = &temp_synchro;
return (act->comm.src_proc && act->comm.dst_proc);
case SIMCALL_COMM_WAITANY: {
+ xbt_dynar_t comms;
#ifdef HAVE_MC
- // Read dynar:
- s_xbt_dynar_t comms;
- MC_process_read_simple(&mc_model_checker->process,
- &comms, simcall_comm_waitany__get__comms(req), sizeof(comms));
- // Read dynar buffer:
- assert(comms.elmsize == sizeof(act));
- size_t buffer_size = comms.elmsize * comms.used;
- char buffer[buffer_size];
- MC_process_read_simple(&mc_model_checker->process,
- buffer, comms.data, sizeof(buffer));
-#endif
-#ifdef HAVE_MC
- for (index = 0; index < comms.used; ++index) {
- memcpy(&act, buffer + comms.elmsize * index, sizeof(act));
+ s_xbt_dynar_t comms_buffer;
+ 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));
+ assert(comms_buffer.elmsize == sizeof(act));
+ buffer_size = comms_buffer.elmsize * comms_buffer.used;
+ comms = &comms_buffer;
+ } else {
+ comms = simcall_comm_waitany__get__comms(req);
+ }
+ // 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));
#else
- xbt_dynar_foreach(simcall_comm_waitany__get__comms(req), index, act) {
+ comms = simcall_comm_waitany__get__comms(req);
#endif
+ for (index = 0; index < comms->used; ++index) {
#ifdef HAVE_MC
- // Fetch from MCed memory:
- if (!MC_process_is_self(&mc_model_checker->process)) {
- MC_process_read(&mc_model_checker->process, MC_ADDRESS_SPACE_READ_FLAGS_NONE,
+ // 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);
act = &temp_synchro;
}
+ else
#endif
-
+ act = xbt_dynar_get_as(comms, index, smx_synchro_t);
if (act->comm.src_proc && act->comm.dst_proc)
return TRUE;
}
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#ifdef HAVE_MC
s_smx_mutex_t temp_mutex;
- if (!MC_process_is_self(&mc_model_checker->process)) {
- MC_process_read(&mc_model_checker->process, MC_ADDRESS_SPACE_READ_FLAGS_NONE,
+ 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);
mutex = &temp_mutex;
#ifndef HAVE_MC
SIMIX_simcall_handle(req, value);
#else
- if (MC_process_is_self(&mc_model_checker->process)) {
+ if (mc_mode == MC_MODE_CLIENT) {
SIMIX_simcall_handle(req, value);
return;
}
unsigned i;
mc_smx_process_info_t pi = NULL;
- xbt_dynar_foreach_ptr(mc_model_checker->process.smx_process_infos, i, pi) {
+ xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
if (req == &pi->copy.simcall) {
- MC_server_simcall_handle(&mc_model_checker->process, pi->copy.pid, value);
+ MC_server_simcall_handle(&mc_model_checker->process(), pi->copy.pid, value);
return;
}
}