X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccb2167210583f3eb1249db10916cfd7389cb0df..932e745735378c442e2348a3a428d97b69398f86:/src/mc/mc_state.cpp

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index be66f53e7b..d6123a3e9f 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -6,6 +6,8 @@
 
 #include <assert.h>
 
+#include <algorithm>
+
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 
@@ -28,12 +30,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc,
 simgrid::mc::State* MC_state_new()
 {
   simgrid::mc::State* state = new simgrid::mc::State();
-  std::memset(&state->internal_comm, 0, sizeof(state->internal_comm));
-  std::memset(&state->internal_req, 0, sizeof(state->internal_req));
-  std::memset(&state->executed_req, 0, sizeof(state->executed_req));
-
-  state->max_pid = MC_smx_get_maxpid();
-  state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
+  state->processStates.resize(MC_smx_get_maxpid());
   state->num = ++mc_stats->expanded_states;
   /* Stateful model checking */
   if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) ||  _sg_mc_termination){
@@ -56,129 +53,20 @@ State::State()
   std::memset(&this->executed_req, 0, sizeof(this->executed_req));
 }
 
-State::~State()
+std::size_t State::interleaveSize() const
 {
-  xbt_free(this->index_comm);
-  xbt_free(this->incomplete_comm_pattern);
-  xbt_free(this->proc_status);
+  return std::count_if(this->processStates.begin(), this->processStates.end(),
+    [](simgrid::mc::ProcessState const& state) { return state.interleave(); });
 }
 
 }
 }
 
