[mc] Remove useless bits

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c3fbeed..42906fe 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -20,29 +20,24 @@
 #include "mc/mc.h"
 #include "src/mc/mc_protocol.h"
 
-#ifdef HAVE_MC
+#if HAVE_MC
 #include "src/mc/mc_request.h"
 #include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_smx.h"
 #endif
 
-#ifdef HAVE_MC
+#if HAVE_MC
 using simgrid::mc::remote;
 #endif
 
-extern "C" {
-
 XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
 
-}
-
 int MC_random(int min, int max)
 {
   xbt_assert(mc_mode != MC_MODE_SERVER);
   /* TODO, if the MC is disabled we do not really need to make a simcall for
    * this :) */
-  /* FIXME: return mc_current_state->executed_transition->random.value; */
   return simcall_mc_random(min, max);
 }
 
@@ -72,7 +67,7 @@ bool request_is_enabled(smx_simcall_t req)
 {
   unsigned int index = 0;
   smx_synchro_t act = 0;
-#ifdef HAVE_MC
+#if HAVE_MC
   s_smx_synchro_t temp_synchro;
 #endif
 
@@ -84,7 +79,7 @@ bool request_is_enabled(smx_simcall_t req)
     /* FIXME: check also that src and dst processes are not suspended */
     act = simcall_comm_wait__get__comm(req);
 
-#ifdef HAVE_MC
+#if HAVE_MC
     // Fetch from MCed memory:
     if (mc_mode == MC_MODE_SERVER) {
       mc_model_checker->process().read(&temp_synchro, remote(act));
@@ -106,7 +101,7 @@ bool request_is_enabled(smx_simcall_t req)
 
   case SIMCALL_COMM_WAITANY: {
     xbt_dynar_t comms;
-#ifdef HAVE_MC
+#if HAVE_MC
 
     s_xbt_dynar_t comms_buffer;
     size_t buffer_size = 0;
@@ -130,7 +125,7 @@ bool request_is_enabled(smx_simcall_t req)
 #endif
 
     for (index = 0; index < comms->used; ++index) {
-#ifdef HAVE_MC
+#if HAVE_MC
       // Fetch act from MCed memory:
       if (mc_mode == MC_MODE_SERVER) {
         memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
@@ -151,23 +146,26 @@ bool request_is_enabled(smx_simcall_t req)
 
   case SIMCALL_MUTEX_LOCK: {
     smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
-#ifdef HAVE_MC
+#if HAVE_MC
     s_smx_mutex_t temp_mutex;
     if (mc_mode == MC_MODE_SERVER) {
       mc_model_checker->process().read(&temp_mutex, remote(mutex));
       mutex = &temp_mutex;
     }
 #endif
+
     if(mutex->owner == nullptr)
       return true;
-    else
-#ifdef HAVE_MC
+#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(mutex->owner)->pid ==
-        MC_smx_resolve_process(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:
@@ -187,10 +185,6 @@ bool request_is_visible(smx_simcall_t req)
       || req->call == SIMCALL_MC_RANDOM
       || req->call == SIMCALL_MUTEX_LOCK
       || req->call == SIMCALL_MUTEX_TRYLOCK
-#ifdef HAVE_MC
-      || req->call == SIMCALL_MC_SNAPSHOT
-      || req->call == SIMCALL_MC_COMPARE_SNAPSHOTS
-#endif
       ;
 }
 
@@ -222,30 +216,3 @@ int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
     return prng_random(min, max);
   return simcall->mc_value;
 }
-
-namespace simgrid {
-namespace mc {
-
-void handle_simcall(smx_simcall_t req, int value)
-{
-#ifndef HAVE_MC
-  SIMIX_simcall_handle(req, value);
-#else
-  if (mc_mode == MC_MODE_CLIENT) {
-    SIMIX_simcall_handle(req, value);
-    return;
-  }
-
-  for (auto& pi : mc_model_checker->process().smx_process_infos)
-    if (req == &pi.copy.simcall) {
-      mc_model_checker->simcall_handle(
-        mc_model_checker->process(), pi.copy.pid, value);
-      return;
-    }
-
-  xbt_die("Could not find the request");
-#endif
-}
-
-}
-}