include src/mc/Session.hpp
include src/mc/Transition.cpp
include src/mc/Transition.hpp
+include src/mc/TransitionComm.cpp
+include src/mc/TransitionComm.hpp
include src/mc/VisitedState.cpp
include src/mc/VisitedState.hpp
include src/mc/api.cpp
public:
XBT_DECLARE_ENUM_CLASS(Simcall, UNKNOWN, RANDOM, ISEND, IRECV, COMM_WAIT, COMM_TEST);
- SimcallObserver() = default;
explicit SimcallObserver(ActorImpl* issuer) : issuer_(issuer) {}
ActorImpl* get_issuer() const { return issuer_; }
/** Whether this transition can currently be taken without blocking.
{
}
SimcallObserver* clone() override { return new ActivityWaitSimcall(get_issuer(), activity_, timeout_); }
- void serialize(Simcall& type, char* buffer);
+ void serialize(Simcall& type, char* buffer) override;
bool is_visible() const override { return true; }
bool is_enabled() const override;
std::string dot_label(int times_considered) const override;
#include "src/mc/ModelChecker.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/Transition.hpp"
+#include "src/mc/TransitionComm.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/Transition.hpp"
-#include "src/mc/ModelChecker.hpp"
-#include "src/mc/Session.hpp"
-#include "src/mc/mc_state.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
+#include "src/mc/TransitionComm.hpp"
#include "xbt/asserts.h"
+#include <simgrid/config.h>
+#if SIMGRID_HAVE_MC
+#include "src/mc/ModelChecker.hpp"
+#endif
#include <sstream>
unsigned long Transition::executed_transitions_ = 0;
unsigned long Transition::replayed_transitions_ = 0;
+Transition::~Transition() {
+} // Make sure that we have a vtable for Transition by putting this virtual function out of the header
+
std::string Transition::to_string(bool verbose)
{
- xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
-
return textual_;
}
const char* Transition::to_cstring(bool verbose)
{
- xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
-
to_string();
return textual_.c_str();
}
{
replayed_transitions_++;
+#if SIMGRID_HAVE_MC
mc_model_checker->handle_simcall(*this, false);
mc_model_checker->wait_for_requests();
-}
-
-CommWaitTransition::CommWaitTransition(aid_t issuer, int times_considered, char* buffer)
- : Transition(issuer, times_considered)
-{
- std::stringstream stream(buffer);
- stream >> timeout_ >> comm_ >> sender_ >> receiver_ >> mbox_ >> src_buff_ >> dst_buff_ >> size_;
- XBT_DEBUG("CommWaitTransition %s comm:%p, sender:%ld receiver:%ld mbox:%u sbuff:%p rbuff:%p size:%zu",
- (timeout_ ? "timeout" : "no-timeout"), comm_, sender_, receiver_, mbox_, src_buff_, dst_buff_, size_);
-}
-std::string CommWaitTransition::to_string(bool verbose)
-{
- textual_ = xbt::string_printf("%ld: WaitComm(from %ld to %ld, mbox=%u, %s", aid_, sender_, receiver_, mbox_,
- (timeout_ ? "timeout" : "no timeout"));
- if (verbose) {
- textual_ += ", src_buff=" + xbt::string_printf("%p", src_buff_) + ", size=" + std::to_string(size_);
- textual_ += ", dst_buff=" + xbt::string_printf("%p", dst_buff_);
- }
- textual_ += ")";
- return textual_;
-}
-bool CommWaitTransition::depends(const Transition* other) const
-{
- if (aid_ == other->aid_)
- return false;
-
- if (auto* send = dynamic_cast<const CommSendTransition*>(other))
- return send->depends(this);
-
- if (auto* recv = dynamic_cast<const CommRecvTransition*>(other))
- return recv->depends(this);
-
- /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */
- if (const auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
- if (timeout_ || wait->timeout_)
- return true;
-
- if (src_buff_ == wait->src_buff_ && dst_buff_ == wait->dst_buff_)
- return false;
- if (src_buff_ != nullptr && dst_buff_ != nullptr && wait->src_buff_ != nullptr && wait->dst_buff_ != nullptr &&
- dst_buff_ != wait->src_buff_ && dst_buff_ != wait->dst_buff_ && dst_buff_ != src_buff_)
- return false;
- }
-
- return true;
-}
-
-CommRecvTransition::CommRecvTransition(aid_t issuer, int times_considered, char* buffer)
- : Transition(issuer, times_considered)
-{
- std::stringstream stream(buffer);
- stream >> mbox_ >> dst_buff_;
-}
-std::string CommRecvTransition::to_string(bool verbose)
-{
- textual_ = xbt::string_printf("%ld: iRecv(mbox=%u", aid_, mbox_);
- if (verbose)
- textual_ += ", buff=" + xbt::string_printf("%p", dst_buff_);
- textual_ += ")";
- return textual_;
-}
-bool CommRecvTransition::depends(const Transition* other) const
-{
- if (aid_ == other->aid_)
- return false;
-
- if (const auto* other_irecv = dynamic_cast<const CommRecvTransition*>(other))
- return mbox_ == other_irecv->mbox_;
-
- if (auto* isend = dynamic_cast<const CommSendTransition*>(other))
- return isend->depends(this);
-
- if (auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
- if (wait->timeout_)
- return true;
-
- if (mbox_ != wait->mbox_)
- return false;
-
- if ((aid_ != wait->sender_) && (aid_ != wait->receiver_))
- return false;
-
- if (wait->dst_buff_ != dst_buff_)
- return false;
- }
-
- /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
- * test call. */
-#if 0
- if (dynamic_cast<ActivityTestSimcall*>(other))
- return false;
#endif
-
- return true;
-}
-
-CommSendTransition::CommSendTransition(aid_t issuer, int times_considered, char* buffer)
- : Transition(issuer, times_considered)
-{
- std::stringstream stream(buffer);
- stream >> mbox_ >> src_buff_ >> size_;
- XBT_DEBUG("SendTransition mbox:%u buff:%p size:%zu", mbox_, src_buff_, size_);
-}
-std::string CommSendTransition::to_string(bool verbose = false)
-{
- textual_ = xbt::string_printf("%ld: iSend(mbox=%u", aid_, mbox_);
- if (verbose)
- textual_ += ", buff=" + xbt::string_printf("%p", src_buff_) + ", size=" + std::to_string(size_);
- textual_ += ")";
- return textual_;
-}
-bool CommSendTransition::depends(const Transition* other) const
-{
- if (aid_ == other->aid_)
- return false;
-
- if (const auto* other_isend = dynamic_cast<const CommSendTransition*>(other))
- return mbox_ == other_isend->mbox_;
-
- // FIXME: Not in the former dependency check because of the ordering but seems logical to add it
- if (dynamic_cast<const CommRecvTransition*>(other) != nullptr)
- return false;
-
- if (const auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
- if (wait->timeout_)
- return true;
-
- if (mbox_ != wait->mbox_)
- return false;
-
- if ((aid_ != wait->sender_) && (aid_ != wait->receiver_))
- return false;
-
- if (wait->src_buff_ != src_buff_)
- return false;
- }
-
- /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
- * test call. */
-#if 0
- if (dynamic_cast<ActivityTestSimcall*>(other))
- return false;
-#endif
-
- return true;
-}
-
-Transition* recv_transition(aid_t issuer, int times_considered, kernel::actor::SimcallObserver::Simcall simcall,
- char* buffer)
-{
- switch (simcall) {
- case kernel::actor::SimcallObserver::Simcall::COMM_WAIT:
- return new CommWaitTransition(issuer, times_considered, buffer);
- case kernel::actor::SimcallObserver::Simcall::IRECV:
- return new CommRecvTransition(issuer, times_considered, buffer);
- case kernel::actor::SimcallObserver::Simcall::ISEND:
- return new CommSendTransition(issuer, times_considered, buffer);
- case kernel::actor::SimcallObserver::Simcall::UNKNOWN:
- return new Transition(issuer, times_considered);
- default:
- xbt_die("recv_transition of type %s unimplemented", kernel::actor::SimcallObserver::to_c_str(simcall));
- }
}
} // namespace mc
#define SIMGRID_MC_TRANSITION_HPP
#include "simgrid/forward.h" // aid_t
-#include "src/kernel/actor/SimcallObserver.hpp"
-#include "src/mc/remote/RemotePtr.hpp"
+
#include <string>
namespace simgrid {
int times_considered_ = 0;
Transition() = default;
+ virtual ~Transition();
Transition(aid_t issuer, int times_considered) : aid_(issuer), times_considered_(times_considered) {}
void init(aid_t aid, int times_considered);
static unsigned long get_replayed_transitions() { return replayed_transitions_; }
};
-class CommSendTransition;
-class CommRecvTransition;
-
-class CommWaitTransition : public Transition {
- bool timeout_;
- void* comm_;
- aid_t sender_;
- aid_t receiver_;
- unsigned mbox_;
- void* src_buff_;
- void* dst_buff_;
- size_t size_;
- friend CommSendTransition;
- friend CommRecvTransition;
-
-public:
- CommWaitTransition(aid_t issuer, int times_considered, char* buffer);
- std::string to_string(bool verbose) override;
- bool depends(const Transition* other) const override;
-};
-
-class CommRecvTransition : public Transition {
- unsigned mbox_;
- void* dst_buff_;
-
-public:
- CommRecvTransition(aid_t issuer, int times_considered, char* buffer);
- std::string to_string(bool verbose) override;
- bool depends(const Transition* other) const override;
-};
-
-class CommSendTransition : public Transition {
- unsigned mbox_;
- void* src_buff_;
- size_t size_;
-
-public:
- CommSendTransition(aid_t issuer, int times_considered, char* buffer);
- std::string to_string(bool verbose) override;
- bool depends(const Transition* other) const override;
-};
-
-/** Make a new transition from serialized description */
-Transition* recv_transition(aid_t issuer, int times_considered, kernel::actor::SimcallObserver::Simcall simcall,
- char* buffer);
-
} // namespace mc
} // namespace simgrid
--- /dev/null
+/* Copyright (c) 2015-2022. 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/TransitionComm.hpp"
+#include "src/mc/Transition.hpp"
+#include "xbt/asserts.h"
+#include <simgrid/config.h>
+#if SIMGRID_HAVE_MC
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/Session.hpp"
+#include "src/mc/mc_state.hpp"
+#endif
+
+#include <sstream>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_trans_comm, mc_transition,
+ "Logging specific to MC transitions about communications");
+
+namespace simgrid {
+namespace mc {
+
+CommWaitTransition::CommWaitTransition(aid_t issuer, int times_considered, char* buffer)
+ : Transition(issuer, times_considered)
+{
+ std::stringstream stream(buffer);
+ stream >> timeout_ >> comm_ >> sender_ >> receiver_ >> mbox_ >> src_buff_ >> dst_buff_ >> size_;
+ XBT_DEBUG("CommWaitTransition %s comm:%p, sender:%ld receiver:%ld mbox:%u sbuff:%p rbuff:%p size:%zu",
+ (timeout_ ? "timeout" : "no-timeout"), comm_, sender_, receiver_, mbox_, src_buff_, dst_buff_, size_);
+}
+std::string CommWaitTransition::to_string(bool verbose)
+{
+ textual_ = xbt::string_printf("%ld: WaitComm(from %ld to %ld, mbox=%u, %s", aid_, sender_, receiver_, mbox_,
+ (timeout_ ? "timeout" : "no timeout"));
+ if (verbose) {
+ textual_ += ", src_buff=" + xbt::string_printf("%p", src_buff_) + ", size=" + std::to_string(size_);
+ textual_ += ", dst_buff=" + xbt::string_printf("%p", dst_buff_);
+ }
+ textual_ += ")";
+ return textual_;
+}
+bool CommWaitTransition::depends(const Transition* other) const
+{
+ if (aid_ == other->aid_)
+ return false;
+
+ if (auto* send = dynamic_cast<const CommSendTransition*>(other))
+ return send->depends(this);
+
+ if (auto* recv = dynamic_cast<const CommRecvTransition*>(other))
+ return recv->depends(this);
+
+ /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */
+ if (const auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
+ if (timeout_ || wait->timeout_)
+ return true;
+
+ if (src_buff_ == wait->src_buff_ && dst_buff_ == wait->dst_buff_)
+ return false;
+ if (src_buff_ != nullptr && dst_buff_ != nullptr && wait->src_buff_ != nullptr && wait->dst_buff_ != nullptr &&
+ dst_buff_ != wait->src_buff_ && dst_buff_ != wait->dst_buff_ && dst_buff_ != src_buff_)
+ return false;
+ }
+
+ return true;
+}
+
+CommRecvTransition::CommRecvTransition(aid_t issuer, int times_considered, char* buffer)
+ : Transition(issuer, times_considered)
+{
+ std::stringstream stream(buffer);
+ stream >> mbox_ >> dst_buff_;
+}
+std::string CommRecvTransition::to_string(bool verbose)
+{
+ textual_ = xbt::string_printf("%ld: iRecv(mbox=%u", aid_, mbox_);
+ if (verbose)
+ textual_ += ", buff=" + xbt::string_printf("%p", dst_buff_);
+ textual_ += ")";
+ return textual_;
+}
+bool CommRecvTransition::depends(const Transition* other) const
+{
+ if (aid_ == other->aid_)
+ return false;
+
+ if (const auto* other_irecv = dynamic_cast<const CommRecvTransition*>(other))
+ return mbox_ == other_irecv->mbox_;
+
+ if (auto* isend = dynamic_cast<const CommSendTransition*>(other))
+ return isend->depends(this);
+
+ if (auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
+ if (wait->timeout_)
+ return true;
+
+ if (mbox_ != wait->mbox_)
+ return false;
+
+ if ((aid_ != wait->sender_) && (aid_ != wait->receiver_))
+ return false;
+
+ if (wait->dst_buff_ != dst_buff_)
+ return false;
+ }
+
+ /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
+ * test call. */
+#if 0
+ if (dynamic_cast<ActivityTestSimcall*>(other))
+ return false;
+#endif
+
+ return true;
+}
+
+CommSendTransition::CommSendTransition(aid_t issuer, int times_considered, char* buffer)
+ : Transition(issuer, times_considered)
+{
+ std::stringstream stream(buffer);
+ stream >> mbox_ >> src_buff_ >> size_;
+ XBT_DEBUG("SendTransition mbox:%u buff:%p size:%zu", mbox_, src_buff_, size_);
+}
+std::string CommSendTransition::to_string(bool verbose = false)
+{
+ textual_ = xbt::string_printf("%ld: iSend(mbox=%u", aid_, mbox_);
+ if (verbose)
+ textual_ += ", buff=" + xbt::string_printf("%p", src_buff_) + ", size=" + std::to_string(size_);
+ textual_ += ")";
+ return textual_;
+}
+bool CommSendTransition::depends(const Transition* other) const
+{
+ if (aid_ == other->aid_)
+ return false;
+
+ if (const auto* other_isend = dynamic_cast<const CommSendTransition*>(other))
+ return mbox_ == other_isend->mbox_;
+
+ // FIXME: Not in the former dependency check because of the ordering but seems logical to add it
+ if (dynamic_cast<const CommRecvTransition*>(other) != nullptr)
+ return false;
+
+ if (const auto* wait = dynamic_cast<const CommWaitTransition*>(other)) {
+ if (wait->timeout_)
+ return true;
+
+ if (mbox_ != wait->mbox_)
+ return false;
+
+ if ((aid_ != wait->sender_) && (aid_ != wait->receiver_))
+ return false;
+
+ if (wait->src_buff_ != src_buff_)
+ return false;
+ }
+
+ /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
+ * test call. */
+#if 0
+ if (dynamic_cast<ActivityTestSimcall*>(other))
+ return false;
+#endif
+
+ return true;
+}
+
+Transition* recv_transition(aid_t issuer, int times_considered, kernel::actor::SimcallObserver::Simcall simcall,
+ char* buffer)
+{
+ switch (simcall) {
+ case kernel::actor::SimcallObserver::Simcall::COMM_WAIT:
+ return new CommWaitTransition(issuer, times_considered, buffer);
+ case kernel::actor::SimcallObserver::Simcall::IRECV:
+ return new CommRecvTransition(issuer, times_considered, buffer);
+ case kernel::actor::SimcallObserver::Simcall::ISEND:
+ return new CommSendTransition(issuer, times_considered, buffer);
+ case kernel::actor::SimcallObserver::Simcall::UNKNOWN:
+ return new Transition(issuer, times_considered);
+ default:
+ xbt_die("recv_transition of type %s unimplemented", kernel::actor::SimcallObserver::to_c_str(simcall));
+ }
+}
+
+} // namespace mc
+} // namespace simgrid
--- /dev/null
+/* Copyright (c) 2015-2022. 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. */
+
+#ifndef SIMGRID_MC_TRANSITION_COMM_HPP
+#define SIMGRID_MC_TRANSITION_COMM_HPP
+
+#include "simgrid/forward.h" // aid_t
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include <string>
+
+namespace simgrid {
+namespace mc {
+
+class CommSendTransition;
+class CommRecvTransition;
+
+class CommWaitTransition : public Transition {
+ bool timeout_;
+ void* comm_;
+ aid_t sender_;
+ aid_t receiver_;
+ unsigned mbox_;
+ void* src_buff_;
+ void* dst_buff_;
+ size_t size_;
+ friend CommSendTransition;
+ friend CommRecvTransition;
+
+public:
+ CommWaitTransition(aid_t issuer, int times_considered, char* buffer);
+ std::string to_string(bool verbose) override;
+ bool depends(const Transition* other) const override;
+};
+
+class CommRecvTransition : public Transition {
+ unsigned mbox_;
+ void* dst_buff_;
+
+public:
+ CommRecvTransition(aid_t issuer, int times_considered, char* buffer);
+ std::string to_string(bool verbose) override;
+ bool depends(const Transition* other) const override;
+};
+
+class CommSendTransition : public Transition {
+ unsigned mbox_;
+ void* src_buff_;
+ size_t size_;
+
+public:
+ CommSendTransition(aid_t issuer, int times_considered, char* buffer);
+ std::string to_string(bool verbose) override;
+ bool depends(const Transition* other) const override;
+};
+
+/** Make a new transition from serialized description */
+Transition* recv_transition(aid_t issuer, int times_considered, kernel::actor::SimcallObserver::Simcall simcall,
+ char* buffer);
+
+} // namespace mc
+} // namespace simgrid
+
+#endif
if (i != trace.begin())
stream << ';';
stream << i->aid_;
- if (i->times_considered_)
+ if (i->times_considered_ > 0)
stream << '/' << i->times_considered_;
}
return stream.str();
src/mc/mc_config.cpp
src/mc/mc_config.hpp
src/mc/mc_global.cpp
+ src/mc/Transition.cpp
)
set(MC_SRC
src/mc/mc_client_api.cpp
src/mc/mc_smx.cpp
src/mc/mc_exit.hpp
- src/mc/Transition.cpp
src/mc/Transition.hpp
+ src/mc/TransitionComm.cpp
+ src/mc/TransitionComm.hpp
src/mc/udpor_global.cpp
src/mc/udpor_global.hpp
)
