X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4184211ef3d1957a395a461e4ca480a7928e83a8..2bd9a37bbb72eac4ed613b3d6953aba6555e2e92:/src/mc/mc_base.c

diff --git a/src/mc/mc_base.c b/src/mc/mc_base.c
index 82ca8c6a4f..63d7a58a7f 100644
--- a/src/mc/mc_base.c
+++ b/src/mc/mc_base.c
@@ -10,11 +10,14 @@
 #include "../simix/smx_private.h"
 #include "mc_record.h"
 
+#ifdef HAVE_MC
+#include "mc_process.h"
+#include "mc_model_checker.h"
+#include "mc_protocol.h"
+#endif
+
 XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
 
-/**
- * \brief Schedules all the process that are ready to run
- */
 void MC_wait_for_requests(void)
 {
   smx_process_t process;
@@ -35,6 +38,10 @@ int MC_request_is_enabled(smx_simcall_t req)
 {
   unsigned int index = 0;
   smx_synchro_t act = 0;
+#ifdef HAVE_MC
+  s_smx_synchro_t temp_synchro;
+#endif
+  smx_mutex_t mutex = NULL;
 
   switch (req->call) {
   case SIMCALL_NONE:
@@ -43,6 +50,17 @@ int MC_request_is_enabled(smx_simcall_t req)
   case SIMCALL_COMM_WAIT:
     /* FIXME: check also that src and dst processes are not suspended */
     act = simcall_comm_wait__get__comm(req);
+
+#ifdef HAVE_MC
+    // Fetch from MCed memory:
+    if (!MC_process_is_self(&mc_model_checker->process)) {
+      MC_process_read(&mc_model_checker->process, MC_PROCESS_NO_FLAG,
+        &temp_synchro, act, sizeof(temp_synchro),
+        MC_PROCESS_INDEX_ANY);
+      act = &temp_synchro;
+    }
+#endif
+
     if (simcall_comm_wait__get__timeout(req) >= 0) {
       /* If it has a timeout it will be always be enabled, because even if the
        * communication is not ready, it can timeout and won't block. */
@@ -58,11 +76,30 @@ int MC_request_is_enabled(smx_simcall_t req)
 
   case SIMCALL_COMM_WAITANY:
     /* Check if it has at least one communication ready */
-    xbt_dynar_foreach(simcall_comm_waitany__get__comms(req), index, act)
+    xbt_dynar_foreach(simcall_comm_waitany__get__comms(req), index, act) {
+
+#ifdef HAVE_MC
+      // Fetch from MCed memory:
+      if (!MC_process_is_self(&mc_model_checker->process)) {
+        MC_process_read(&mc_model_checker->process, MC_PROCESS_NO_FLAG,
+          &temp_synchro, act, sizeof(temp_synchro),
+          MC_PROCESS_INDEX_ANY);
+        act = &temp_synchro;
+      }
+#endif
+
       if (act->comm.src_proc && act->comm.dst_proc)
         return TRUE;
+    }
     return FALSE;
 
+  case SIMCALL_MUTEX_LOCK:
+    mutex = simcall_mutex_lock__get__mutex(req);
+    if(mutex->owner == NULL)
+      return TRUE;
+    else
+      return (mutex->owner->pid == req->issuer->pid);
+
   default:
     /* The rest of the requests are always enabled */
     return TRUE;
@@ -78,6 +115,7 @@ int MC_request_is_visible(smx_simcall_t req)
       || req->call == SIMCALL_COMM_TEST
       || req->call == SIMCALL_COMM_TESTANY
       || req->call == SIMCALL_MC_RANDOM
+      || req->call == SIMCALL_MUTEX_LOCK
 #ifdef HAVE_MC
       || req->call == SIMCALL_MC_SNAPSHOT
       || req->call == SIMCALL_MC_COMPARE_SNAPSHOTS