-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2019. 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 <simgrid_config.h>
-
-#include "mc/mc.h"
#include "src/mc/mc_base.h"
-#include "src/mc/mc_replay.h"
-#include "src/simix/smx_private.h"
+#include "mc/mc.h"
+#include "simgrid/config.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_private.hpp"
+
+#include <random>
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
using simgrid::mc::remote;
#endif
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This must be called from the client");
#endif
-
- smx_actor_t process;
- unsigned int iter;
-
- while (not xbt_dynar_is_empty(simix_global->process_to_run)) {
- SIMIX_process_runall();
- xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+ while (not simix_global->actors_to_run.empty()) {
+ simix_global->run_all_actors();
+ for (smx_actor_t const& process : simix_global->actors_that_ran) {
smx_simcall_t req = &process->simcall;
if (req->call != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
SIMIX_simcall_handle(req, 0);
}
#if SIMGRID_HAVE_MC
xbt_dynar_reset(simix_global->actors_vector);
- for (std::pair<aid_t, smx_actor_t> kv : simix_global->process_list) {
+ for (std::pair<aid_t, smx_actor_t> const& kv : simix_global->process_list) {
xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
}
#endif
// Called from both MCer and MCed:
bool actor_is_enabled(smx_actor_t actor)
{
+#if SIMGRID_HAVE_MC
+ // If in the MCer, ask the client app since it has all the data
+ if (mc_model_checker != nullptr) {
+ return mc_model_checker->process().actor_is_enabled(actor->get_pid());
+ }
+#endif
+
+ // Now, we are in the client app, no need for remote memory reading.
smx_simcall_t req = &actor->simcall;
- // TODO, add support for the subtypes?
switch (req->call) {
case SIMCALL_NONE:
simgrid::kernel::activity::CommImpl* act =
static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
-#if SIMGRID_HAVE_MC
- // Fetch from MCed memory:
- // HACK, type puning
- if (mc_model_checker != nullptr) {
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->process().read(temp_comm, remote(act));
- act = static_cast<simgrid::kernel::activity::CommImpl*>(temp_comm.getBuffer());
- }
-#endif
-
- if (act->src_timeout || act->dst_timeout) {
+ if (act->src_timeout_ || act->dst_timeout_) {
/* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
* because even if the communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
return true;
}
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- else if (act->detached && act->src_proc == nullptr && act->type == SIMIX_COMM_READY)
- return (act->dst_proc != nullptr);
- return (act->src_proc && act->dst_proc);
+ else if (act->detached() && act->src_actor_ == nullptr &&
+ act->type_ == simgrid::kernel::activity::CommImpl::Type::READY)
+ return (act->dst_actor_ != nullptr);
+ return (act->src_actor_ && act->dst_actor_);
}
case SIMCALL_COMM_WAITANY: {
- xbt_dynar_t comms;
- simgrid::kernel::activity::CommImpl* act =
- static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
-
-#if SIMGRID_HAVE_MC
- s_xbt_dynar_t comms_buffer;
- size_t buffer_size = 0;
- if (mc_model_checker != nullptr) {
- // Read dynar:
- 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
- comms = simcall_comm_waitany__get__comms(req);
-
- // Read all the dynar buffer:
- char buffer[buffer_size];
- if (mc_model_checker != nullptr)
- mc_model_checker->process().read_bytes(buffer, sizeof(buffer), remote(comms->data));
-#else
- comms = simcall_comm_waitany__get__comms(req);
-#endif
-
- for (unsigned int index = 0; index < comms->used; ++index) {
-#if SIMGRID_HAVE_MC
- // Fetch act from MCed memory:
- // HACK, type puning
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- if (mc_model_checker != nullptr) {
- memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
- mc_model_checker->process().read(temp_comm, remote(act));
- act = static_cast<simgrid::kernel::activity::CommImpl*>(temp_comm.getBuffer());
- } else
-#endif
- act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
- if (act->src_proc && act->dst_proc)
+ simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(req);
+ size_t count = simcall_comm_waitany__get__count(req);
+ for (unsigned int index = 0; index < count; ++index) {
+ auto* comm = comms[index];
+ if (comm->src_actor_ && comm->dst_actor_)
return true;
}
return false;
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
-#if SIMGRID_HAVE_MC
- simgrid::mc::Remote<simgrid::simix::MutexImpl> temp_mutex;
- if (mc_model_checker != nullptr) {
- mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex));
- mutex = temp_mutex.getBuffer();
- }
-#endif
- if (mutex->owner == nullptr)
+ if (mutex->owner_ == nullptr)
return true;
-#if SIMGRID_HAVE_MC
- else if (mc_model_checker != nullptr) {
- simgrid::mc::RemoteClient& modelchecked = mc_model_checker->process();
- // TODO, *(mutex->owner) :/
- return modelchecked.resolveActor(simgrid::mc::remote(mutex->owner))->pid ==
- modelchecked.resolveActor(simgrid::mc::remote(req->issuer))->pid;
- }
-#endif
- else
- return mutex->owner->pid == req->issuer->pid;
+ return mutex->owner_->get_pid() == req->issuer->get_pid();
}
case SIMCALL_SEM_ACQUIRE: {
*/
bool request_is_visible(smx_simcall_t req)
{
+#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
- return req->call == SIMCALL_COMM_ISEND
- || req->call == SIMCALL_COMM_IRECV
- || req->call == SIMCALL_COMM_WAIT
- || req->call == SIMCALL_COMM_WAITANY
- || req->call == SIMCALL_COMM_TEST
- || req->call == SIMCALL_COMM_TESTANY
- || req->call == SIMCALL_MC_RANDOM
- || req->call == SIMCALL_MUTEX_LOCK
- || req->call == SIMCALL_MUTEX_TRYLOCK
- ;
-}
+#endif
-}
+ return req->call == SIMCALL_COMM_ISEND || req->call == SIMCALL_COMM_IRECV || req->call == SIMCALL_COMM_WAIT ||
+ req->call == SIMCALL_COMM_WAITANY || req->call == SIMCALL_COMM_TEST || req->call == SIMCALL_COMM_TESTANY ||
+ req->call == SIMCALL_MC_RANDOM || req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK ||
+ req->call == SIMCALL_MUTEX_UNLOCK;
}
-static int prng_random(int min, int max)
-{
- unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
- unsigned long input_size = (unsigned long) RAND_MAX + 1;
- unsigned long reject_size = input_size % output_size;
- unsigned long accept_size = input_size - reject_size; // module*accept_size
-
- // Use rejection in order to avoid skew
- unsigned long x;
- do {
-#ifndef _WIN32
- x = (unsigned long) random();
-#else
- x = (unsigned long) rand();
-#endif
- } while( x >= accept_size );
- return min + (x % output_size);
+}
}
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
- if (not MC_is_active() && not MC_record_path)
- return prng_random(min, max);
+ if (not MC_is_active() && MC_record_path.empty()) {
+ static std::default_random_engine rnd_engine;
+ std::uniform_int_distribution<int> prng(min, max);
+ return prng(rnd_engine);
+ }
return simcall->mc_value;
}
