mc: move some files related to ELF, DWARF or unwind reading into their own directory

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

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 7095aa9..7f8fa6b 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -7,7 +7,6 @@
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_smx.hpp"
 #include "src/mc/mc_state.hpp"
-#include "src/mc/mc_xbt.hpp"
 
 #include <boost/range/algorithm.hpp>
 
@@ -75,17 +74,16 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
   switch (actor->simcall.call) {
     case SIMCALL_COMM_WAITANY:
       state->transition.argument = -1;
-      while (procstate->times_considered <
-             read_length(mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(&actor->simcall)))) {
-        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) {
-          state->transition.argument = procstate->times_considered - 1;
+      while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall)) {
+        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+          state->transition.argument = procstate->times_considered;
+          ++procstate->times_considered;
           break;
         }
+        ++procstate->times_considered;
       }
 
-      if (procstate->times_considered >=
-          simgrid::mc::read_length(mc_model_checker->process(),
-                                   simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall))))
+      if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall))
         procstate->setDone();
       if (state->transition.argument != -1)
         req = &actor->simcall;
@@ -94,11 +92,14 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
     case SIMCALL_COMM_TESTANY: {
       unsigned start_count       = procstate->times_considered;
       state->transition.argument = -1;
-      while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall))
-        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) {
-          state->transition.argument = procstate->times_considered - 1;
+      while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall)) {
+        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+          state->transition.argument = procstate->times_considered;
+          ++procstate->times_considered;
           break;
         }
+        ++procstate->times_considered;
+      }
 
       if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall))
         procstate->setDone();
@@ -117,8 +118,8 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
       simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
       if (act->src_actor_.get() && act->dst_actor_.get())
         state->transition.argument = 0;
-      else if (act->src_actor_.get() == nullptr && act->type == simgrid::kernel::activity::CommImpl::Type::READY &&
-               act->detached == 1)
+      else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY &&
+               act->detached())
         state->transition.argument = 0;
       else
         state->transition.argument = -1;
@@ -156,11 +157,10 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
   switch (req->call) {
   case SIMCALL_COMM_WAITANY: {
     state->internal_req.call = SIMCALL_COMM_WAIT;
-    simgrid::kernel::activity::ActivityImpl* remote_comm;
-    read_element(mc_model_checker->process(), &remote_comm, remote(simcall_comm_waitany__getraw__comms(req)),
-                 state->transition.argument, sizeof(remote_comm));
-    mc_model_checker->process().read(state->internal_comm,
-                                     remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_comm)));
+    simgrid::kernel::activity::CommImpl* remote_comm;
+    remote_comm =
+        mc_model_checker->process().read(remote(simcall_comm_waitany__get__comms(req) + state->transition.argument));
+    mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
     simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer());
     simcall_comm_wait__set__timeout(&state->internal_req, 0);
     break;
@@ -170,10 +170,9 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
     state->internal_req.call = SIMCALL_COMM_TEST;
 
     if (state->transition.argument > 0) {
-      simgrid::kernel::activity::ActivityImpl* remote_comm = mc_model_checker->process().read(
-          remote(simcall_comm_testany__getraw__comms(req) + state->transition.argument));
-      mc_model_checker->process().read(state->internal_comm,
-                                       remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_comm)));
+      simgrid::kernel::activity::CommImpl* remote_comm =
+          mc_model_checker->process().read(remote(simcall_comm_testany__get__comms(req) + state->transition.argument));
+      mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
     }
 
     simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer());