Enum class for MC call types, and MC comm pattern differences.

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

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index d2fb5e6..3f066a7 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -47,33 +47,32 @@ void MC_state_copy_index_communications_pattern(simgrid::mc::State* state)
     state->communication_indices_.push_back(list_process_comm.index_comm);
 }
 
-void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int value, int backtracking)
+void MC_handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, int backtracking)
 {
   // HACK, do not rely on the Checker implementation outside of it
   auto* checker = static_cast<simgrid::mc::CommunicationDeterminismChecker*>(mc_model_checker->getChecker());
 
+  using simgrid::mc::CallType;
   switch(call_type) {
-  case MC_CALL_TYPE_NONE:
-    break;
-  case MC_CALL_TYPE_SEND:
-  case MC_CALL_TYPE_RECV:
-    checker->get_comm_pattern(req, call_type, backtracking);
-    break;
-  case MC_CALL_TYPE_WAIT:
-  case MC_CALL_TYPE_WAITANY:
-    {
-    simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr{nullptr};
-    if (call_type == MC_CALL_TYPE_WAIT)
-      comm_addr = remote(simcall_comm_wait__getraw__comm(req));
+    case CallType::NONE:
+      break;
+    case CallType::SEND:
+    case CallType::RECV:
+      checker->get_comm_pattern(req, call_type, backtracking);
+      break;
+    case CallType::WAIT:
+    case CallType::WAITANY: {
+      simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr{nullptr};
+      if (call_type == CallType::WAIT)
+        comm_addr = remote(simcall_comm_wait__getraw__comm(req));
 
-    else {
-      simgrid::kernel::activity::ActivityImpl* addr;
-      addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(req) + value));
-      comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(addr));
+      else {
+        simgrid::kernel::activity::ActivityImpl* addr;
+        addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(req) + value));
+        comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(addr));
       }
       checker->complete_comm_pattern(comm_addr, MC_smx_simcall_get_issuer(req)->get_pid(), backtracking);
-    }
-    break;
+    } break;
   default:
     xbt_die("Unexpected call type %i", (int)call_type);
   }