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 1a3a1a3..4bc39eb 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -3,34 +3,15 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <cassert>
-
 #include <simgrid_config.h>
 
-#include <xbt/log.h>
-#include <xbt/asserts.h>
-#include <xbt/dynar.h>
-
-#include <simgrid/simix.h>
-
 #include "mc/mc.h"
 #include "src/mc/mc_base.h"
 #include "src/mc/mc_replay.h"
-#include "src/mc/remote/mc_protocol.h"
 #include "src/simix/smx_private.h"
 
-#include "src/kernel/activity/ActivityImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
-#include "src/kernel/activity/SynchroComm.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/kernel/activity/SynchroSleep.hpp"
-#include "src/kernel/activity/SynchroExec.hpp"
-
 #if SIMGRID_HAVE_MC
-#include "src/mc/mc_request.h"
-#include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/mc_smx.h"
 
 using simgrid::mc::remote;
 #endif
@@ -41,16 +22,15 @@ int MC_random(int min, int max)
 {
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr);
-  /* TODO, if the MC is disabled we do not really need to make a simcall for
-   * this :) */
 #endif
+  /* TODO, if the MC is disabled we do not really need to make a simcall for this :) */
   return simcall_mc_random(min, max);
 }
 
 namespace simgrid {
 namespace mc {
 
-void wait_for_requests(void)
+void wait_for_requests()
 {
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr);
@@ -60,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);
     }
   }
@@ -174,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();
@@ -197,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;
@@ -205,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;
@@ -255,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;
 }