X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a568a13bc6d5eb7ddbbec34bdb42497bc3825f87..9acedb4ebce15cd3399fcad4effb3fb79a0ee5ef:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index bbc1d548ca..83a39e4bbe 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -39,9 +39,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);
@@ -72,7 +72,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
 
@@ -102,10 +102,11 @@ bool actor_is_enabled(smx_actor_t 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_actor_ && act->dst_actor_)
+      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;
@@ -116,7 +117,7 @@ bool actor_is_enabled(smx_actor_t actor)
 
       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: {