get_enabled_transitions() is a general function

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 684b9c9..fa7bfc3 100644 (file)
--- 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<udpor_transition_t> Api::get_enabled_transitions(simgrid::mc::State* state)
+std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state)
 {
-  std::list<udpor_transition_t> tr_list{};
+  std::list<transition_detail_t> 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<udpor_transition_t> 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<s_udpor_transition>(new s_udpor_transition());
+    transition_detail_t transition = std::unique_ptr<s_transition_detail>(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 3a92bc1..191a213 100644 (file)
--- 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<kernel::activity::MailboxImpl> mbox_remote_addr {}; // used to represent mailbox remote address for isend and ireceive transitions
   RemotePtr<kernel::activity::ActivityImpl> comm_remote_addr {}; // the communication this transition concerns (to be used only for isend, ireceive, wait and test)
 };
 
-typedef std::unique_ptr<s_udpor_transition> udpor_transition_t;
+typedef std::unique_ptr<s_transition_detail> 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<udpor_transition_t> get_enabled_transitions(simgrid::mc::State* state);
+  std::list<transition_detail_t> get_enabled_transitions(simgrid::mc::State* state);
 
   // SIMCALL APIs
   std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const;