-/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2021. 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 "src/mc/mc_base.h"
+#include "src/mc/mc_base.hpp"
#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_config.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr);
#endif
- /* TODO, if the MC is disabled we do not really need to make a simcall for this :) */
- return simcall_mc_random(min, max);
+ if (not MC_is_active() && not MC_record_replay_is_active()) { // no need to do a simcall in this case
+ static simgrid::xbt::random::XbtRandom prng;
+ return prng.uniform_int(min, max);
+ }
+ auto observer = new simgrid::mc::RandomSimcall(SIMIX_process_self(), min, max);
+ return simgrid::kernel::actor::simcall([observer] { return observer->get_value(); }, observer);
}
namespace simgrid {
#if SIMGRID_HAVE_MC
xbt_dynar_reset(simix_global->actors_vector);
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);
+ auto actor = kv.second;
+ if (actor->simcall_.inspector_ != nullptr)
+ actor->simcall_.mc_max_consider_ = actor->simcall_.inspector_->get_max_consider();
+ xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, actor);
}
#endif
}
return true;
}
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- else if (act->detached() && act->src_actor_ == nullptr &&
- act->type_ == simgrid::kernel::activity::CommImpl::Type::READY)
+ else if (act->detached() && act->src_actor_ == nullptr && act->state_ == simgrid::kernel::activity::State::READY)
return (act->dst_actor_ != nullptr);
return (act->src_actor_ && act->dst_actor_);
}
}
case Simcall::SEM_ACQUIRE: {
- static int warned = 0;
+ static bool warned = false;
if (not warned)
XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
- warned = 1;
+ warned = true;
return true;
}
case Simcall::COND_WAIT: {
- static int warned = 0;
+ static bool warned = false;
if (not warned)
XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
- warned = 1;
+ warned = true;
return true;
}
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
#endif
+ if (req->inspector_ != nullptr)
+ return req->inspector_->is_visible();
using simix::Simcall;
- 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;
+ 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::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 simgrid::xbt::random::XbtRandom prng;
- return prng.uniform_int(min, max);
- }
- return simcall->mc_value_;
-}