-/* 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/mc_record.h"
#include "mc/mc_replay.h"
#include "mc/mc.h"
+#include "mc_protocol.h"
#ifdef HAVE_MC
-#include "mc_process.h"
-#include "ModelChecker.hpp"
-#include "mc_protocol.h"
+#include "mc/Process.hpp"
+#include "mc/ModelChecker.hpp"
#include "mc_smx.h"
#include "mc_server.h"
#endif
+#ifdef HAVE_MC
+using simgrid::mc::remote;
+#endif
+
extern "C" {
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
+int MC_random(int min, int max)
+{
+ xbt_assert(mc_mode != MC_MODE_SERVER);
+ /* TODO, if the MC is disabled we do not really need to make a simcall for
+ * this :) */
+ /* FIXME: return mc_current_state->executed_transition->random.value; */
+ return simcall_mc_random(min, max);
+}
+
void MC_wait_for_requests(void)
{
#ifdef HAVE_MC
#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
return (act->comm.src_proc && act->comm.dst_proc);
case SIMCALL_COMM_WAITANY: {
-#ifdef HAVE_MC
xbt_dynar_t comms;
+#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
for (index = 0; index < comms->used; ++index) {
// 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
return FALSE;
}
+ case SIMCALL_MUTEX_TRYLOCK:
+ return TRUE;
+
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#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
|| req->call == SIMCALL_COMM_TESTANY
|| 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
;
}
-int MC_random(int min, int max)
-{
- /*FIXME: return mc_current_state->executed_transition->random.value; */
- return simcall_mc_random(min, max);
-}
-
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;