X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e354d068c720173674d1f34e9d9605b77c15ad3..795359a4a2c81571bb061f8dfbcc6c15323c9bf3:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 5a7f2f8412..e8f1bb4777 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -4,21 +4,26 @@
 /* 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 <assert.h>
+#include <cassert>
+
+#include <simgrid_config.h>
+
+#include <xbt/log.h>
+#include <xbt/asserts.h>
+#include <xbt/dynar.h>
 
 #include <simgrid/simix.h>
 
-#include "mc_base.h"
+#include "src/mc/mc_base.h"
 #include "src/simix/smx_private.h"
-#include "src/mc/mc_record.h"
 #include "src/mc/mc_replay.h"
 #include "mc/mc.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 #ifdef HAVE_MC
 #include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 #endif
 
 #ifdef HAVE_MC
@@ -88,9 +93,9 @@ int MC_request_is_enabled(smx_simcall_t req)
         return TRUE;
     } else {
       /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
-      if (act->comm.detached && act->comm.src_proc == NULL
+      if (act->comm.detached && act->comm.src_proc == nullptr
           && act->comm.type == SIMIX_COMM_READY)
-        return (act->comm.dst_proc != NULL);
+        return (act->comm.dst_proc != nullptr);
     }
     return (act->comm.src_proc && act->comm.dst_proc);
 
@@ -148,7 +153,7 @@ int MC_request_is_enabled(smx_simcall_t req)
       mutex = &temp_mutex;
     }
 #endif
-    if(mutex->owner == NULL)
+    if(mutex->owner == nullptr)
       return TRUE;
     else
 #ifdef HAVE_MC
@@ -194,7 +199,7 @@ static int prng_random(int min, int max)
   // Use rejection in order to avoid skew
   unsigned long x;
   do {
-#ifndef _XBT_WIN32
+#ifndef _WIN32
     x = (unsigned long) random();
 #else
     x = (unsigned long) rand();
@@ -222,16 +227,12 @@ void MC_simcall_handle(smx_simcall_t req, int value)
     return;
   }
 
-  unsigned i;
-  mc_smx_process_info_t pi = NULL;
-
-  xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
-    if (req == &pi->copy.simcall) {
+  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);
+        mc_model_checker->process(), pi.copy.pid, value);
       return;
     }
-  }
 
   xbt_die("Could not find the request");
 #endif