-/**
- * \brief Deletes a state data structure
- * \param trans The state to be deleted
- */
-void MC_state_delete(simgrid::mc::State* state, int free_snapshot)
-{
-  if (state->system_state && free_snapshot)
-    delete state->system_state;
-  delete state;
-}
-
 void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process)
 {
   assert(state);
-  state->proc_status[process->pid].state = MC_INTERLEAVE;
-  state->proc_status[process->pid].interleave_count = 0;
-}
-
-void MC_state_remove_interleave_process(simgrid::mc::State* state, smx_process_t process)
-{
-  if (state->proc_status[process->pid].state == MC_INTERLEAVE)
-    state->proc_status[process->pid].state = MC_DONE;
-}
-
-unsigned int MC_state_interleave_size(simgrid::mc::State* state)
-{
-  unsigned int i, size = 0;
-  for (i = 0; i < state->max_pid; i++)
-    if ((state->proc_status[i].state == MC_INTERLEAVE)
-        || (state->proc_status[i].state == MC_MORE_INTERLEAVE))
-      size++;
-  return size;
-}
-
-int MC_state_process_is_done(simgrid::mc::State* state, smx_process_t process)
-{
-  return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE;
-}
-
-void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req,
-                                   int value)
-{
-  state->executed_req = *req;
-  state->req_num = value;
-
-  /* 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;
-    state->internal_req.issuer = req->issuer;
-    smx_synchro_t remote_comm;
-    read_element(mc_model_checker->process(),
-      &remote_comm, remote(simcall_comm_waitany__get__comms(req)),
-      value, sizeof(remote_comm));
-    mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
-    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
-    simcall_comm_wait__set__timeout(&state->internal_req, 0);
-    break;
-  }
-
-  case SIMCALL_COMM_TESTANY:
-    state->internal_req.call = SIMCALL_COMM_TEST;
-    state->internal_req.issuer = req->issuer;
-
-    if (value > 0) {
-      smx_synchro_t remote_comm;
-      read_element(mc_model_checker->process(),
-        &remote_comm, remote(simcall_comm_testany__get__comms(req)),
-        value, sizeof(remote_comm));
-      mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
-    }
-
-    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
-    simcall_comm_test__set__result(&state->internal_req, value);
-    break;
-
-  case SIMCALL_COMM_WAIT:
-    state->internal_req = *req;
-    mc_model_checker->process().read_bytes(&state->internal_comm ,
-      sizeof(state->internal_comm), remote(simcall_comm_wait__get__comm(req)));
-    simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm);
-    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
-    break;
-
-  case SIMCALL_COMM_TEST:
-    state->internal_req = *req;
-    mc_model_checker->process().read_bytes(&state->internal_comm,
-      sizeof(state->internal_comm), remote(simcall_comm_test__get__comm(req)));
-    simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm);
-    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
-    break;
-
-  case SIMCALL_MC_RANDOM: {
-    state->internal_req = *req;
-    int random_max = simcall_mc_random__get__max(req);
-    if (value != random_max)
-      for (auto& p : mc_model_checker->process().simix_processes()) {
-        mc_procstate_t procstate = &state->proc_status[p.copy.pid];
-        const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
-        if (p.copy.pid == issuer->pid) {
-          procstate->state = MC_MORE_INTERLEAVE;
-          break;
-        }
-      }
-    break;
-  }
-
-  default:
-    state->internal_req = *req;
-    break;
-  }
+  state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::interleave;
+  state->processStates[process->pid].interleave_count = 0;
 }
 
 smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value)
@@ -195,16 +83,15 @@ smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state)
 static inline smx_simcall_t MC_state_get_request_for_process(
   simgrid::mc::State* state, int*value, smx_process_t process)
 {
-  mc_procstate_t procstate = &state->proc_status[process->pid];
+  simgrid::mc::ProcessState* procstate = &state->processStates[process->pid];
 
-  if (procstate->state != MC_INTERLEAVE
-      && procstate->state != MC_MORE_INTERLEAVE)
-      return nullptr;
+  if (!procstate->interleave())
+    return nullptr;
   if (!simgrid::mc::process_is_enabled(process))
     return nullptr;
 
+  smx_simcall_t req = nullptr;
   switch (process->simcall.call) {
-
       case SIMCALL_COMM_WAITANY:
         *value = -1;
         while (procstate->interleave_count <
@@ -220,11 +107,9 @@ static inline smx_simcall_t MC_state_get_request_for_process(
         if (procstate->interleave_count >=
             simgrid::mc::read_length(mc_model_checker->process(),
               simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall))))
-          procstate->state = MC_DONE;
-
+          procstate->state = simgrid::mc::ProcessInterleaveState::done;
         if (*value != -1)
-          return &process->simcall;
-
+          req = &process->simcall;
         break;
 
       case SIMCALL_COMM_TESTANY: {
@@ -242,10 +127,10 @@ static inline smx_simcall_t MC_state_get_request_for_process(
         if (procstate->interleave_count >=
             read_length(mc_model_checker->process(),
               remote(simcall_comm_testany__get__comms(&process->simcall))))
-          procstate->state = MC_DONE;
+          procstate->state = simgrid::mc::ProcessInterleaveState::done;
 
         if (*value != -1 || start_count == 0)
-          return &process->simcall;
+           req = &process->simcall;
 
         break;
       }
@@ -262,24 +147,104 @@ static inline smx_simcall_t MC_state_get_request_for_process(
           *value = 0;
         else
           *value = -1;
-        procstate->state = MC_DONE;
-        return &process->simcall;
+        procstate->state = simgrid::mc::ProcessInterleaveState::done;
+        req = &process->simcall;
+        break;
       }
 
       case SIMCALL_MC_RANDOM:
-        if (procstate->state == MC_INTERLEAVE)
+        if (procstate->state == simgrid::mc::ProcessInterleaveState::interleave)
           *value = simcall_mc_random__get__min(&process->simcall);
         else if (state->req_num < simcall_mc_random__get__max(&process->simcall))
           *value = state->req_num + 1;
-        procstate->state = MC_DONE;
-        return &process->simcall;
+        procstate->state = simgrid::mc::ProcessInterleaveState::done;
+        req = &process->simcall;
+        break;
 
       default:
-        procstate->state = MC_DONE;
+        procstate->state = simgrid::mc::ProcessInterleaveState::done;
         *value = 0;
-        return &process->simcall;
+        req = &process->simcall;
+        break;
   }
-  return nullptr;
+  if (!req)
+    return nullptr;
+
+  // Fetch the data of the request and translate it:
+
+  state->executed_req = *req;
+  state->req_num = *value;
+
+  /* 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;
+    state->internal_req.issuer = req->issuer;
+    smx_synchro_t remote_comm;
+    read_element(mc_model_checker->process(),
+      &remote_comm, remote(simcall_comm_waitany__get__comms(req)),
+      *value, sizeof(remote_comm));
+    mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
+    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+    simcall_comm_wait__set__timeout(&state->internal_req, 0);
+    break;
+  }
+
+  case SIMCALL_COMM_TESTANY:
+    state->internal_req.call = SIMCALL_COMM_TEST;
+    state->internal_req.issuer = req->issuer;
+
+    if (*value > 0) {
+      smx_synchro_t remote_comm;
+      read_element(mc_model_checker->process(),
+        &remote_comm, remote(simcall_comm_testany__get__comms(req)),
+        *value, sizeof(remote_comm));
+      mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
+    }
+
+    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+    simcall_comm_test__set__result(&state->internal_req, *value);
+    break;
+
+  case SIMCALL_COMM_WAIT:
+    state->internal_req = *req;
+    mc_model_checker->process().read_bytes(&state->internal_comm ,
+      sizeof(state->internal_comm), remote(simcall_comm_wait__get__comm(req)));
+    simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm);
+    simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+    break;
+
+  case SIMCALL_COMM_TEST:
+    state->internal_req = *req;
+    mc_model_checker->process().read_bytes(&state->internal_comm,
+      sizeof(state->internal_comm), remote(simcall_comm_test__get__comm(req)));
+    simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm);
+    simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+    break;
+
+  case SIMCALL_MC_RANDOM: {
+    state->internal_req = *req;
+    int random_max = simcall_mc_random__get__max(req);
+    if (*value != random_max)
+      for (auto& p : mc_model_checker->process().simix_processes()) {
+        simgrid::mc::ProcessState* procstate = &state->processStates[p.copy.pid];
+        const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+        if (p.copy.pid == issuer->pid) {
+          procstate->state = simgrid::mc::ProcessInterleaveState::more_interleave;
+          break;
+        }
+      }
+    break;
+  }
+
+  default:
+    state->internal_req = *req;
+    break;
+  }
+
+  return req;
 }
 
 smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value)