X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5de8fe9ad7bfa1bee9e28dd030f6c57ea529ad20..923c96522e059639b7722b35d033d79d9b0b5590:/src/mc/mc_state.cpp

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 94ef18847c..1a36d31dd4 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -26,14 +26,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)");
 namespace simgrid {
 namespace mc {
 
-State::State(unsigned long state_number)
+State::State(unsigned long state_number) : num(state_number)
 {
   this->internal_comm.clear();
   std::memset(&this->internal_req, 0, sizeof(this->internal_req));
   std::memset(&this->executed_req, 0, sizeof(this->executed_req));
 
   actorStates.resize(MC_smx_get_maxpid());
-  num = state_number;
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
     system_state = simgrid::mc::take_snapshot(num);
@@ -46,8 +45,7 @@ State::State(unsigned long state_number)
 
 std::size_t State::interleaveSize() const
 {
-  return boost::range::count_if(this->actorStates,
-    [](simgrid::mc::ProcessState const& p) { return p.isTodo(); });
+  return boost::range::count_if(this->actorStates, [](simgrid::mc::ProcessState const& p) { return p.isTodo(); });
 }
 
 Transition State::getTransition() const
@@ -67,12 +65,10 @@ Transition State::getTransition() const
  *  - which simcall can currently be executed (like a comm where the other partner is already known)
  * Once we returned the last enabled transition of a process, it is marked done.
  *
- * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten
- * on the fly to a bunch of WAIT (resp TEST) transitions using the transition.argument
- * field to remember what was the last returned sub-transition.
+ * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT
+ * (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition.
  */
-static inline smx_simcall_t MC_state_get_request_for_process(
-  simgrid::mc::State* state, smx_actor_t actor)
+static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
 {
   /* reset the outgoing transition */
   simgrid::mc::ProcessState* procstate = &state->actorStates[actor->pid];
@@ -85,80 +81,74 @@ static inline smx_simcall_t MC_state_get_request_for_process(
 
   smx_simcall_t req = nullptr;
   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;
-            break;
-          }
+    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;
+          break;
         }
-
-        if (procstate->times_considered >=
-            simgrid::mc::read_length(mc_model_checker->process(),
-              simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall))))
-          procstate->setDone();
-        if (state->transition.argument != -1)
-          req = &actor->simcall;
-        break;
-
-      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;
-            break;
-          }
-
-        if (procstate->times_considered >=
-            simcall_comm_testany__get__count(&actor->simcall))
-          procstate->setDone();
-
-        if (state->transition.argument != -1 || start_count == 0)
-           req = &actor->simcall;
-
-        break;
       }
 
-      case SIMCALL_COMM_WAIT: {
-        simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> remote_act =
-            remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(&actor->simcall)));
-        simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
-        mc_model_checker->process().read(temp_act, remote_act);
-        simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
-        if (act->src_proc && act->dst_proc)
-          state->transition.argument = 0;
-        else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY
-              && act->detached == 1)
-          state->transition.argument = 0;
-        else
-          state->transition.argument = -1;
+      if (procstate->times_considered >=
+          simgrid::mc::read_length(mc_model_checker->process(),
+                                   simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall))))
         procstate->setDone();
+      if (state->transition.argument != -1)
         req = &actor->simcall;
-        break;
-      }
+      break;
+
+    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;
+          break;
+        }
+
+      if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall))
+        procstate->setDone();
 
-      case SIMCALL_MC_RANDOM: {
-        int min_value = simcall_mc_random__get__min(&actor->simcall);
-        state->transition.argument = procstate->times_considered + min_value;
-        procstate->times_considered++;
-        if (state->transition.argument == simcall_mc_random__get__max(&actor->simcall))
-          procstate->setDone();
+      if (state->transition.argument != -1 || start_count == 0)
         req = &actor->simcall;
-        break;
-      }
 
-      default:
-        procstate->setDone();
+      break;
+    }
+
+    case SIMCALL_COMM_WAIT: {
+      simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> remote_act =
+          remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(&actor->simcall)));
+      simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
+      mc_model_checker->process().read(temp_act, remote_act);
+      simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
+      if (act->src_proc && act->dst_proc)
         state->transition.argument = 0;
-        req = &actor->simcall;
-        break;
+      else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY && act->detached == 1)
+        state->transition.argument = 0;
+      else
+        state->transition.argument = -1;
+      procstate->setDone();
+      req = &actor->simcall;
+      break;
+    }
+
+    case SIMCALL_MC_RANDOM: {
+      int min_value              = simcall_mc_random__get__min(&actor->simcall);
+      state->transition.argument = procstate->times_considered + min_value;
+      procstate->times_considered++;
+      if (state->transition.argument == simcall_mc_random__get__max(&actor->simcall))
+        procstate->setDone();
+      req = &actor->simcall;
+      break;
+    }
+
+    default:
+      procstate->setDone();
+      state->transition.argument = 0;
+      req                        = &actor->simcall;
+      break;
   }
   if (not req)
     return nullptr;
@@ -168,9 +158,8 @@ static inline smx_simcall_t MC_state_get_request_for_process(
   // Fetch the data of the request and translate it:
   state->internal_req = *req;
 
-  /* The waitany and testany request are transformed into a wait or test request
-   * over the corresponding communication action so it can be treated later by
-   * the dependence function. */
+  /* The waitany and testany request are transformed into a wait or test request over the corresponding communication
+   * action so it can be treated later by the dependence function. */
   switch (req->call) {
   case SIMCALL_COMM_WAITANY: {
     state->internal_req.call = SIMCALL_COMM_WAIT;