[mc] Move resolve_process...() as methods of Process

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 1417283..42906fe 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -153,16 +153,19 @@ bool request_is_enabled(smx_simcall_t req)
       mutex = &temp_mutex;
     }
 #endif
+
     if(mutex->owner == nullptr)
       return true;
-    else
 #if HAVE_MC
+    else if (mc_mode == MC_MODE_SERVER) {
+      simgrid::mc::Process& modelchecked = mc_model_checker->process();
       // TODO, *(mutex->owner) :/
-      return MC_smx_resolve_process(simgrid::mc::remote(mutex->owner))->pid ==
-        MC_smx_resolve_process(simgrid::mc::remote(req->issuer))->pid;
-#else
-      return mutex->owner->pid == req->issuer->pid;
+      return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid
+        == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid;
+    }
 #endif
+    else
+      return mutex->owner->pid == req->issuer->pid;
     }
 
   default: