#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
-#ifdef HAVE_MC
+#if HAVE_MC
+#include "src/mc/mc_request.h"
#include "src/mc/Process.hpp"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/mc_smx.h"
#endif
-#ifdef HAVE_MC
+#if HAVE_MC
using simgrid::mc::remote;
#endif
-extern "C" {
-
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
int MC_random(int min, int max)
return simcall_mc_random(min, max);
}
-void MC_wait_for_requests(void)
+namespace simgrid {
+namespace mc {
+
+void wait_for_requests(void)
{
assert(mc_mode != MC_MODE_SERVER);
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
- if (req->call != SIMCALL_NONE && !MC_request_is_visible(req))
+ if (req->call != SIMCALL_NONE && !simgrid::mc::request_is_visible(req))
SIMIX_simcall_handle(req, 0);
}
}
}
// Called from both MCer and MCed:
-int MC_request_is_enabled(smx_simcall_t req)
+bool request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
smx_synchro_t act = 0;
-#ifdef HAVE_MC
+#if HAVE_MC
s_smx_synchro_t temp_synchro;
#endif
switch (req->call) {
case SIMCALL_NONE:
- return FALSE;
+ return false;
case SIMCALL_COMM_WAIT:
/* FIXME: check also that src and dst processes are not suspended */
act = simcall_comm_wait__get__comm(req);
-#ifdef HAVE_MC
+#if HAVE_MC
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_synchro, remote(act));
/* If it has a timeout it will be always be enabled, because even if the
* communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
- return TRUE;
+ return true;
}
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
else if (act->comm.detached && act->comm.src_proc == nullptr
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
-#ifdef HAVE_MC
+#if HAVE_MC
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
#endif
for (index = 0; index < comms->used; ++index) {
-#ifdef HAVE_MC
+#if HAVE_MC
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
#endif
act = xbt_dynar_get_as(comms, index, smx_synchro_t);
if (act->comm.src_proc && act->comm.dst_proc)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
case SIMCALL_MUTEX_TRYLOCK:
- return TRUE;
+ return true;
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
-#ifdef HAVE_MC
+#if HAVE_MC
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_mutex, remote(mutex));
}
#endif
if(mutex->owner == nullptr)
- return TRUE;
+ return true;
else
-#ifdef HAVE_MC
+#if HAVE_MC
// TODO, *(mutex->owner) :/
return MC_smx_resolve_process(mutex->owner)->pid ==
MC_smx_resolve_process(req->issuer)->pid;
default:
/* The rest of the requests are always enabled */
- return TRUE;
+ return true;
}
}
-int MC_request_is_visible(smx_simcall_t req)
+bool request_is_visible(smx_simcall_t req)
{
return req->call == SIMCALL_COMM_ISEND
|| req->call == SIMCALL_COMM_IRECV
|| req->call == SIMCALL_MC_RANDOM
|| req->call == SIMCALL_MUTEX_LOCK
|| req->call == SIMCALL_MUTEX_TRYLOCK
-#ifdef HAVE_MC
- || req->call == SIMCALL_MC_SNAPSHOT
- || req->call == SIMCALL_MC_COMPARE_SNAPSHOTS
-#endif
;
}
+}
+}
+
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
return simcall->mc_value;
}
-void MC_simcall_handle(smx_simcall_t req, int value)
+namespace simgrid {
+namespace mc {
+
+void handle_simcall(smx_simcall_t req, int value)
{
-#ifndef HAVE_MC
+#if !HAVE_MC
SIMIX_simcall_handle(req, value);
#else
if (mc_mode == MC_MODE_CLIENT) {
}
}
+}