-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <assert.h>
+#include <cassert>
+
+#include <simgrid_config.h>
+
+#include <xbt/log.h>
+#include <xbt/asserts.h>
+#include <xbt/dynar.h>
#include <simgrid/simix.h>
-#include "mc_base.h"
-#include "../simix/smx_private.h"
-#include "mc/mc_record.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_base.h"
+#include "src/simix/smx_private.h"
+#include "src/mc/mc_replay.h"
#include "mc/mc.h"
+#include "src/mc/mc_protocol.h"
+
+#ifdef HAVE_MC
+#include "src/mc/Process.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_smx.h"
+#endif
#ifdef HAVE_MC
-#include "mc_process.h"
-#include "ModelChecker.hpp"
-#include "mc_protocol.h"
-#include "mc_smx.h"
-#include "mc_server.h"
+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
- if (mc_mode == MC_MODE_SERVER) {
- MC_server_wait_client(&mc_model_checker->process());
- return;
- }
-#endif
+ assert(mc_mode != MC_MODE_SERVER);
smx_process_t process;
smx_simcall_t req;
#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
* communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
return TRUE;
- } else {
- /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- if (act->comm.detached && act->comm.src_proc == NULL
- && act->comm.type == SIMIX_COMM_READY)
- return (act->comm.dst_proc != NULL);
}
+ /* 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
+ && act->comm.type == SIMIX_COMM_READY)
+ return (act->comm.dst_proc != nullptr);
return (act->comm.src_proc && act->comm.dst_proc);
case SIMCALL_COMM_WAITANY: {
#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;
- } else {
+ } 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));
+ 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
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
- if(mutex->owner == NULL)
+ if(mutex->owner == nullptr)
return TRUE;
else
#ifdef HAVE_MC
|| 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;
// Use rejection in order to avoid skew
unsigned long x;
do {
-#ifndef _XBT_WIN32
+#ifndef _WIN32
x = (unsigned long) random();
#else
x = (unsigned long) rand();
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
- if (!MC_is_active() && !MC_record_path){
+ if (!MC_is_active() && !MC_record_path)
return prng_random(min, max);
- }
-
return simcall->mc_value;
}
return;
}
- unsigned i;
- mc_smx_process_info_t pi = NULL;
-
- 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);
+ for (auto& pi : mc_model_checker->process().smx_process_infos)
+ if (req == &pi.copy.simcall) {
+ mc_model_checker->simcall_handle(
+ mc_model_checker->process(), pi.copy.pid, value);
return;
}
- }
xbt_die("Could not find the request");
#endif
