X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48296e83ce3ba1fa3658a3a74d10a536e33b3849..a6d5fdeb22df5f5b1ca02a3dad8ba6094202a4f3:/src/mc/transition/TransitionComm.cpp diff --git a/src/mc/transition/TransitionComm.cpp b/src/mc/transition/TransitionComm.cpp index 0d48bcf7db..376c301440 100644 --- a/src/mc/transition/TransitionComm.cpp +++ b/src/mc/transition/TransitionComm.cpp @@ -1,13 +1,13 @@ -/* 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. */ #include "src/mc/transition/TransitionComm.hpp" +#include "simgrid/config.h" #include "xbt/asserts.h" -#include +#include "xbt/string.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/ModelChecker.hpp" #include "src/mc/api/RemoteApp.hpp" #include "src/mc/api/State.hpp" #endif @@ -40,9 +40,6 @@ std::string CommWaitTransition::to_string(bool verbose) const } bool CommWaitTransition::depends(const Transition* other) const { - if (aid_ == other->aid_) - return false; - if (other->type_ < type_) return other->depends(this); @@ -81,8 +78,6 @@ std::string CommTestTransition::to_string(bool verbose) const } bool CommTestTransition::depends(const Transition* other) const { - if (aid_ == other->aid_) - return false; if (other->type_ < type_) return other->depends(this); @@ -102,7 +97,7 @@ bool CommTestTransition::depends(const Transition* other) const } CommRecvTransition::CommRecvTransition(aid_t issuer, int times_considered, std::stringstream& stream) - : Transition(Type::COMM_RECV, issuer, times_considered) + : Transition(Type::COMM_ASYNC_RECV, issuer, times_considered) { xbt_assert(stream >> comm_ >> mbox_ >> rbuff_ >> tag_); } @@ -116,9 +111,6 @@ std::string CommRecvTransition::to_string(bool verbose) const } bool CommRecvTransition::depends(const Transition* other) const { - if (aid_ == other->aid_) - return false; - if (other->type_ < type_) return other->depends(this); @@ -155,7 +147,7 @@ bool CommRecvTransition::depends(const Transition* other) const } CommSendTransition::CommSendTransition(aid_t issuer, int times_considered, std::stringstream& stream) - : Transition(Type::COMM_SEND, issuer, times_considered) + : Transition(Type::COMM_ASYNC_SEND, issuer, times_considered) { xbt_assert(stream >> comm_ >> mbox_ >> sbuff_ >> size_ >> tag_); XBT_DEBUG("SendTransition comm:%" PRIxPTR " mbox:%u sbuff:%" PRIxPTR " size:%zu", comm_, mbox_, sbuff_, size_); @@ -171,9 +163,6 @@ std::string CommSendTransition::to_string(bool verbose = false) const bool CommSendTransition::depends(const Transition* other) const { - if (aid_ == other->aid_) - return false; - if (other->type_ < type_) return other->depends(this);