-/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2023. 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.hpp"
-#include "mc/mc.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
+
+#include "src/mc/mc.h"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
-#include "xbt/random.hpp"
-
-#if SIMGRID_HAVE_MC
-#include "src/mc/ModelChecker.hpp"
-#include "src/mc/Session.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
-
-using simgrid::mc::remote;
+#if SIMGRID_HAVE_STATEFUL_MC
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
#endif
XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories");
+bool simgrid_mc_replay_show_backtraces = false;
-int MC_random(int min, int max)
-{
-#if SIMGRID_HAVE_MC
- xbt_assert(mc_model_checker == nullptr);
-#endif
- 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);
- }
- simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
- return simgrid::kernel::actor::simcall_answered([&observer] { return observer.get_value(); }, &observer);
-}
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
void execute_actors()
{
auto* engine = kernel::EngineImpl::get_instance();
-#if SIMGRID_HAVE_MC
- xbt_assert(mc_model_checker == nullptr, "This must be called from the client");
-#endif
+
+ XBT_DEBUG("execute_actors: %lu of %zu to run (%s)", engine->get_actor_to_run_count(), engine->get_actor_count(),
+ (MC_record_replay_is_active() ? "replay active" : "no replay"));
while (engine->has_actors_to_run()) {
engine->run_all_actors();
for (auto const& actor : engine->get_actors_that_ran()) {
actor->simcall_handle(0);
}
}
-#if SIMGRID_HAVE_MC
- engine->reset_actor_dynar();
- for (auto const& kv : engine->get_actor_list()) {
- auto actor = kv.second;
- // Only visible requests remain at this point, and they all have an observer
- actor->simcall_.mc_max_consider_ = actor->simcall_.observer_->get_max_consider();
-
- engine->add_actor_to_dynar(actor);
- }
-#endif
}
/** @brief returns if there this transition can proceed in a finite amount of time
* transition for ever.
* This is controlled in the is_enabled() method of the corresponding observers.
*/
-// Called from both MCer and MCed:
-bool actor_is_enabled(smx_actor_t actor)
+bool actor_is_enabled(kernel::actor::ActorImpl* actor)
{
-#if SIMGRID_HAVE_MC
- xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
-#endif
+ xbt_assert(get_model_checking_mode() != ModelCheckingMode::CHECKER_SIDE,
+ "This should be called from the client side");
// Now, we are in the client app, no need for remote memory reading.
kernel::actor::Simcall* req = &actor->simcall_;
*/
bool request_is_visible(const kernel::actor::Simcall* req)
{
-#if SIMGRID_HAVE_MC
- xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
-#endif
- if (req->observer_ != nullptr)
- return req->observer_->is_visible();
- else
+ xbt_assert(get_model_checking_mode() != ModelCheckingMode::CHECKER_SIDE,
+ "This should be called from the client side");
+
+ if (req->observer_ == nullptr)
return false;
+ return req->observer_->is_visible();
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc