-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2020. 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 "mc/mc.h"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/checker/SimcallInspector.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
-#include <random>
+#include "xbt/random.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/Session.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
using simgrid::mc::remote;
#endif
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))
+ const s_smx_simcall* req = &process->simcall_;
+ if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
process->simcall_handle(0);
}
}
#if SIMGRID_HAVE_MC
xbt_dynar_reset(simix_global->actors_vector);
- for (std::pair<aid_t, smx_actor_t> const& kv : simix_global->process_list) {
+ for (std::pair<const 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
#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());
+ return simgrid::mc::session->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;
+ smx_simcall_t req = &actor->simcall_;
- if (req->transition != nullptr)
- return req->transition->fireable();
+ if (req->inspector_ != nullptr)
+ return req->inspector_->is_enabled();
- switch (req->call) {
+ switch (req->call_) {
case SIMCALL_NONE:
return false;
case SIMCALL_COMM_WAIT: {
/* FIXME: check also that src and dst processes are not suspended */
- simgrid::kernel::activity::CommImpl* act =
- static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
+ const kernel::activity::CommImpl* act = simcall_comm_wait__getraw__comm(req);
if (act->src_timeout_ || act->dst_timeout_) {
/* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
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];
+ auto const* comm = comms[index];
if (comm->src_actor_ && comm->dst_actor_)
return true;
}
}
case SIMCALL_MUTEX_LOCK: {
- smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
+ const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
- if (mutex->owner_ == nullptr)
+ if (mutex->get_owner() == nullptr)
return true;
- return mutex->owner_->get_pid() == req->issuer->get_pid();
+ return mutex->get_owner()->get_pid() == req->issuer_->get_pid();
}
case SIMCALL_SEM_ACQUIRE: {
/* This is the list of requests that are visible from the checker algorithm.
* Any other requests are handled right away on the application side.
*/
-bool request_is_visible(smx_simcall_t req)
+bool request_is_visible(const s_smx_simcall* req)
{
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
#endif
- return (req->transition != nullptr && req->transition->visible()) || 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;
+ return (req->inspector_ != nullptr && req->inspector_->is_visible()) || 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;
}
}
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int 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);
+ static simgrid::xbt::random::XbtRandom prng;
+ return prng.uniform_int(min, max);
}
- return simcall->mc_value;
+ return simcall->mc_value_;
}