[mc] Remove redundant 'mc_mode' global variable

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

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index fe69f83..a1c4361 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -40,13 +40,13 @@ smx_synchro_t MC_get_comm(smx_simcall_t r)
 }
 
 static inline
-smx_mailbox_t MC_get_rdv(smx_simcall_t r)
+smx_mailbox_t MC_get_mbox(smx_simcall_t r)
 {
   switch(r->call) {
   case SIMCALL_COMM_ISEND:
-    return simcall_comm_isend__get__rdv(r);
+    return simcall_comm_isend__get__mbox(r);
   case SIMCALL_COMM_IRECV:
-    return simcall_comm_irecv__get__rdv(r);
+    return simcall_comm_irecv__get__mbox(r);
   default:
     return nullptr;
   }
@@ -73,9 +73,9 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
   if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
       && r2->call == SIMCALL_COMM_WAIT) {
 
-    smx_mailbox_t rdv = MC_get_rdv(r1);
+    smx_mailbox_t mbox = MC_get_mbox(r1);
 
-    if (rdv != synchro2->comm.rdv_cpy
+    if (mbox != synchro2->comm.mbox_cpy
         && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
@@ -159,9 +159,9 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 
   switch(r1->call) {
   case SIMCALL_COMM_ISEND:
-    return simcall_comm_isend__get__rdv(r1) == simcall_comm_isend__get__rdv(r2);
+    return simcall_comm_isend__get__mbox(r1) == simcall_comm_isend__get__mbox(r2);
   case SIMCALL_COMM_IRECV:
-    return simcall_comm_irecv__get__rdv(r1) == simcall_comm_irecv__get__rdv(r2);
+    return simcall_comm_irecv__get__mbox(r1) == simcall_comm_irecv__get__mbox(r2);
   case SIMCALL_COMM_WAIT:
     if (synchro1->comm.src_buff == synchro2->comm.src_buff
         && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
@@ -205,7 +205,7 @@ static char *buff_size_to_string(size_t buff_size)
 
 std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type)
 {
-  xbt_assert(mc_mode == MC_MODE_SERVER);
+  xbt_assert(mc_model_checker != nullptr);
 
   bool use_remote_comm = true;
   switch(request_type) {