X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7672ae43c2b49a7dcdc0976cc89a05cc87ae534c..6a908b79ea45f85f305620c09375b72483b7eee9:/src/mc/transition/Transition.cpp diff --git a/src/mc/transition/Transition.cpp b/src/mc/transition/Transition.cpp index 6b632eeaaa..84ad991fd5 100644 --- a/src/mc/transition/Transition.cpp +++ b/src/mc/transition/Transition.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-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. */ @@ -10,10 +10,11 @@ #include #if SIMGRID_HAVE_MC -#include "src/mc/ModelChecker.hpp" +#include "src/mc/explo/Exploration.hpp" #include "src/mc/transition/TransitionActorJoin.hpp" #include "src/mc/transition/TransitionAny.hpp" #include "src/mc/transition/TransitionComm.hpp" +#include "src/mc/transition/TransitionObjectAccess.hpp" #include "src/mc/transition/TransitionRandom.hpp" #include "src/mc/transition/TransitionSynchro.hpp" #endif @@ -43,13 +44,12 @@ std::string Transition::dot_string() const return xbt::string_printf("label = \"[(%ld)] %s\", color = %s, fontcolor = %s", aid_, Transition::to_c_str(type_), color, color); } -void Transition::replay() const +void Transition::replay(RemoteApp& app) const { replayed_transitions_++; - #if SIMGRID_HAVE_MC - mc_model_checker->handle_simcall(aid_, times_considered_, false); - mc_model_checker->wait_for_requests(); + app.handle_simcall(aid_, times_considered_, false); + app.wait_for_requests(); #endif } @@ -96,6 +96,9 @@ Transition* deserialize_transition(aid_t issuer, int times_considered, std::stri case Transition::Type::ACTOR_JOIN: return new ActorJoinTransition(issuer, times_considered, stream); + case Transition::Type::OBJECT_ACCESS: + return new ObjectAccessTransition(issuer, times_considered, stream); + case Transition::Type::UNKNOWN: return new Transition(Transition::Type::UNKNOWN, issuer, times_considered);