cut some more includes

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c80227d..4bc39eb 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -6,7 +6,9 @@
 #include <simgrid_config.h>
 
 #include "mc/mc.h"
+#include "src/mc/mc_base.h"
 #include "src/mc/mc_replay.h"
+#include "src/simix/smx_private.h"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
@@ -28,7 +30,7 @@ int MC_random(int min, int max)
 namespace simgrid {
 namespace mc {
 
-void wait_for_requests(void)
+void wait_for_requests()
 {
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr);
@@ -38,11 +40,11 @@ void wait_for_requests(void)
   smx_simcall_t req;
   unsigned int iter;
 
-  while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
+  while (not xbt_dynar_is_empty(simix_global->process_to_run)) {
     SIMIX_process_runall();
     xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
       req = &process->simcall;
-      if (req->call != SIMCALL_NONE && !simgrid::mc::request_is_visible(req))
+      if (req->call != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
         SIMIX_simcall_handle(req, 0);
     }
   }
@@ -152,7 +154,7 @@ bool request_is_enabled(smx_simcall_t req)
   case SIMCALL_MUTEX_LOCK: {
     smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
 #if SIMGRID_HAVE_MC
-    simgrid::mc::Remote<simgrid::simix::Mutex> temp_mutex;
+    simgrid::mc::Remote<simgrid::simix::MutexImpl> temp_mutex;
     if (mc_model_checker != nullptr) {
       mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex));
       mutex = temp_mutex.getBuffer();
@@ -175,7 +177,7 @@ bool request_is_enabled(smx_simcall_t req)
 
     case SIMCALL_SEM_ACQUIRE: {
       static int warned = 0;
-      if (!warned)
+      if (not warned)
         XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
       warned = 1;
       return true;
@@ -183,7 +185,7 @@ bool request_is_enabled(smx_simcall_t req)
 
     case SIMCALL_COND_WAIT: {
       static int warned = 0;
-      if (!warned)
+      if (not warned)
         XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
       warned = 1;
       return true;
@@ -233,7 +235,7 @@ static int prng_random(int min, int max)
 
 int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
 {
-  if (!MC_is_active() && !MC_record_path)
+  if (not MC_is_active() && not MC_record_path)
     return prng_random(min, max);
   return simcall->mc_value;
 }