From 8abea18fcdade0129ba3ee72a771e4c4de893a1c Mon Sep 17 00:00:00 2001 From: eazimi Date: Mon, 8 Feb 2021 09:17:03 +0100 Subject: [PATCH] get_enabled_transitions() is a general function --- src/mc/api.cpp | 14 +++++++------- src/mc/api.hpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mc/api.cpp b/src/mc/api.cpp index 684b9c9914..fa7bfc3418 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -631,9 +631,9 @@ smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const return nullptr; } -std::list Api::get_enabled_transitions(simgrid::mc::State* state) +std::list Api::get_enabled_transitions(simgrid::mc::State* state) { - std::list tr_list{}; + std::list tr_list{}; for (auto& actor : mc_model_checker->get_remote_simulation().actors()) { auto actor_pid = actor.copy.get_buffer()->get_pid(); @@ -646,22 +646,22 @@ std::list Api::get_enabled_transitions(simgrid::mc::State* s if (not simgrid::mc::actor_is_enabled(actor_impl)) continue; - udpor_transition_t udpor_transition = std::unique_ptr(new s_udpor_transition()); + transition_detail_t transition = std::unique_ptr(new s_transition_detail()); Simcall simcall_call = actor_impl->simcall_.call_; smx_simcall_t simcall = &actor_impl->simcall_; - udpor_transition->call_ = simcall_call; + transition->call_ = simcall_call; switch (simcall_call) { case Simcall::COMM_ISEND: case Simcall::COMM_IRECV: { - udpor_transition->mbox_remote_addr = get_mbox_remote_addr(simcall); - udpor_transition->comm_remote_addr = get_comm_remote_addr(simcall); + transition->mbox_remote_addr = get_mbox_remote_addr(simcall); + transition->comm_remote_addr = get_comm_remote_addr(simcall); break; } default: break; } - tr_list.emplace_back(std::move(udpor_transition)); + tr_list.emplace_back(std::move(transition)); } return tr_list; diff --git a/src/mc/api.hpp b/src/mc/api.hpp index 3a92bc103c..191a213bfd 100644 --- a/src/mc/api.hpp +++ b/src/mc/api.hpp @@ -18,14 +18,14 @@ namespace mc { /** * @brief Maintains the transition's information. */ -struct s_udpor_transition { +struct s_transition_detail { simgrid::simix::Simcall call_ = simgrid::simix::Simcall::NONE; long issuer_id = -1; RemotePtr mbox_remote_addr {}; // used to represent mailbox remote address for isend and ireceive transitions RemotePtr comm_remote_addr {}; // the communication this transition concerns (to be used only for isend, ireceive, wait and test) }; -typedef std::unique_ptr udpor_transition_t; +typedef std::unique_ptr transition_detail_t; /* ** This class aimes to implement FACADE APIs for simgrid. The FACADE layer sits between the CheckerSide @@ -108,7 +108,7 @@ public: smx_simcall_t mc_state_choose_request(simgrid::mc::State* state) const; // UDPOR APIs - std::list get_enabled_transitions(simgrid::mc::State* state); + std::list get_enabled_transitions(simgrid::mc::State* state); // SIMCALL APIs std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const; -- 2.30.2