Merge branch 'local changes'

[simgrid.git] / src / mc / api.cpp

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 684b9c99140f0e2cd2a0ee90121620f8739707ae..8e4d30dbcb959bbd1eaf7eb79d5ed994575618f5 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -18,7 +18,7 @@
 #include "src/smpi/include/smpi_request.hpp"
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Fasade APIs ");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
 
 using Simcall = simgrid::simix::Simcall;
 
@@ -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;