X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/895710d49f77179d9893bc76b3e31b69fae638af..2558c8c0eb206ff353cb88672f5a90cd0e2562d3:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c1968fc35a..d44192625b 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -1,22 +1,23 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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 <simgrid/config.h>
-
-#include "mc/mc.h"
 #include "src/mc/mc_base.h"
+#include "mc/mc.h"
+#include "simgrid/config.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
 #include "src/simix/smx_private.hpp"
 
-#include "src/kernel/activity/MutexImpl.hpp"
+#include <random>
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
 
 using simgrid::mc::remote;
 #endif
@@ -40,9 +41,9 @@ void wait_for_requests()
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr, "This must be called from the client");
 #endif
-  while (not simix_global->process_to_run.empty()) {
-    SIMIX_process_runall();
-    for (smx_actor_t const& process : simix_global->process_that_ran) {
+  while (not simix_global->actors_to_run.empty()) {
+    simix_global->run_all_actors();
+    for (smx_actor_t const& process : simix_global->actors_that_ran) {
       smx_simcall_t req = &process->simcall;
       if (req->call != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
         SIMIX_simcall_handle(req, 0);
@@ -73,7 +74,7 @@ bool actor_is_enabled(smx_actor_t actor)
 #if SIMGRID_HAVE_MC
   // If in the MCer, ask the client app since it has all the data
   if (mc_model_checker != nullptr) {
-    return mc_model_checker->process().actor_is_enabled(actor->pid);
+    return mc_model_checker->process().actor_is_enabled(actor->get_pid());
   }
 #endif
 
@@ -89,23 +90,25 @@ bool actor_is_enabled(smx_actor_t actor)
       simgrid::kernel::activity::CommImpl* act =
           static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
 
-      if (act->src_timeout || act->dst_timeout) {
+      if (act->src_timeout_ || act->dst_timeout_) {
         /* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
          * because even if the communication is not ready, it can timeout and won't block. */
         if (_sg_mc_timeout == 1)
           return true;
       }
       /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
-      else if (act->detached && act->src_proc == nullptr && act->type == SIMIX_COMM_READY)
-        return (act->dst_proc != nullptr);
-      return (act->src_proc && act->dst_proc);
+      else if (act->detached && act->src_actor_ == nullptr &&
+               act->type_ == simgrid::kernel::activity::CommImpl::Type::READY)
+        return (act->dst_actor_ != nullptr);
+      return (act->src_actor_ && act->dst_actor_);
     }
 
     case SIMCALL_COMM_WAITANY: {
-      xbt_dynar_t comms = simcall_comm_waitany__get__comms(req);
-      for (unsigned int index = 0; index < comms->used; ++index) {
-        simgrid::kernel::activity::CommImpl* act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
-        if (act->src_proc && act->dst_proc)
+      simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(req);
+      size_t count                                = simcall_comm_waitany__get__count(req);
+      for (unsigned int index = 0; index < count; ++index) {
+        auto* comm = comms[index];
+        if (comm->src_actor_ && comm->dst_actor_)
           return true;
       }
       return false;
@@ -114,9 +117,9 @@ bool actor_is_enabled(smx_actor_t actor)
     case SIMCALL_MUTEX_LOCK: {
       smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
 
-      if (mutex->owner == nullptr)
+      if (mutex->owner_ == nullptr)
         return true;
-      return mutex->owner->pid == req->issuer->pid;
+      return mutex->owner_->get_pid() == req->issuer->get_pid();
     }
 
     case SIMCALL_SEM_ACQUIRE: {
@@ -159,28 +162,12 @@ bool request_is_visible(smx_simcall_t req)
 }
 }
 
-static int prng_random(int min, int max)
-{
-  unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
-  unsigned long input_size = (unsigned long) RAND_MAX + 1;
-  unsigned long reject_size = input_size % output_size;
-  unsigned long accept_size = input_size - reject_size; // module*accept_size
-
-  // Use rejection in order to avoid skew
-  unsigned long x;
-  do {
-#ifndef _WIN32
-    x = (unsigned long) random();
-#else
-    x = (unsigned long) rand();
-#endif
-  } while( x >= accept_size );
-  return min + (x % output_size);
-}
-
 int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
 {
-  if (not MC_is_active() && MC_record_path.empty())
-    return prng_random(min, max);
+  if (not MC_is_active() && MC_record_path.empty()) {
+    static std::default_random_engine rnd_engine;
+    std::uniform_int_distribution<int> prng(min, max);
+    return prng(rnd_engine);
+  }
   return simcall->mc_value;
 }